fixes for 98% of all the warnings/errors reported by OS X gcc on tiger

[ardour.git] / gtk2_ardour / editor_rulers.cc

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index c382e97d1aba8c17f2217f92d210a1be4d5100ce..b7a3f2ba5faa74ad10a484225edacac8392bf228 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -216,11 +216,11 @@ Editor::ruler_scroll (GdkEventScroll* event)
 }
 
 
-gint
+bool
 Editor::ruler_button_press (GdkEventButton* ev)
 {
        if (_session == 0) {
-               return FALSE;
+               return false;
        }
 
        // jlc: grab ev->window ?
@@ -254,14 +254,14 @@ Editor::ruler_button_press (GdkEventButton* ev)
                _dragging_playhead = true;
        }
 
-       return TRUE;
+       return true;
 }
 
-gint
+bool
 Editor::ruler_button_release (GdkEventButton* ev)
 {
        if (_session == 0) {
-               return FALSE;
+               return false;
        }
 
        gint x,y;
@@ -288,35 +288,35 @@ Editor::ruler_button_release (GdkEventButton* ev)
                ruler_grabbed_widget = 0;
        }
 
-       return TRUE;
+       return true;
 }
 
-gint
+bool
 Editor::ruler_label_button_release (GdkEventButton* ev)
 {
        if (ev->button == 3) {
-               Gtk::Menu* m= dynamic_cast<Gtk::Menu*> (ActionManager::get_widget (X_("/RulerMenuPopup")));
+               Gtk::Menu* m = dynamic_cast<Gtk::Menu*> (ActionManager::get_widget (X_("/RulerMenuPopup")));
                if (m) {
                        m->popup (1, ev->time);
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 
-gint
+bool
 Editor::ruler_mouse_motion (GdkEventMotion* ev)
 {
        if (_session == 0) {
-               return FALSE;
+               return false;
        }
 
        if (_drags->active ()) {
                _drags->motion_handler (reinterpret_cast<GdkEvent*> (ev), false);
        }
 
-       return TRUE;
+       return true;
 }
 
 
@@ -1746,7 +1746,7 @@ Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper)
 }
 
 gint
-Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/)
+Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
 {
        framepos_t pos;
        framepos_t const ilower = (framepos_t) floor (lower);