remove <gtkmm/gtkmm.h> from all files, plus a small fix related to map/realize handling

git-svn-id: svn://localhost/trunk/ardour2@145 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index c9a0e69ce537161bc7a5d8588afc5889f23d3d13..6f4405b5a75eb74670c28ec2f6654892f05f5051 100644 (file)
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -21,7 +21,14 @@
 #ifndef __ardour_trackview_h__
 #define __ardour_trackview_h__
 
-#include <gtkmm.h>
+#include <gtkmm/table.h>
+#include <gtkmm/button.h>
+#include <gtkmm/box.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/menuitem.h>
+#include <gtkmm/radiomenuitem.h>
+#include <gtkmm/checkmenuitem.h>
+
 #include <gtkmm2ext/selector.h>
 #include <list>
 

diff --git a/gtk2_ardour/automation_gain_line.h b/gtk2_ardour/automation_gain_line.h
index 2962b2a71869cebc889f6ef40bee097f24377b44..39d06dd937a01d5b83b35aca51131778dbf2866a 100644 (file)
--- a/gtk2_ardour/automation_gain_line.h
+++ b/gtk2_ardour/automation_gain_line.h
@@ -2,7 +2,6 @@
 #define __ardour_gtk_automation_gain_line_h__
 
 #include <ardour/ardour.h>
-#include <gtkmm.h>
 
 #include "canvas.h"
 #include "automation_line.h"
@@ -11,7 +10,6 @@ namespace ARDOUR {
        class Session;
 }
 
-
 class TimeAxisView;
 
 class AutomationGainLine : public AutomationLine

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 0567abba0541b2ed25dc6863e3e81eceb6a529e8..aa42912dc1ac06c2df6f1c2c071b15f4101a61d7 100644 (file)
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -26,7 +26,6 @@
 #include <string>
 #include <sys/types.h>
 
-#include <gtkmm.h>
 #include <libgnomecanvasmm/line.h>
 #include <sigc++/signal.h>
 #include "canvas.h"

diff --git a/gtk2_ardour/automation_pan_line.h b/gtk2_ardour/automation_pan_line.h
index 13f31a4e6317932c451b89dfbda28ee99f9945ac..88191c34c1a22401b8cf132aef4a3e7ec159c2a1 100644 (file)
--- a/gtk2_ardour/automation_pan_line.h
+++ b/gtk2_ardour/automation_pan_line.h
@@ -2,7 +2,6 @@
 #define __ardour_gtk_automation_pan_line_h__
 
 #include <ardour/ardour.h>
-#include <gtkmm.h>
 
 #include "canvas.h"
 #include "automation_line.h"

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index e0ad68e5c9e183ba30a3881162bbda87fc379f9b..38deece11a0da2b4a2ebf0c68ee8225648577eb9 100644 (file)
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -22,7 +22,10 @@
 #define __ardour_gtk_axis_view_h__
 
 #include <list>
-#include <gtkmm.h>
+
+#include <gtkmm/label.h>
+#include <gdkmm/color.h>
+
 #include <pbd/xml++.h>
 #include "prompter.h"
 

diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index deb33e4476cec63bc611119d95759e7eeb211293..f4676cf69540ef67bce332a4382a5671612f2db8 100644 (file)
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -22,7 +22,6 @@
 #define __gtk_ardour_crossfade_view_h__
 
 #include <vector>
-#include <gtkmm.h>
 #include <libgnomecanvasmm/libgnomecanvasmm.h>
 #include <sigc++/signal.h>
 #include <ardour/crossfade.h>

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index caa66290d2869e002203ce40f1048c22afd9585f..e8aaee5b99e116d476a374d3aa81690af31f0429 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -333,7 +333,7 @@ Editor::Editor (AudioEngine& eng)
        track_canvas_scroller.get_hadjustment()->set_upper (1200.0);
        track_canvas_scroller.get_hadjustment()->set_step_increment (20.0);
        track_canvas_scroller.get_hadjustment()->signal_value_changed().connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled));
-       
+
        edit_vscrollbar.set_adjustment(*track_canvas_scroller.get_vadjustment());
        edit_hscrollbar.set_adjustment(*track_canvas_scroller.get_hadjustment());
 
