Uploaded start of CoreAudioSource. More sfdb work.

[ardour.git] / gtk2_ardour / editor_hscroller.cc

diff --git a/gtk2_ardour/editor_hscroller.cc b/gtk2_ardour/editor_hscroller.cc
index 0acc117840505340a5b30f48d3c5b93b07750c41..d918983f94c45c823c44813b1e92c84bf727246e 100644 (file)
--- 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 ;
@@ -64,23 +64,23 @@ Editor::hscroll_slider_expose (GdkEventExpose *ev)
 
        /* make sure we can see the bar at all times, and have enough to do zoom-trim on */
 
-       bar_rect.width = max ((guint16) (edit_hscroll_edge_width+5), bar_rect.width);
+       bar_rect.width = max ((guint16) (edit_hscroll_edge_width+5), (guint16) bar_rect.width);
 
        gdk_rectangle_intersect (&ev->area, &bar_rect, &draw_rect);
 
        gtk_paint_box (edit_hscroll_slider.get_style()->gobj(),
-                      edit_hscroll_slider.get_window(),
+                      edit_hscroll_slider.get_window()->gobj(),
                       GTK_STATE_ACTIVE, 
-                      Gtk::SHADOW_IN, 
+                      GTK_SHADOW_IN, 
                       &ev->area, 
                       GTK_WIDGET(edit_hscroll_slider.gobj()),
                       "trough",
                       0, 0, -1, -1);
 
        gtk_paint_box (edit_hscroll_slider.get_style()->gobj(),
-                      edit_hscroll_slider.get_window(),
-                      Gtk::STATE_NORMAL, 
-                      Gtk::SHADOW_OUT, 
+                      edit_hscroll_slider.get_window()->gobj(),
+                      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;
@@ -147,7 +147,6 @@ Editor::hscroll_slider_button_release (GdkEventButton *ev)
        
        return TRUE;
 
-       
        start = (gint) floor (bar_max * ((double) leftmost_frame / session->current_end_frame()));
        width = (gint) floor (bar_max * ((canvas_width * frames_per_unit) / session->current_end_frame()));
 
@@ -164,7 +163,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;
@@ -174,14 +173,14 @@ gint
 Editor::hscroll_slider_motion (GdkEventMotion *ev)
 {
        gint x, y;
-       GdkModifierType state;
+       Gdk::ModifierType state;
        gint bar_max = edit_hscroll_slider_width - 2;
 
        if (!session || !edit_hscroll_dragging) {
                return TRUE;
        }
 
-       edit_hscroll_slider.get_window().get_pointer (x, y, state);
+       edit_hscroll_slider.get_window()->get_pointer (x, y, state);
 
        jack_nframes_t new_frame;
        jack_nframes_t frames;