X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.h;h=580d47ff5d0eed5d4f7c265ac1b7136bcc7c1895;hb=66054fe5d61a225c1af03e514c23b5e1a5dbc547;hp=92ea933928914b36a639ecdc930d740a43b05aa8;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index 92ea933928..580d47ff5d 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -21,7 +21,13 @@
 #ifndef __ardour_location_ui_h__
 #define __ardour_location_ui_h__
 
-#include <gtk--.h>
+#include <gtkmm/box.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/button.h>
+#include <gtkmm/table.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
+
 #include <ardour/location.h>
 #include <ardour/session.h>
 
@@ -47,8 +53,8 @@ class LocationEditRow  : public Gtk::HBox
 
 	void set_number (int);
 	
-	SigC::Signal1<void,ARDOUR::Location*> remove_requested;  
-	SigC::Signal0<void> redraw_ranges;  
+	sigc::signal<void,ARDOUR::Location*> remove_requested;  
+	sigc::signal<void> redraw_ranges;  
 
   protected:
 
@@ -118,19 +124,17 @@ class LocationEditRow  : public Gtk::HBox
 	void scms_toggled ();
 	void preemph_toggled ();
 
-	gint entry_focus_event (GdkEventFocus* ev);
-	
 	void end_changed (ARDOUR::Location *);
 	void start_changed (ARDOUR::Location *);
 	void name_changed (ARDOUR::Location *);
 	void location_changed (ARDOUR::Location *);
 	void flags_changed (ARDOUR::Location *, void *src);
 	
-	SigC::Connection start_changed_connection;
-	SigC::Connection end_changed_connection;
-	SigC::Connection name_changed_connection;
-	SigC::Connection changed_connection;
-	SigC::Connection flags_changed_connection;
+	sigc::connection start_changed_connection;
+	sigc::connection end_changed_connection;
+	sigc::connection name_changed_connection;
+	sigc::connection changed_connection;
+	sigc::connection flags_changed_connection;
 	
 };
 
@@ -144,13 +148,10 @@ class LocationUI : public ArdourDialog
 	void set_session (ARDOUR::Session *);
 
   private:
-
-
-	ARDOUR::LocationStack          *locations;
-
+	ARDOUR::LocationStack* locations;
+        
 	void session_gone();
 
-
 	Gtk::VBox  location_vpacker;
 	Gtk::HBox  location_hpacker;
 
@@ -193,6 +194,9 @@ class LocationUI : public ArdourDialog
 	void location_removed (ARDOUR::Location *);
 	void location_added (ARDOUR::Location *);
 	void map_locations (ARDOUR::Locations::LocationList&);
+
+  protected:
+	bool on_delete_event (GdkEventAny*);
 };
 
 #endif // __ardour_location_ui_h__