X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdropdown.h;h=51ba72434956d1c1728f1a6e021c73dfec73ad18;hb=2f70d404230954f0693a62a021b5d2ad1faed8fa;hp=c9291f91e8d8c39929d0eca0b3bb829ca8e449a2;hpb=f21a56605f3534cb24e5912cd4f4ee28279dcddd;p=libs%2Fgltk.git

diff --git a/source/dropdown.h b/source/dropdown.h
index c9291f9..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
 */
 
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #define MSP_GLTK_DROPDOWN_H_
 
 #include <sigc++/signal.h>
+#include "list.h"
 #include "widget.h"
 
 namespace Msp {
@@ -16,7 +17,7 @@ namespace GLtk {
 
 class List;
 
-class Dropdown: public Widget
+class Dropdown: virtual public Widget, private Container
 {
 public:
 	class Loader: public Widget::Loader
@@ -27,37 +28,37 @@ public:
 		void item(const std::string &);
 	};
 
+	sigc::signal<void, int, const std::string &> signal_item_selected;
+
 private:
-	List *list;
-	std::string text;
+	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 &);
 	void remove(unsigned);
 	void clear();
+	unsigned get_n_items() const;
 
 	void set_selected_index(int);
 	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();
+	virtual void on_style_change();
 
+	void resize_list();
 	void list_item_selected(unsigned, const std::string &);
 };