fixed return types for ::on_....; changed set_usize_... utility functions to set_size_request...

git-svn-id: svn://localhost/trunk/ardour2@39 d708f5d6-7413-0410-9779-e7cbd77b26cf

9 files changed, 25 insertions, 25 deletions

diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h
index 963c604c5a..becacdccbf 100644
--- a/gtk2_ardour/ardour_dialog.h
+++ b/gtk2_ardour/ardour_dialog.h
@@ -49,9 +49,9 @@ class ArdourDialog : public Gtk::Window, public KeyboardTarget
 	void set_hide_on_stop (bool yn);
 	int  run_status();
 
-	gint on_enter_notify_event (GdkEventCrossing*);
-	gint on_leave_notify_event (GdkEventCrossing*);
-	gint on_unmap (GdkEventAny *);
+	bool on_enter_notify_event (GdkEventCrossing*);
+	bool on_leave_notify_event (GdkEventCrossing*);
+	bool on_unmap (GdkEventAny *);
 
 	ARDOUR::Session *session;
 
diff --git a/gtk2_ardour/connection_editor.h b/gtk2_ardour/connection_editor.h
index f331d05719..6bb8dd1bf0 100644
--- a/gtk2_ardour/connection_editor.h
+++ b/gtk2_ardour/connection_editor.h
@@ -53,7 +53,7 @@ class ConnectionEditor : public ArdourDialog {
 	void set_session (ARDOUR::Session *);
 
   protected:
-	gint on_map (GdkEventAny *);
+	bool on_map (GdkEventAny *);
 
   private:
 	ARDOUR::Connection *current_connection;
diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index fd549cc6a2..9485eacd02 100644
--- a/gtk2_ardour/io_selector.h
+++ b/gtk2_ardour/io_selector.h
@@ -116,7 +116,7 @@ class IOSelectorWindow : public ArdourDialog
 	IOSelector& selector() { return _selector; }
 
   protected:
-	gint on_map (GdkEventAny *);
+	bool on_map (GdkEventAny *);
 	
   private:
 	IOSelector _selector;
@@ -158,7 +158,7 @@ class PortInsertWindow : public ArdourDialog
 	PortInsertWindow (ARDOUR::Session&, ARDOUR::PortInsert&, bool can_cancel=false);
 	
   protected:
-	gint on_map (GdkEventAny *);
+	bool on_map (GdkEventAny *);
 	
   private:
 	
diff --git a/gtk2_ardour/meter_bridge.h b/gtk2_ardour/meter_bridge.h
index 4fe0c15a92..9d636aa0d1 100644
--- a/gtk2_ardour/meter_bridge.h
+++ b/gtk2_ardour/meter_bridge.h
@@ -54,8 +54,8 @@ class MeterBridge : public ArdourDialog
 	void toggle_metering ();
 
   protected:
-	gint on_map (GdkEventAny *);
-	gint on_unmap (GdkEventAny *);
+	bool on_map (GdkEventAny *);
+	bool on_unmap (GdkEventAny *);
 
   private:
 	/* diskstream/recorder display */
diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index 70f79f7d6d..2c7d0e9e1a 100644
--- a/gtk2_ardour/panner2d.h
+++ b/gtk2_ardour/panner2d.h
@@ -63,10 +63,10 @@ class Panner2d : public Gtk::DrawingArea
 	sigc::signal<void,int> TargetMoved;
 
   protected:
-	gint on_expose_event (GdkEventExpose *);
-	gint on_button_press_event (GdkEventButton *);
-	gint on_button_release_event (GdkEventButton *);
-	gint on_motion_notify_event (GdkEventMotion *);
+	bool on_expose_event (GdkEventExpose *);
+	bool on_button_press_event (GdkEventButton *);
+	bool on_button_release_event (GdkEventButton *);
+	bool on_motion_notify_event (GdkEventMotion *);
 	void on_size_allocate (GtkAllocation* alloc);
 
   private:
diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index 867f9ed904..7dd6b2ad9d 100644
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -26,11 +26,11 @@
 namespace Gtkmm2ext {
 	void init ();
 
-	void set_usize_to_display_given_text (Gtk::Widget &w,
-					      const gchar *text,
-					      gint hpadding,
-					      gint vpadding);
-
+	void set_size_request_to_display_given_text (Gtk::Widget &w,
+						     const gchar *text,
+						     gint hpadding,
+						     gint vpadding);
+	
 	template<class T> void deferred_delete (void *ptr) {
 		delete static_cast<T *> (ptr);
 	}
diff --git a/libs/gtkmm2ext/gtkutils.cc b/libs/gtkmm2ext/gtkutils.cc
index a4e86b0a22..48d688cd5c 100644
--- a/libs/gtkmm2ext/gtkutils.cc
+++ b/libs/gtkmm2ext/gtkutils.cc
@@ -24,10 +24,10 @@
 #include <gtkmm2ext/gtkutils.h>
 
 void
-set_usize_to_display_given_text (Gtk::Widget &w,
-				 const std::string& text,
-				 gint hpadding,
-				 gint vpadding)
+set_size_request_to_display_given_text (Gtk::Widget &w,
+					const std::string& text,
+					gint hpadding,
+					gint vpadding)
 {
 	int height = 0;
         int width = 0;
diff --git a/libs/gtkmm2ext/popup.cc b/libs/gtkmm2ext/popup.cc
index 540edba5c3..a29be1932f 100644
--- a/libs/gtkmm2ext/popup.cc
+++ b/libs/gtkmm2ext/popup.cc
@@ -85,7 +85,7 @@ PopUp::touch ()
 	if (is_visible ()) {
 		remove ();
 	} else {
-		set_usize_to_display_given_text (label, my_text.c_str(), 25, 10);
+		set_size_request_to_display_given_text (label, my_text.c_str(), 25, 10);
 		label.set_text (my_text);
 		show_all ();
 		
diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 0366c02f12..54b6c7d987 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -24,12 +24,12 @@
 #include "i18n.h"
 
 void
-Gtkmm2ext::set_usize_to_display_given_text (Gtk::Widget &w, const gchar *text,
-					   gint hpadding, gint vpadding)
+Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *text,
+					    gint hpadding, gint vpadding)
 
 {
 	w.ensure_style ();
-	set_usize_to_display_given_text(w, text, hpadding, vpadding);
+	set_size_request_to_display_given_text(w, text, hpadding, vpadding);
 }
 
 gint