@@ -346,6 +346,9 @@ Editor::Editor (AudioEngine& eng)
        time_canvas_scroller.set_hadjustment (*track_canvas_scroller.get_hadjustment());
        time_canvas_scroller.set_name ("TimeCanvasScroller");
 
+       track_canvas_scroller.signal_map_event().connect (mem_fun (*this, &Editor::track_canvas_map_handler));
+       time_canvas_scroller.signal_map_event().connect (mem_fun (*this, &Editor::time_canvas_map_handler));
+       
        edit_controls_vbox.set_spacing (track_spacing);
        edit_controls_hbox.pack_start (edit_controls_vbox, true, true);
        edit_controls_scroller.add (edit_controls_hbox);
@@ -1002,15 +1005,6 @@ Editor::on_realize ()
        null_cursor = new Gdk::Cursor(empty_pixmap, empty_bitmap, white, white, 0, 0);
 }
 
-void
-Editor::on_map ()
-{
-       Window::on_map ();
-
-       track_canvas_scroller.get_window()->set_cursor (*current_canvas_cursor);
-       time_canvas_scroller.get_window()->set_cursor (*timebar_cursor);
-}
-
 void
 Editor::track_canvas_allocate (Gtk::Allocation alloc)
 {
@@ -4103,3 +4097,9 @@ Editor::transport_punch_location()
                return 0;
        }
 }
+
+void 
+Editor::on_map ()
+{
+       // XXX remove me
+}

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 5dd5e237e1eb33ddb2f995c1f1392cff132c2c44..185059593b2d88d0478290b8615524e048bfcda8 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -682,6 +682,9 @@ class Editor : public PublicEditor
        Gtk::ScrolledWindow  time_canvas_scroller;
        Gtk::ScrolledWindow  edit_controls_scroller;
 
+       bool track_canvas_map_handler (GdkEventAny*);
+       bool time_canvas_map_handler (GdkEventAny*);
+
        gint edit_controls_button_release (GdkEventButton*);
        Gtk::Menu *edit_controls_left_menu;
        Gtk::Menu *edit_controls_right_menu;

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 181697d4e2ca19ac72dff590b04a785106feb97a..46b625407a6bbaaf931498b8ae62bcfee50b3eb3 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -355,3 +355,17 @@ Editor::reset_scrolling_region (Gtk::Allocation* alloc)
        }
 }
 
+bool
+Editor::track_canvas_map_handler (GdkEventAny* ev)
+{
+       track_canvas_scroller.get_window()->set_cursor (*current_canvas_cursor);
+       return false;
+}
+
+bool
+Editor::time_canvas_map_handler (GdkEventAny* ev)
+{
+       time_canvas_scroller.get_window()->set_cursor (*timebar_cursor);
+       return false;
+}
+

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index a1dafafde960f020d737864388eaf81d3976b07a..6a7b88e1c4092c153dfed3ff6e7cf1c089af3ed6 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -23,9 +23,17 @@
 
 #include <vector>
 
+#include <gtkmm/box.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/button.h>
+#include <gtkmm/table.h>
+#include <gtkmm/drawingarea.h>
+
+
 #include <ardour/types.h>
 
-#include <gtkmm.h>
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/click_box.h>
 
@@ -42,6 +50,9 @@ namespace Gtkmm2ext {
        class BarController;
        class Pix;
 }
