Merge branch 'master' into windows

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

diff --git a/libs/gtkmm2ext/gtkmm2ext/choice.h b/libs/gtkmm2ext/gtkmm2ext/choice.h
index 8dfa5043fad505327c561a89424565d594e29480..17e3b3192c84409bcf75b47ecd43e96cc0319040 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/choice.h
+++ b/libs/gtkmm2ext/gtkmm2ext/choice.h
@@ -1,7 +1,29 @@
+/*
+    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 __pbd_gtkmm_choice_h__
 #define __pbd_gtkmm_choice_h__
 
 #include <gtkmm/dialog.h>
+#include <gtkmm/image.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/box.h>
 #include <string>
 #include <vector>
 
@@ -10,17 +32,11 @@ namespace Gtkmm2ext {
 class Choice : public Gtk::Dialog
 {
   public:
-       Choice (std::string prompt, std::vector<std::string> choices);
+       Choice (std::string title, std::string prompt, std::vector<std::string> choices, bool center = true);
        virtual ~Choice ();
 
-       int get_choice ();
-
   protected:
        void on_realize ();
-       
-  private:
-       int  which_choice;
-       bool choice_made (GdkEventButton* ev, int nbutton);
 };
 
 } /* namespace */