X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_hscroller.cc;h=b1880603502b53702e8e3e6bec3019c7724f74f6;hb=aaa44a37aaf585b9bcd9268a9551a005e6269bdb;hp=bdf251537c60f75433abad38ef728094733756c1;hpb=c38fdbc64c73c686f9f55729b352f8d0f4c09070;p=ardour.git

diff --git a/gtk2_ardour/editor_hscroller.cc b/gtk2_ardour/editor_hscroller.cc
index bdf251537c..b188060350 100644
--- a/gtk2_ardour/editor_hscroller.cc
+++ b/gtk2_ardour/editor_hscroller.cc
@@ -26,7 +26,7 @@ using namespace std;
 using namespace ARDOUR;
 
 void
-Editor::hscroll_slider_allocate (GtkAllocation *alloc)
+Editor::hscroll_slider_allocate (Gtk::Allocation &alloc)
 {
 	//edit_hscroll_slider_width = alloc->width;
 	//edit_hscroll_slider_height = alloc->height ;
@@ -70,8 +70,8 @@ Editor::hscroll_slider_expose (GdkEventExpose *ev)
 
 	gtk_paint_box (edit_hscroll_slider.get_style()->gobj(),
 		       edit_hscroll_slider.get_window()->gobj(),
-		       Gtk::STATE_ACTIVE, 
-		       Gtk::SHADOW_IN, 
+		       GTK_STATE_ACTIVE, 
+		       GTK_SHADOW_IN, 
 		       &ev->area, 
 		       GTK_WIDGET(edit_hscroll_slider.gobj()),
 		       "trough",
@@ -79,8 +79,8 @@ Editor::hscroll_slider_expose (GdkEventExpose *ev)
 
 	gtk_paint_box (edit_hscroll_slider.get_style()->gobj(),
 		       edit_hscroll_slider.get_window()->gobj(),
-		       Gtk::STATE_NORMAL, 
-		       Gtk::SHADOW_OUT, 
+		       GTK_STATE_NORMAL, 
+		       GTK_SHADOW_OUT, 
 		       &draw_rect,
 		       GTK_WIDGET(edit_hscroll_slider.gobj()),
 		       "hscale",
@@ -117,7 +117,7 @@ Editor::hscroll_slider_button_press (GdkEventButton *ev)
 		
 		edit_hscroll_drag_last = x;
 		edit_hscroll_dragging = true;
-		Gtk::Main::grab_add (edit_hscroll_slider);
+		edit_hscroll_slider.add_modal_grab();
 	}
 
 	return TRUE;
@@ -164,7 +164,7 @@ Editor::hscroll_slider_button_release (GdkEventButton *ev)
 		// lets do a tempo redisplay now only, because it is dog slow
 		tempo_map_changed (Change (0));
 		edit_hscroll_dragging = false;
-		Gtk::Main::grab_remove (edit_hscroll_slider);
+		edit_hscroll_slider.remove_modal_grab();
 	} 
 
 	return TRUE;