+namespace Gtk {
+       class Menu;
+}
 
 class GainMeter : public Gtk::VBox
 {

diff --git a/gtk2_ardour/imageframe_socket_handler.h b/gtk2_ardour/imageframe_socket_handler.h
index cbf28e136cc0a7a821232571ec3fc62652fbd70b..d9798649c2179a1755fa57e0d3d1f4cd467431f6 100644 (file)
--- a/gtk2_ardour/imageframe_socket_handler.h
+++ b/gtk2_ardour/imageframe_socket_handler.h
@@ -22,7 +22,6 @@
 #define __ardour_gtk_imageframe_socket_handler_h__
 
 #include <string>
-#include <gtkmm.h>
 #include <list>
 #include "editor.h"
 #include "ardour_image_compositor_socket.h"

diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc
index 27d1b3e077f9dbad03ef78e8f330ecf644d15233..00d20129df8c6161abf6125f7d8b42fd2204f813 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis.cc
+++ b/gtk2_ardour/imageframe_time_axis.cc
@@ -23,6 +23,8 @@
 
 #include <pbd/error.h>
 
+#include <gtkmm/menu.h>
+
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/gtk_ui.h>
 
@@ -44,9 +46,9 @@
 
 #include "i18n.h"
 
-using namespace ARDOUR ;
-using namespace sigc ;
-using namespace Gtk ;
+using namespace ARDOUR;
+using namespace sigc;
+using namespace Gtk;
 
 /**
  * Constructs a new ImageFrameTimeAxis.
@@ -245,6 +247,7 @@ void
 ImageFrameTimeAxis::build_display_menu()
 {
        using namespace Menu_Helpers;
+       using Gtk::Menu;
 
        /* get the size menu ready */
 
@@ -279,6 +282,7 @@ void
 ImageFrameTimeAxis::create_imageframe_menu()
 {
        using namespace Menu_Helpers;
+       using Gtk::Menu;
 
        imageframe_menu = manage(new Menu) ;
        imageframe_menu->set_name ("ArdourContextMenu");

diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h
index 266cb4405d61c8d2b032d6755f3d2b975b3805c0..3b64e32f96ed6b2d3fe9633b9548416fe0a5f4cd 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis.h
+++ b/gtk2_ardour/imageframe_time_axis.h
@@ -22,7 +22,7 @@
 #define __ardour_imageframe_time_axis_h__
 
 #include <list>
-#include <gtkmm.h>
+
 #include <libgnomecanvas/libgnomecanvas.h>
 
 #include "ardour_dialog.h"
@@ -35,6 +35,9 @@ namespace ARDOUR
 {
        class Session ;
 }
+namespace Gtk {
+       class Menu;
+}
 
 class PublicEditor ;
 class ImageFrameView ;

diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h
index 090a464b4b89aa487495df275765a6c903ced67f..d358d7ae4aa7bd2072f03a2be445972e874c391c 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_group.h
+++ b/gtk2_ardour/imageframe_time_axis_group.h
@@ -24,7 +24,8 @@
 #include <list>
 #include <cmath>
 
-#include <gtkmm.h>
+#include <gdkmm/color.h>
+
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <jack/jack.h>
 #include "imageframe_time_axis_view.h"

diff --git a/gtk2_ardour/imageframe_time_axis_view.h b/gtk2_ardour/imageframe_time_axis_view.h
index 46403167c42c61fe596aad92d3a4bcf4b9a6de60..e97606d542e70f2bff2c91c727cea21af487124b 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_view.h
+++ b/gtk2_ardour/imageframe_time_axis_view.h
@@ -24,8 +24,10 @@
 #include <list>
 #include <cmath>
 
+#include <gdkmm/color.h>
+
 #include <jack/jack.h>
-#include <gtkmm.h>
+
 #include <libgnomecanvasmm/libgnomecanvasmm.h>
 #include "canvas.h"
 #include "simplerect.h"

diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h
index d29ba3deb060478bb85b8283eb96fd0099629343..a49f7c920099e84889f96b56973b00fd944833eb 100644 (file)
--- a/gtk2_ardour/imageframe_view.h
+++ b/gtk2_ardour/imageframe_view.h
@@ -22,7 +22,7 @@
 #define __gtk_ardour_imageframe_view_h__
 
 #include <string>
-#include <gtkmm.h>
+#include <gdkmm/color.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <sigc++/signal.h>
 #include <list>

diff --git a/gtk2_ardour/marker_time_axis.cc b/gtk2_ardour/marker_time_axis.cc
index 767bb458f3e7742e155b77e26977780b1f7807a0..e8673e6fe349035ac0d14c5d595233645d3d3d58 100644 (file)
--- a/gtk2_ardour/marker_time_axis.cc
+++ b/gtk2_ardour/marker_time_axis.cc
@@ -22,6 +22,8 @@
 
 #include <pbd/error.h>
 
+#include <gtkmm/menu.h>
+
 #include <gtkmm2ext/utils.h>
 
 #include <ardour/session.h>
@@ -240,6 +242,7 @@ void
 MarkerTimeAxis::build_marker_menu()
 {
        using namespace Menu_Helpers;
+       using Gtk::Menu;
 
        marker_menu = manage(new Menu) ;
        marker_menu->set_name ("ArdourContextMenu");

diff --git a/gtk2_ardour/marker_time_axis.h b/gtk2_ardour/marker_time_axis.h
index a48eec7d5ac40901b39f89284dfb5dd5670af551..db1fd09403717b8d56664b4feb256ceddff31605 100644 (file)
--- a/gtk2_ardour/marker_time_axis.h
+++ b/gtk2_ardour/marker_time_axis.h
@@ -22,7 +22,6 @@
 #define __ardour_marker_time_axis_h__
 
 #include <string>
-#include <gtkmm.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 
 #include "ardour_dialog.h"
@@ -35,6 +34,9 @@
 namespace ARDOUR {
        class Session;
 }
+namespace ARDOUR {
+       class Menu;
+}
 
 class PublicEditor;
 class ImageFrameView ;

diff --git a/gtk2_ardour/marker_time_axis_view.h b/gtk2_ardour/marker_time_axis_view.h
index 4f6caf82663195d453ead2eb066aee42378d6b80..1dd742a4591060f8e63a43b755b57014afab5924 100644 (file)
--- a/gtk2_ardour/marker_time_axis_view.h
+++ b/gtk2_ardour/marker_time_axis_view.h
@@ -22,8 +22,7 @@
 #define __ardour_marker_time_axis_view_h__
 
 #include <list>
-
-#include <gtkmm.h>
+#include <gdkmm/color.h>
 #include <libgnomecanvasmm/group.h>
 
 #include <ardour/location.h>

diff --git a/gtk2_ardour/marker_view.h b/gtk2_ardour/marker_view.h
index a3e7dc3feac2d81cffa63276dfc80fd1a9113312..da45b33dd9fbd266b121314a7aa28e812fdcf901 100644 (file)
--- a/gtk2_ardour/marker_view.h
+++ b/gtk2_ardour/marker_view.h
@@ -22,11 +22,14 @@
 #define __gtk_ardour_marker_view_h__
 
 #include <string>
-#include <gtkmm.h>
 #include "time_axis_view_item.h"
 
 #include "canvas.h"
 
+namespace Gdk {
+       class Color;
+}
+
 class MarkerTimeAxisView ;
 class ImageFrameView ;
 

diff --git a/gtk2_ardour/meter_bridge_strip.h b/gtk2_ardour/meter_bridge_strip.h
index 7a0a9fa14490ea6a3791a9db8b8dafd19460902d..62a3d6107201c8c689c605231c91b3cb56bc262a 100644 (file)
--- a/gtk2_ardour/meter_bridge_strip.h
+++ b/gtk2_ardour/meter_bridge_strip.h
@@ -22,7 +22,13 @@
 #define __ardour_meterbridgestrip_h__
 
 #include <sigc++/signal.h>
-#include <gtkmm.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/widget.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/label.h>
+#include <gtkmm/frame.h>
+
 #include <gtkmm2ext/fastmeter.h>
 
 namespace ARDOUR {

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 6e36573929bd5bb5696e1edaaf8ee3e6e96b781c..e5ea5b6cf3fdb536c384d63d8307f72845938b53 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -24,7 +24,18 @@
 #include <vector>
 
 #include <cmath>
-#include <gtkmm.h>
+
+#include <gtkmm/eventbox.h>
+#include <gtkmm/button.h>
+#include <gtkmm/box.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/textview.h>
+#include <gtkmm/adjustment.h>
+
 #include <gtkmm2ext/auto_spin.h>
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/click_box.h>
@@ -61,6 +72,10 @@ namespace ARDOUR {
        class Connection;
        class Plugin;
 }
+namespace Gtk {
+       class Window;
+       class Style;
+}
 
 class Mixer_UI;
 

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 221f45ec2a93621d6b05cd2afdb4a82e1565f9c8..70a32b0cf847c4495daaa2c196dbd0b90fece0c0 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -516,9 +516,11 @@ Mixer_UI::track_display_selection_changed ()
 
        for (i = rows.begin(); i != rows.end(); ++i) {
                if (selection->is_selected (i)) {
+                       strip = (*i)[track_display_columns.strip];
                        strip->set_marked_for_display  (true);
                        show_strip (strip);
                } else {
+                       strip = (*i)[track_display_columns.strip];
                        strip->set_marked_for_display (false);
                        hide_strip (strip);
                }

diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index b730562c9bce2d139cb7d8606b37bd96bdfb36f8..90b3500a91fce42f9b4f04ef9276a3d9ce8b55d4 100644 (file)
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -22,6 +22,12 @@
 #include "new_session_dialog.h"
 #include "glade_path.h"
 
+#include <gtkmm/entry.h>
+#include <gtkmm/filechooserbutton.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/radiobutton.h>
+
 const char* NewSessionDialogFactory::s_m_top_level_widget_name = X_("NewSessionDialog");
 const char* NewSessionDialogFactory::top_level_widget_name() { return s_m_top_level_widget_name; }
 

diff --git a/gtk2_ardour/new_session_dialog.h b/gtk2_ardour/new_session_dialog.h
index 155397ad3b930e953e91a301edf653ebf28a06da..ec3a3eb0333d67535659886aadc066e7c607beb5 100644 (file)
--- a/gtk2_ardour/new_session_dialog.h
+++ b/gtk2_ardour/new_session_dialog.h
@@ -24,7 +24,16 @@
 #define NEW_SESSION_DIALOG_H
 
 #include <string>
-#include <gtkmm.h>
+#include <gtkmm/dialog.h>
+#include <glibmm/refptr.h>
+
+namespace Gtk {
+       class Entry;
+       class FileChooserButton;
+       class SpinButton;
+       class CheckButton;
+       class RadioButton;
+}
 
 #include "glade_factory.h"
 

diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index e97fa7457642694722aeb856360af0d297043f5f..c6b2bad6c952bcd25197b5840bd90c20deac5897 100644 (file)
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -22,6 +22,9 @@
 #include <climits>
 #include <string.h>
 
+#include <gtkmm/menu.h>
+#include <gtkmm/checkmenuitem.h>
+
 #include <pbd/error.h>
 #include <ardour/panner.h>
 #include <gtkmm2ext/gtk_ui.h>

diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index d3ceef1401d70d57ca725ce946f784f8491038ee..ff81ea398719b0c4c1155a4462c99a52d7c8daf3 100644 (file)
--- a/gtk2_ardour/panner2d.h
+++ b/gtk2_ardour/panner2d.h
@@ -24,7 +24,9 @@
 #include <sys/types.h>
 #include <map>
 #include <string>
-#include <gtkmm.h>
+
+#include <glibmm/refptr.h>
+#include <gtkmm/drawingarea.h>
 
 using std::map;
 using std::string;
@@ -33,6 +35,15 @@ namespace ARDOUR {
        class Panner;
 }
 
+namespace Gtk {
+       class Menu;
+       class CheckMenuItem;
+}
+
+namespace Pango {
+       class Layout;
+}
+
 class Panner2d : public Gtk::DrawingArea
 {
   public:

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index b028510de34e7f0613f3260c534bff1458561ff4..a1435973b758f3dab43810321b02ab012a468943 100644 (file)
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -22,7 +22,15 @@
 #define __ardour_gtk_panner_ui_h__
 
 #include <vector>
-#include <gtkmm.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/viewport.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/arrow.h>
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/button.h>
+
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/click_box.h>
 
@@ -39,6 +47,11 @@ namespace Gtkmm2ext {
        class BarController;
 }
 
+namespace Gtk {
+       class Menu;
+       class Menuitem;
+}
+
 class PannerUI : public Gtk::HBox
 {
   public:

diff --git a/gtk2_ardour/redirect_automation_line.h b/gtk2_ardour/redirect_automation_line.h
index feeb024276b976bc63e90467a374f1da2056a605..a29de2462e453d08029727da4b8decc555b8743d 100644 (file)
--- a/gtk2_ardour/redirect_automation_line.h
+++ b/gtk2_ardour/redirect_automation_line.h
@@ -22,7 +22,6 @@
 #define __ardour_gtk_redirect_automation_line_h__
 
 #include <ardour/ardour.h>
-#include <gtkmm.h>
 
 #include "automation_line.h"
 

diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index c3eecf97b2a8064d5510a0c963051eaa654b988d..95ce4110a4493e5ccf9b6382258df41a7bf71054 100644 (file)
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -92,7 +92,7 @@ RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelec
        selection->signal_changed().connect (mem_fun (*this, &RedirectBox::selection_changed));
 
        redirect_display.set_model (model);
-       redirect_display.append_column (NULL, columns.text);
+       redirect_display.append_column ("WHY?", columns.text);
        redirect_display.set_name ("MixerRedirectSelector");
        redirect_display.set_headers_visible (false);
        redirect_display.set_reorderable (true);

diff --git a/gtk2_ardour/region_editor.h b/gtk2_ardour/region_editor.h
index 4c77e6186f28fc65b009bb815a4fb10db431a4d0..08ab05f3341137a2b561400bd65bda4f69db55f0 100644 (file)
--- a/gtk2_ardour/region_editor.h
+++ b/gtk2_ardour/region_editor.h
@@ -23,7 +23,19 @@
 
 #include <map>
 
-#include <gtkmm.h>
+#include <gtkmm/label.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/box.h>
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/button.h>
+#include <gtkmm/arrow.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/table.h>
+#include <gtkmm/alignment.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/separator.h>
+#include <gtkmm/spinbutton.h>
+
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <sigc++/signal.h>
 

diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h
index 69bd2e02d27d009ac869bf7113111a750d074ca9..02b81fe1c11f19f89e1f6b9fc85b8a7461962e09 100644 (file)
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -3,7 +3,6 @@
 
 #include <ardour/ardour.h>
 #include <libgnomecanvasmm/libgnomecanvasmm.h>
-#include <gtkmm.h>
 
 #include "automation_line.h"
 

diff --git a/gtk2_ardour/regionview.h b/gtk2_ardour/regionview.h
index 9a7adf2719f457edfc98d0021fbce88ca2b9102b..0ce154747fd81d62897c527e775d1897a52a695b 100644 (file)
--- a/gtk2_ardour/regionview.h
+++ b/gtk2_ardour/regionview.h
@@ -22,7 +22,7 @@
 #define __gtk_ardour_region_view_h__
 
 #include <vector>
-#include <gtkmm.h>
+
 #include <libgnomecanvasmm/libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 #include <sigc++/signal.h>

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index e7a8e10b3456081ee9f2be60f383c68c9a1521df..5327eb59d7a00273ff157835b660d8e83c8859bd 100644 (file)
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -23,7 +23,6 @@
 
 #include <list>
 
-#include <gtkmm.h>
 #include <pbd/xml++.h>
 #include <ardour/ardour.h>
 #include <ardour/route.h>
@@ -38,6 +37,12 @@ namespace ARDOUR {
        class AudioTrack;
 }
 
+namespace Gtk {
+       class Menu;
+       class CheckMenuItem;
+       class Widget;
+}
+
 class RouteUI : public virtual AxisView
 {
   public:

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 3e376d34d7ac5b64ab9fe506b9e275701fb737fa..54dac3e4feaa306d84afbd737a11debc16bda41a 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -25,13 +25,15 @@
 #include <map>
 #include <cmath>
 
-#include <gtkmm.h>
-
 #include <ardour/location.h>
 #include "enums.h"
 #include "simplerect.h"
 #include "canvas.h"
 
+namespace Gdk {
+       class Color;
+}
+
 namespace ARDOUR {
        class Route;
        class DiskStream;

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 59bb6c58eaac4227df7e182a7539e2f38808bb9d..1b132322e422527abb36cfc32f615c4e3330701f 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -24,7 +24,12 @@
 #include <vector>
 #include <list>
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/table.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
 
 #include <ardour/types.h>
 #include <ardour/region.h>
@@ -43,6 +48,10 @@ namespace ARDOUR {
        class Playlist;
 }
 
+namespace Gtk {
+       class Menu;
+}
+
 class PublicEditor;
 class AudioRegionSelection;
 class TimeSelection;

diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h
index 2768a0aac017ec32382138f74d5c231448136646..4c1827d284a2ae98fc4b3235ce8c21bc3c720925 100644 (file)
--- a/gtk2_ardour/visual_time_axis.h
+++ b/gtk2_ardour/visual_time_axis.h
@@ -21,7 +21,9 @@
 #ifndef __ardour_visual_time_axis_h__
 #define __ardour_visual_time_axis_h__
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+
 #include <gtkmm2ext/selector.h>
 
 #include "ardour_dialog.h"