remove almost-unusued stop_signal.h and clean up the one (unused) place where it...

git-svn-id: svn://localhost/ardour2/branches/3.0@7196 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 508e5c817a9cf28b3e00d5f362b6d017c2fcf3fb..8baa74b1608acf912026aa4c1ac062d66fd49c50 100644 (file)
--- 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 e6983eb97008595cb3a4c45af5790b9dd9323416..bade9b27d9a04e69cbd0bb5540faf0c388c42c3c 100644 (file)
--- 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 <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <cmath>
 
 #include "audio_region_editor.h"

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index dc98cc95e192d87923ce9024efd56cc3633ad6f4..b009508ffffe4a38ba64483d1a4c75d372871c80 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -33,7 +33,6 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 9eef845156307881257d1ee34da53750e950929d..dca382415a2e651a4c6aae2fd7adb016c791fce5 100644 (file)
--- 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 <gtkmm2ext/stop_signal.h>
-
 #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 ecd3d3e7c4c6d3448e2533e4d77ad6ac84d882ba..c30132a3b883ab4d4537be7e9080b696c7f0d5c7 100644 (file)
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -20,7 +20,6 @@
 #include <cstdlib>
 #include <cmath>
 
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/gtk_ui.h>
 #include "ardour/route_group.h"
 

diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc
index 62b04d8efa231a49b355ef3533f67b16863392f9..73ceb59c377544b86360947c5e3a94b417d4b000 100644 (file)
--- 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 <gtkmm2ext/stop_signal.h>
-
 #include "editor.h"
 #include "keyboard.h"
 #include "selection.h"

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 63c86515207f3d49cd766c5ace916f51d4703f88..b8a6ad2df9c07d899b1c4b036a0d27f509687147 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -32,7 +32,6 @@
 #include <gdkmm/color.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
 #include <gtkmm2ext/gtk_ui.h>
 #include "midi++/manager.h"

diff --git a/gtk2_ardour/gtk-custom-hruler.c b/gtk2_ardour/gtk-custom-hruler.c
index 61a34a7c418a61bc7feffec1a16f3fdef3b27e64..e5d39b30ec5a9e8d56c33ac6bb637b58189185fd 100644 (file)
--- 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 b66dd68bd3892de4c9a1cff2b259b21ba84efd6c..797922f5639b3296bba965a7f6133ac72b767fc3 100644 (file)
--- 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 beed3a2341a782dfc6a72c2e90567c3c6d18ba61..efa9241bbdfe356e50c4472a7b05bf195b8b3b7d 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -26,7 +26,6 @@
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
 #include "midi++/manager.h"
 #include "pbd/fastlog.h"

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 68c03e060409157a56bb6554531e86f278137e97..5a2e11038c482c87c8a4e88c5baecd945b3fe509 100644 (file)
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -21,7 +21,6 @@
 #include <cstdlib>
 
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 
 #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 c46aa9a26b0741bdcde8bda2ab05e8a8dc706c31..e51699db369940c9e564f0016d7e0297e13075c2 100644 (file)
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -35,7 +35,6 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index a2ebc0be6a2581b880d9076c7b7dc2d637c095b0..bbef4ffbf61db9b92694e85f69f8a3e412c23cbf 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -28,7 +28,6 @@
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/bindable_button.h>

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 1a48353e0beee49b7b39296191e0df1ec418c0ac..69387ad3a20d4b569af39fd9987f14dfe3d56869 100644 (file)
--- 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 <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
 #include "midi++/manager.h"
 #include "pbd/fastlog.h"

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 8600e01442606ba11fe136adaa209e8ae21d757a..cc322df13d060a00583ed68ee4f7c0df7cf1f13f 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -37,7 +37,6 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/doi.h>
 
 #include "ardour/amp.h"

diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index d6d4d877aea2432446e34598b43d37981dc8a767..27c74552816c0a9f9015a2eb6eca7f3422c12cfa 100755 (executable)
--- 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 <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <cmath>
 
 #include "region_editor.h"

diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index 64e78c21253e91cbce91a30944bd14bb19b4ea6b..b8ec7301a1c5ece7dfe0dfb4d64e56643fc78e4f 100644 (file)
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -23,7 +23,6 @@
 
 #include <glibmm/thread.h>
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/window_title.h>
 
 #include "ardour/ardour.h"

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 2c6c9a36c4cd82e2cdeab6e27b0d7e4b9309605b..9ec6048de53ba2044643e826826c6e1fb66b0bd5 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -39,7 +39,6 @@
 #include <gtkmm/menuitem.h>
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 9cbdd779f49bc1a4ae32615a933c4483a0ea2241..f87614b613a0d6734e98bc3e44d4f2be0d853fe6 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -18,7 +18,6 @@
 */
 
 #include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/bindable_button.h>

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index e5d4092789fcadf23187367311f7df8c1c5a89fa..43d9d4b41b06f2eae27e20d995ca4979e04851a1 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -32,7 +32,6 @@
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
 
 #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 f1695c00dfc32a2719a3e4c29edd6480c21e2e93..5c61980edc99924c1c2a4c6f900bae0026e15555 100644 (file)
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -30,7 +30,6 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/choice.h>
 
 #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 5e9c4df0c2042b16f4a8ced920b427e624997d74..df0a061ba65de01edcdb1e4fb5dfd5e222a309f0 100644 (file)
--- 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 (file)
index cb8dedc..0000000
--- 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 <gtkmm.h>
-#include <gtk/gtksignal.h>
-
-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__ */