X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.h;h=37d4d7a33201bdf80894508bd8ab8dd58a962fa2;hb=83f553a382ce554951594de85e4fd7b854305463;hp=4526a48375b843bfd50d7321ab56a984b0ffe7ac;hpb=ab8e29ecf63fa423d045ee71357fc65994e6bd0a;p=libs%2Fgltk.git

diff --git a/source/list.h b/source/list.h
index 4526a48..37d4d7a 100644
--- a/source/list.h
+++ b/source/list.h
@@ -7,7 +7,8 @@
 #include "container.h"
 #include "label.h"
 #include "listdata.h"
-#include "vslider.h"
+#include "mspgltk_api.h"
+#include "slider.h"
 
 namespace Msp {
 namespace GLtk {
@@ -15,11 +16,10 @@ namespace GLtk {
 /**
 Thrown if a list's item type is incompatible with its data.
 */
-class incompatible_data: public std::logic_error
+class MSPGLTK_API incompatible_data: public std::logic_error
 {
 public:
 	incompatible_data(const std::type_info &);
-	virtual ~incompatible_data() throw() { }
 };
 
 
@@ -27,7 +27,7 @@ public:
 Shows a list of items, allowing the user to select one.  A slider is included
 to allow scrolling through a long list.
 */
-class List: virtual public Widget, private Container
+class MSPGLTK_API List: virtual public Widget, private Container
 {
 public:
 	enum ViewMode
@@ -64,7 +64,7 @@ public:
 	class Item: virtual public Widget, protected Container
 	{
 	protected:
-		Item() { }
+		Item();
 
 	public:
 		virtual const char *get_class() const { return "listitem"; }
@@ -80,7 +80,7 @@ public:
 	class SimpleItem: public Item
 	{
 	protected:
-		SimpleItem() { }
+		SimpleItem() = default;
 
 		virtual void on_style_change();
 	};
@@ -88,7 +88,7 @@ public:
 	class MultiColumnItem: public Item
 	{
 	protected:
-		MultiColumnItem() { }
+		MultiColumnItem() = default;
 
 		virtual void check_widths(std::vector<unsigned> &) const;
 		virtual void set_widths(const std::vector<unsigned> &);
@@ -109,9 +109,9 @@ private:
 	class ItemFactory
 	{
 	protected:
-		ItemFactory() { }
+		ItemFactory() = default;
 	public:
-		virtual ~ItemFactory() { }
+		virtual ~ItemFactory() = default;
 
 		virtual void set_data(const ListData &) = 0;
 		virtual Item *create_item(unsigned) const = 0;
@@ -156,22 +156,22 @@ public:
 	sigc::signal<void> signal_selection_cleared;
 
 private:
-	ListData *data;
-	bool own_data;
-	DataObserver *observer;
-	ItemFactory *item_factory;
-	ViewMode view_mode;
-	int sel_index;
-	int focus_index;
-	unsigned first_row;
-	unsigned max_scroll;
-	unsigned view_rows;
-	unsigned view_columns;
-	const Part *items_part;
-	bool ignore_slider_change;
-	bool dragging;
-	int drag_start_x;
-	int drag_start_y;
+	ListData *data = nullptr;
+	bool own_data = false;
+	DataObserver *observer = nullptr;
+	ItemFactory *item_factory = nullptr;
+	ViewMode view_mode = LIST;
+	int sel_index = -1;
+	int focus_index = -1;
+	unsigned first_row = 0;
+	unsigned max_scroll = 0;
+	unsigned view_rows = 5;
+	unsigned view_columns = 5;
+	const Part *items_part = nullptr;
+	bool ignore_slider_change = false;
+	bool dragging = false;
+	int drag_start_x = 0;
+	int drag_start_y = 0;
 
 	VSlider slider;
 	std::vector<Item *> items;
@@ -180,9 +180,6 @@ private:
 public:
 	List();
 	List(ListData &);
-private:
-	void init();
-public:
 	virtual ~List();
 
 	virtual const char *get_class() const { return "list"; }
@@ -246,7 +243,7 @@ private:
 	static void adjust_index(int &, int, int);
 };
 
-void operator>>(const LexicalConverter &, List::ViewMode &);
+MSPGLTK_API void operator>>(const LexicalConverter &, List::ViewMode &);
 
 } // namespace GLtk
 } // namespace Msp