summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/audio_time_axis.h9
-rw-r--r--gtk2_ardour/automation_gain_line.h2
-rw-r--r--gtk2_ardour/automation_line.h1
-rw-r--r--gtk2_ardour/automation_pan_line.h1
-rw-r--r--gtk2_ardour/axis_view.h5
-rw-r--r--gtk2_ardour/crossfade_view.h1
-rw-r--r--gtk2_ardour/editor.cc20
-rw-r--r--gtk2_ardour/editor.h3
-rw-r--r--gtk2_ardour/editor_canvas.cc14
-rw-r--r--gtk2_ardour/gain_meter.h13
-rw-r--r--gtk2_ardour/imageframe_socket_handler.h1
-rw-r--r--gtk2_ardour/imageframe_time_axis.cc10
-rw-r--r--gtk2_ardour/imageframe_time_axis.h5
-rw-r--r--gtk2_ardour/imageframe_time_axis_group.h3
-rw-r--r--gtk2_ardour/imageframe_time_axis_view.h4
-rw-r--r--gtk2_ardour/imageframe_view.h2
-rw-r--r--gtk2_ardour/marker_time_axis.cc3
-rw-r--r--gtk2_ardour/marker_time_axis.h4
-rw-r--r--gtk2_ardour/marker_time_axis_view.h3
-rw-r--r--gtk2_ardour/marker_view.h5
-rw-r--r--gtk2_ardour/meter_bridge_strip.h8
-rw-r--r--gtk2_ardour/mixer_strip.h17
-rw-r--r--gtk2_ardour/mixer_ui.cc2
-rw-r--r--gtk2_ardour/new_session_dialog.cc6
-rw-r--r--gtk2_ardour/new_session_dialog.h11
-rw-r--r--gtk2_ardour/panner2d.cc3
-rw-r--r--gtk2_ardour/panner2d.h13
-rw-r--r--gtk2_ardour/panner_ui.h15
-rw-r--r--gtk2_ardour/redirect_automation_line.h1
-rw-r--r--gtk2_ardour/redirect_box.cc2
-rw-r--r--gtk2_ardour/region_editor.h14
-rw-r--r--gtk2_ardour/region_gain_line.h1
-rw-r--r--gtk2_ardour/regionview.h2
-rw-r--r--gtk2_ardour/route_ui.h7
-rw-r--r--gtk2_ardour/streamview.h6
-rw-r--r--gtk2_ardour/time_axis_view.h11
-rw-r--r--gtk2_ardour/visual_time_axis.h4
37 files changed, 187 insertions, 45 deletions
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index c9a0e69ce5..6f4405b5a7 100644
--- 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 2962b2a718..39d06dd937 100644
--- 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 0567abba05..aa42912dc1 100644
--- 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 13f31a4e63..88191c34c1 100644
--- 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 e0ad68e5c9..38deece11a 100644
--- 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 deb33e4476..f4676cf695 100644
--- 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 caa66290d2..e8aaee5b99 100644
--- 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);
@@ -1003,15 +1006,6 @@ Editor::on_realize ()
}
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)
{
canvas_width = alloc.get_width();
@@ -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 5dd5e237e1..185059593b 100644
--- 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 181697d4e2..46b625407a 100644
--- 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 a1dafafde9..6a7b88e1c4 100644
--- 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 cbf28e136c..d9798649c2 100644
--- 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 27d1b3e077..00d20129df 100644
--- 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 266cb4405d..3b64e32f96 100644
--- 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 090a464b4b..d358d7ae4a 100644
--- 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 46403167c4..e97606d542 100644
--- 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 d29ba3deb0..a49f7c9200 100644
--- 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 767bb458f3..e8673e6fe3 100644
--- 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 a48eec7d5a..db1fd09403 100644
--- 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 4f6caf8266..1dd742a459 100644
--- 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 a3e7dc3fea..da45b33dd9 100644
--- 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 7a0a9fa144..62a3d61072 100644
--- 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 6e36573929..e5ea5b6cf3 100644
--- 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 221f45ec2a..70a32b0cf8 100644
--- 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 b730562c9b..90b3500a91 100644
--- 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 155397ad3b..ec3a3eb033 100644
--- 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 e97fa74576..c6b2bad6c9 100644
--- 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 d3ceef1401..ff81ea3987 100644
--- 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 b028510de3..a1435973b7 100644
--- 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 feeb024276..a29de2462e 100644
--- 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 c3eecf97b2..95ce4110a4 100644
--- 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 4c77e6186f..08ab05f334 100644
--- 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 69bd2e02d2..02b81fe1c1 100644
--- 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 9a7adf2719..0ce154747f 100644
--- 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 e7a8e10b34..5327eb59d7 100644
--- 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 3e376d34d7..54dac3e4fe 100644
--- 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 59bb6c58ea..1b132322e4 100644
--- 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 2768a0aac0..4c1827d284 100644
--- 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"