X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdropdown.h;h=51ba72434956d1c1728f1a6e021c73dfec73ad18;hb=73afd124ab87e8bace98db55517a56c797a9b8c7;hp=ecba9753cb5cace6957f74fa52162887703e202e;hpb=3f4817441626e1abb5556ae53c16746634a57ad9;p=libs%2Fgltk.git

diff --git a/source/dropdown.h b/source/dropdown.h
index ecba975..51ba724 100644
--- a/source/dropdown.h
+++ b/source/dropdown.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -17,7 +17,7 @@ namespace GLtk {
 
 class List;
 
-class Dropdown: public Widget
+class Dropdown: virtual public Widget, private Container
 {
 public:
 	class Loader: public Widget::Loader
@@ -28,16 +28,16 @@ public:
 		void item(const std::string &);
 	};
 
+	sigc::signal<void, int, const std::string &> signal_item_selected;
+
 private:
 	List list;
 	bool dropped;
-	bool list_active;
 
 public:
-	sigc::signal<void, int, const std::string &> signal_item_selected;
+	Dropdown();
 
-	Dropdown(const Resources &);
-	~Dropdown();
+	virtual const char *get_class() const { return "dropdown"; }
 
 	void append(const std::string &);
 	void insert(unsigned, const std::string &);
@@ -49,17 +49,16 @@ public:
 	const std::string &get_selected() const;
 	int get_selected_index() const;
 
-	virtual void button_press(int, int, unsigned);
-	virtual void button_release(int, int, unsigned);
-	virtual void pointer_motion(int, int);
-
 private:
-	virtual const char *get_class() const { return "dropdown"; }
 	virtual void render_special(const Part &) const;
 
+public:
+	virtual void button_press(int, int, unsigned);
+private:
 	virtual void on_geometry_change();
-	void resize_list();
+	virtual void on_style_change();
 
+	void resize_list();
 	void list_item_selected(unsigned, const std::string &);
 };