diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/audio_time_axis.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor_keys.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/utils.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/visual_time_axis.h | 1 |
4 files changed, 4 insertions, 9 deletions
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h index 4515e0f4a2..052f0bba82 100644 --- a/gtk2_ardour/audio_time_axis.h +++ b/gtk2_ardour/audio_time_axis.h @@ -24,7 +24,6 @@ #include <gtkmm.h> #include <libgnomecanvas/libgnomecanvas.h> #include <gtkmm2ext/selector.h> -#include <gtkmm2ext/popup_selector.h> #include <list> #include <ardour/types.h> diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc index b0a97f5093..dca998b43b 100644 --- a/gtk2_ardour/editor_keys.cc +++ b/gtk2_ardour/editor_keys.cc @@ -20,13 +20,10 @@ #include <cstdlib> #include <cmath> - #include <string> #include <pbd/error.h> -#include <gtkmm2ext/popup_selector.h> - #include <ardour/session.h> #include <ardour/region.h> diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index ee124db50f..b313d3b129 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -450,9 +450,9 @@ pane_handler (GdkEventButton* ev, Gtk::Paned* pane) pos = Gtkmm2ext::gtk_paned_get_position (pane->gobj()); if (dynamic_cast<VPaned*>(pane)) { - cmp = pane->height(); + cmp = pane->get_height(); } else { - cmp = pane->width(); + cmp = pane->get_width(); } /* we have to use approximations here because we can't predict the @@ -481,9 +481,9 @@ pane_handler (GdkEventButton* ev, Gtk::Paned* pane) pane->set_position (1); } else { if (dynamic_cast<VPaned*>(pane)) { - pane->set_position (pane->height()); + pane->set_position (pane->get_height()); } else { - pane->set_position (pane->width()); + pane->set_position (pane->get_width()); } } } diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h index a00deba5d2..ad4868d624 100644 --- a/gtk2_ardour/visual_time_axis.h +++ b/gtk2_ardour/visual_time_axis.h @@ -24,7 +24,6 @@ #include <gtkmm.h> #include <libgnomecanvas/libgnomecanvas.h> #include <gtkmm2ext/selector.h> -#include <gtkmm2ext/popup_selector.h> #include "ardour_dialog.h" #include "route_ui.h" |