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

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>
 

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

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"

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"

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"
 

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>

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
+}

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;

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;
+}
+

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
 {

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"

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");

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 ;

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"

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"

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>

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");

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 ;

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>

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 ;
 

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 {

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;
 

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);
 		}

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; }
 

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"
 

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>

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:

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:

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"
 

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);

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>
 

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"
 

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>

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:

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;

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;

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"