From 24eb48670117af53738006948f5ce23a5f8a22d6 Mon Sep 17 00:00:00 2001 From: carlh Date: Tue, 19 Apr 2011 10:43:43 +0000 Subject: [PATCH] Cleanup some more gint -> bools. git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/3.0@9374 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor.cc | 2 +- gtk2_ardour/editor.h | 10 +++++----- gtk2_ardour/editor_rulers.cc | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index c6aaf3fb4..e131efeb2 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3557,7 +3557,7 @@ Editor::edit_controls_button_release (GdkEventButton* ev) return true; } -gint +bool Editor::mouse_select_button_release (GdkEventButton* ev) { /* this handles just right-clicks */ diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 20e8ef02b..1a08dd3aa 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -774,9 +774,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Glib::RefPtr ruler_cd_marker_action; bool no_ruler_shown_update; - gint ruler_button_press (GdkEventButton*); - gint ruler_button_release (GdkEventButton*); - gint ruler_mouse_motion (GdkEventMotion*); + bool ruler_button_press (GdkEventButton*); + bool ruler_button_release (GdkEventButton*); + bool ruler_mouse_motion (GdkEventMotion*); bool ruler_scroll (GdkEventScroll* event); Gtk::Widget * ruler_grabbed_widget; @@ -791,7 +791,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void set_ruler_visible (RulerType, bool); void toggle_ruler_visibility (RulerType rt); void ruler_toggled (int); - gint ruler_label_button_release (GdkEventButton*); + bool ruler_label_button_release (GdkEventButton*); void store_ruler_visibility (); void restore_ruler_visibility (); @@ -1537,7 +1537,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtkmm2ext::StatefulToggleButton internal_edit_button; void toggle_internal_editing (); - gint mouse_select_button_release (GdkEventButton*); + bool mouse_select_button_release (GdkEventButton*); Gtk::VBox automation_box; Gtk::Button automation_mode_button; diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index c382e97d1..1c077e855 100644 --- 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 (ActionManager::get_widget (X_("/RulerMenuPopup"))); + Gtk::Menu* m = dynamic_cast (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 (ev), false); } - return TRUE; + return true; } -- 2.11.4.GIT