Merge branch 'master' into cairocanvas

[ardour.git] / libs / gtkmm2ext / gtkmm2ext / prompter.h

diff --git a/libs/gtkmm2ext/gtkmm2ext/prompter.h b/libs/gtkmm2ext/gtkmm2ext/prompter.h
index 8d092f6992603b2c8fa4a60971252d70530b39ff..72d9f2149bdf0bfc066958bbaedad363d64f6a87 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/prompter.h
+++ b/libs/gtkmm2ext/gtkmm2ext/prompter.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtkmm2ext_prompter_h__
@@ -53,17 +52,23 @@ class Prompter : public Gtk::Dialog
 
        void change_labels (std::string ok, std::string cancel);
 
-       void get_result (std::string &str);
+       void get_result (std::string &str, bool strip=true);
 
   protected:
        Gtk::Entry& the_entry() { return entry; }
 
+       void on_entry_changed ();
+       void on_show ();
+
   private:
        Gtk::Entry entry;
-       Gtk::VBox entryBox;
+       Gtk::HBox entryBox;
        Gtk::Label entryLabel;
-       
+       bool first_show;
+       bool can_accept_from_entry;
+
        void init ();
+       void entry_activated ();
 };
 
 } /* namespace */