X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdropdown.h;h=78c52b763a6215aab975904c02be782713628056;hb=9dbdf5decfa160df15c237887fdcbf12fc8f835b;hp=51ba72434956d1c1728f1a6e021c73dfec73ad18;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git

diff --git a/source/dropdown.h b/source/dropdown.h
index 51ba724..78c52b7 100644
--- a/source/dropdown.h
+++ b/source/dropdown.h
@@ -1,15 +1,9 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_DROPDOWN_H_
 #define MSP_GLTK_DROPDOWN_H_
 
 #include <sigc++/signal.h>
 #include "list.h"
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
@@ -20,7 +14,7 @@ class List;
 class Dropdown: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Dropdown, Widget::Loader>
 	{
 	public:
 		Loader(Dropdown &);
@@ -28,29 +22,39 @@ public:
 		void item(const std::string &);
 	};
 
-	sigc::signal<void, int, const std::string &> signal_item_selected;
+	sigc::signal<void, unsigned> signal_item_selected;
 
 private:
 	List list;
 	bool dropped;
+	Text text;
 
 public:
 	Dropdown();
+	Dropdown(ListData &);
+private:
+	void init();
 
+public:
 	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;
+private:
+	virtual void autosize_special(const Part &, Geometry &) const;
+
+public:
+	void set_data(ListData &d) { list.set_data(d); }
+	ListData &get_data() { return list.get_data(); }
+	const ListData &get_data() const { return list.get_data(); }
+
+	template<typename T>
+	void set_item_type() { list.set_item_type<T>(); }
 
-	void set_selected_index(int);
-	const std::string &get_selected() const;
-	int get_selected_index() const;
+	void set_selected_index(int i) { list.set_selected_index(i); }
+	int get_selected_index() const { return list.get_selected_index(); }
 
 private:
-	virtual void render_special(const Part &) const;
+	virtual void rebuild_special(const Part &);
+	virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
 	virtual void button_press(int, int, unsigned);
@@ -58,8 +62,10 @@ private:
 	virtual void on_geometry_change();
 	virtual void on_style_change();
 
+	void list_autosize_changed();
 	void resize_list();
-	void list_item_selected(unsigned, const std::string &);
+	void list_item_selected(unsigned);
+	void list_selection_cleared();
 };
 
 } // namespace GLtk