From a01dc9b6f252a582b2165b255eb5a80024379a8b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 31 May 2010 14:21:43 +0000 Subject: [PATCH] remove almost-unusued stop_signal.h and clean up the one (unused) place where it was present (VisualTimeAxis, not used in current ardour) git-svn-id: svn://localhost/ardour2/branches/3.0@7196 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui.cc | 1 - gtk2_ardour/audio_region_editor.cc | 1 - gtk2_ardour/audio_time_axis.cc | 1 - gtk2_ardour/editor_regions.cc | 2 -- gtk2_ardour/editor_route_groups.cc | 1 - gtk2_ardour/editor_selection_list.cc | 2 -- gtk2_ardour/gain_meter.cc | 1 - gtk2_ardour/gtk-custom-hruler.c | 6 ++--- gtk2_ardour/gtk-custom-ruler.c | 6 ++--- gtk2_ardour/level_meter.cc | 1 - gtk2_ardour/location_ui.cc | 1 - gtk2_ardour/midi_time_axis.cc | 1 - gtk2_ardour/mixer_strip.cc | 1 - gtk2_ardour/panner_ui.cc | 1 - gtk2_ardour/processor_box.cc | 1 - gtk2_ardour/region_editor.cc | 1 - gtk2_ardour/route_params_ui.cc | 1 - gtk2_ardour/route_time_axis.cc | 1 - gtk2_ardour/route_ui.cc | 1 - gtk2_ardour/time_axis_view.cc | 1 - gtk2_ardour/visual_time_axis.cc | 19 ++++++++------- gtk2_ardour/visual_time_axis.h | 8 +++---- libs/gtkmm2ext/gtkmm2ext/stop_signal.h | 33 -------------------------- 23 files changed, 20 insertions(+), 72 deletions(-) delete mode 100644 libs/gtkmm2ext/gtkmm2ext/stop_signal.h diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 508e5c817a..8baa74b160 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -49,7 +49,6 @@ #include "gtkmm2ext/utils.h" #include "gtkmm2ext/click_box.h" #include "gtkmm2ext/fastmeter.h" -#include "gtkmm2ext/stop_signal.h" #include "gtkmm2ext/popup.h" #include "gtkmm2ext/window_title.h" diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index e6983eb970..bade9b27d9 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -26,7 +26,6 @@ #include "ardour/utils.h" #include "ardour/dB.h" #include -#include #include #include "audio_region_editor.h" diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index dc98cc95e1..b009508fff 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -33,7 +33,6 @@ #include #include -#include #include #include diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index 9eef845156..dca382415a 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -33,8 +33,6 @@ #include "ardour/silentfilesource.h" #include "ardour/profile.h" -#include - #include "editor.h" #include "editing.h" #include "keyboard.h" diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index ecd3d3e7c4..c30132a3b8 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -20,7 +20,6 @@ #include #include -#include #include #include "ardour/route_group.h" diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc index 62b04d8efa..73ceb59c37 100644 --- a/gtk2_ardour/editor_selection_list.cc +++ b/gtk2_ardour/editor_selection_list.cc @@ -27,8 +27,6 @@ #include "ardour/session_selection.h" #include "ardour/playlist.h" -#include - #include "editor.h" #include "keyboard.h" #include "selection.h" diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 63c8651520..b8a6ad2df9 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include "midi++/manager.h" diff --git a/gtk2_ardour/gtk-custom-hruler.c b/gtk2_ardour/gtk-custom-hruler.c index 61a34a7c41..e5d39b30ec 100644 --- a/gtk2_ardour/gtk-custom-hruler.c +++ b/gtk2_ardour/gtk-custom-hruler.c @@ -251,9 +251,9 @@ gtk_custom_hruler_draw_pos (GtkCustomRuler * ruler) if ((bs_width > 0) && (bs_height > 0)) { /* If a backing store exists, restore the ruler */ if (ruler->backing_store && ruler->non_gr_exp_gc) - gdk_draw_pixmap (ruler->widget.window, - ruler->non_gr_exp_gc, - ruler->backing_store, ruler->xsrc, ruler->ysrc, ruler->xsrc, ruler->ysrc, bs_width, bs_height); + gdk_draw_drawable (ruler->widget.window, + ruler->non_gr_exp_gc, + GDK_DRAWABLE(ruler->backing_store), ruler->xsrc, ruler->ysrc, ruler->xsrc, ruler->ysrc, bs_width, bs_height); increment = (gfloat) width / (ruler->upper - ruler->lower); x = ROUND ((ruler->position - ruler->lower) * increment) + (xthickness - bs_width) / 2 - 1; diff --git a/gtk2_ardour/gtk-custom-ruler.c b/gtk2_ardour/gtk-custom-ruler.c index b66dd68bd3..797922f563 100644 --- a/gtk2_ardour/gtk-custom-ruler.c +++ b/gtk2_ardour/gtk-custom-ruler.c @@ -442,9 +442,9 @@ gtk_custom_ruler_expose (GtkWidget * widget, GdkEventExpose * event) gtk_custom_ruler_draw_ticks (ruler); - gdk_draw_pixmap (widget->window, - ruler->non_gr_exp_gc, - ruler->backing_store, 0, 0, 0, 0, widget->allocation.width, widget->allocation.height); + gdk_draw_drawable (widget->window, + ruler->non_gr_exp_gc, + GDK_DRAWABLE(ruler->backing_store), 0, 0, 0, 0, widget->allocation.width, widget->allocation.height); gtk_custom_ruler_draw_pos (ruler); } diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index beed3a2341..efa9241bbd 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -26,7 +26,6 @@ #include #include -#include #include #include "midi++/manager.h" #include "pbd/fastlog.h" diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 68c03e0604..5a2e11038c 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -21,7 +21,6 @@ #include #include -#include #include "ardour/utils.h" #include "ardour/configuration.h" diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index c46aa9a26b..e51699db36 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -35,7 +35,6 @@ #include #include -#include #include #include diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index a2ebc0be6a..bbef4ffbf6 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 1a48353e0b..69387ad3a2 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -21,7 +21,6 @@ #include "ardour/io.h" #include "ardour/dB.h" #include -#include #include #include "midi++/manager.h" #include "pbd/fastlog.h" diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 8600e01442..cc322df13d 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -37,7 +37,6 @@ #include #include #include -#include #include #include "ardour/amp.h" diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc index d6d4d877ae..27c7455281 100755 --- a/gtk2_ardour/region_editor.cc +++ b/gtk2_ardour/region_editor.cc @@ -26,7 +26,6 @@ #include "ardour/utils.h" #include "ardour/dB.h" #include -#include #include #include "region_editor.h" diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 64e78c2125..b8ec7301a1 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include "ardour/ardour.h" diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 2c6c9a36c4..9ec6048de5 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -39,7 +39,6 @@ #include #include #include -#include #include #include diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 9cbdd779f4..f87614b613 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -18,7 +18,6 @@ */ #include -#include #include #include #include diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index e5d4092789..43d9d4b41b 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -32,7 +32,6 @@ #include #include -#include #include "ardour/session.h" #include "ardour/utils.h" diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc index f1695c00df..5c61980edc 100644 --- a/gtk2_ardour/visual_time_axis.cc +++ b/gtk2_ardour/visual_time_axis.cc @@ -30,7 +30,6 @@ #include #include #include -#include #include #include "ardour/session.h" @@ -373,22 +372,22 @@ VisualTimeAxis::name_entry_changed() } } -gint +bool VisualTimeAxis::name_entry_button_press_handler(GdkEventButton *ev) { if (ev->button == 3) { - return stop_signal (name_entry, "button_press_event"); + return true; } - return FALSE; + return false } -gint +bool VisualTimeAxis::name_entry_button_release_handler(GdkEventButton *ev) { - return FALSE; + return false; } -gint +bool VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev) { switch (ev->keyval) { @@ -396,11 +395,13 @@ VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev) case GDK_Up: case GDK_Down: name_entry_changed (); - return TRUE; + return true; default: - return FALSE; + break; } + + return false; } diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h index 5e9c4df0c2..df0a061ba6 100644 --- a/gtk2_ardour/visual_time_axis.h +++ b/gtk2_ardour/visual_time_axis.h @@ -227,10 +227,10 @@ class VisualTimeAxis : public TimeAxisView // Handle name entry signals void name_entry_changed() ; - gint name_entry_focus_out_handler(GdkEventFocus*) ; - gint name_entry_key_release_handler(GdkEventKey*) ; - gint name_entry_button_release_handler(GdkEventButton*) ; - gint name_entry_button_press_handler(GdkEventButton*) ; + bool name_entry_focus_out_handler(GdkEventFocus*) ; + bool name_entry_key_release_handler(GdkEventKey*) ; + bool name_entry_button_release_handler(GdkEventButton*) ; + bool name_entry_button_press_handler(GdkEventButton*) ; //---------------------------------------------------------------------------------------// // VisualTimeAxis Widgets diff --git a/libs/gtkmm2ext/gtkmm2ext/stop_signal.h b/libs/gtkmm2ext/gtkmm2ext/stop_signal.h deleted file mode 100644 index cb8dedca12..0000000000 --- a/libs/gtkmm2ext/gtkmm2ext/stop_signal.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - Copyright (C) 2000-2007 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#ifndef __ardour_gtk_stop_signal_h__ -#define __ardour_gtk_stop_signal_h__ - -#include -#include - -static inline gint -stop_signal (Gtk::Widget& widget, const char *signal_name) -{ - gtk_signal_emit_stop_by_name (GTK_OBJECT(widget.gobj()), signal_name); - return TRUE; -} - -#endif /* __ardour_gtk_stop_signal_h__ */