X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_regions.h;h=0643befbdfbda03fa1f73f3d7fe9fae5fd3d2a71;hb=b78d036aa056af0ef4f5821c45dae5f70bc69231;hp=ad0a871aecb10f52fdb7ea80beb01a9950befbad;hpb=40903b19266fb42a49903ad3cbfb8c388704f068;p=ardour.git

diff --git a/gtk2_ardour/editor_regions.h b/gtk2_ardour/editor_regions.h
index ad0a871aec..0643befbdf 100644
--- a/gtk2_ardour/editor_regions.h
+++ b/gtk2_ardour/editor_regions.h
@@ -80,7 +80,6 @@ private:
 			add (position);
 			add (end);
 			add (length);
-			add (start);
 			add (sync);
 			add (fadein);
 			add (fadeout);
@@ -99,7 +98,6 @@ private:
 		Gtk::TreeModelColumn<std::string> position;
 		Gtk::TreeModelColumn<std::string> end;
 		Gtk::TreeModelColumn<std::string> length;
-		Gtk::TreeModelColumn<std::string> start;
 		Gtk::TreeModelColumn<std::string> sync;
 		Gtk::TreeModelColumn<std::string> fadein;
 		Gtk::TreeModelColumn<std::string> fadeout;
@@ -124,6 +122,10 @@ private:
 	
 	bool set_selected_in_subrow (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, int);
 	bool selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn);
+
+        Gtk::Widget* old_focus;
+        Gtk::CellEditable* name_editable;
+        void name_editing_started (Gtk::CellEditable*, const Glib::ustring&);
 	
 	void name_edit (const std::string&, const std::string&);
 	void locked_changed (std::string const &);
@@ -133,6 +135,10 @@ private:
 
 	bool key_press (GdkEventKey *);
 	bool button_press (GdkEventButton *);
+        bool focus_in (GdkEventFocus*);
+        bool focus_out (GdkEventFocus*);
+        bool enter_notify (GdkEventCrossing*);
+        bool leave_notify (GdkEventCrossing*);
 	void show_context_menu (int button, int time);
 
 	int sorter (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator);
@@ -145,7 +151,6 @@ private:
         void populate_row_used (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
         void populate_row_position (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
         void populate_row_end (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
-        void populate_row_start (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
         void populate_row_sync (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used);
         void populate_row_fade_in (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used, boost::shared_ptr<ARDOUR::AudioRegion>);
         void populate_row_fade_out (boost::shared_ptr<ARDOUR::Region> region, Gtk::TreeModel::Row const& row, uint32_t used, boost::shared_ptr<ARDOUR::AudioRegion>);
@@ -189,11 +194,6 @@ private:
 	bool ignore_region_list_selection_change;
 	bool ignore_selected_region_change;
         bool expanded;
-
-        void select_one (Glib::RefPtr<Gtk::TreeSelection>, Glib::RefPtr<Gtk::TreeModel>, Gtk::TreeView&,
-                         Gtk::TreeIter, Gtk::TreePath, Gtk::TreeViewColumn*);
-        void select_next ();
-        void select_previous ();
 };
 
 #endif /* __gtk_ardour_editor_regions_h__ */