X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.h;h=060fb813f405cc9b29fb762c8a5ac93e7feedc61;hb=d10d1de6d17c285c63d7b3cea549017aaa1ddb01;hp=9bc30c685d146a88d9d3b0fc8b886037f7ffa724;hpb=9f38197854e699a6093a906ab43f4238f3cd2388;p=libs%2Fgltk.git

diff --git a/source/list.h b/source/list.h
index 9bc30c6..060fb81 100644
--- a/source/list.h
+++ b/source/list.h
@@ -20,7 +20,6 @@ class MSPGLTK_API incompatible_data: public std::logic_error
 {
 public:
 	incompatible_data(const std::type_info &);
-	virtual ~incompatible_data() throw() { }
 };
 
 
@@ -68,14 +67,14 @@ public:
 		Item();
 
 	public:
-		virtual const char *get_class() const { return "listitem"; }
+		const char *get_class() const override { return "listitem"; }
 
 	protected:
-		virtual void autosize_special(const Part &, Geometry &) const;
+		void autosize_special(const Part &, Geometry &) const override;
 	public:
 		void set_active(bool);
 
-		virtual void render_special(const Part &, GL::Renderer &) const;
+		void render_special(const Part &, GL::Renderer &) const override;
 	};
 
 	class SimpleItem: public Item
@@ -83,7 +82,7 @@ public:
 	protected:
 		SimpleItem() = default;
 
-		virtual void on_style_change();
+		void on_style_change() override;
 	};
 
 	class MultiColumnItem: public Item
@@ -94,7 +93,7 @@ public:
 		virtual void check_widths(std::vector<unsigned> &) const;
 		virtual void set_widths(const std::vector<unsigned> &);
 
-		virtual void on_style_change();
+		void on_style_change() override;
 	};
 
 private:
@@ -130,7 +129,7 @@ private:
 		TypedItemFactory(const ListData &d)
 		{ set_data(d); }
 
-		virtual void set_data(const ListData &d)
+		void set_data(const ListData &d) override
 		{
 			if(const ListDataStore<ValueType> *ds = dynamic_cast<const ListDataStore<ValueType> *>(&d))
 				data = ds;
@@ -138,7 +137,7 @@ private:
 				throw incompatible_data(typeid(ValueType));
 		}
 
-		virtual Item *create_item(unsigned i) const
+		Item *create_item(unsigned i) const override
 		{
 			return new I(data->get(i));
 		}
@@ -157,10 +156,10 @@ public:
 	sigc::signal<void> signal_selection_cleared;
 
 private:
-	ListData *data = 0;
+	ListData *data = nullptr;
 	bool own_data = false;
-	DataObserver *observer = 0;
-	ItemFactory *item_factory = 0;
+	DataObserver *observer = nullptr;
+	ItemFactory *item_factory = nullptr;
 	ViewMode view_mode = LIST;
 	int sel_index = -1;
 	int focus_index = -1;
@@ -168,7 +167,7 @@ private:
 	unsigned max_scroll = 0;
 	unsigned view_rows = 5;
 	unsigned view_columns = 5;
-	const Part *items_part = 0;
+	const Part *items_part = nullptr;
 	bool ignore_slider_change = false;
 	bool dragging = false;
 	int drag_start_x = 0;
@@ -183,10 +182,10 @@ public:
 	List(ListData &);
 	virtual ~List();
 
-	virtual const char *get_class() const { return "list"; }
+	const char *get_class() const override { return "list"; }
 
 private:
-	virtual void autosize_special(const Part &, Geometry &) const;
+	void autosize_special(const Part &, Geometry &) const override;
 
 public:
 	void set_data(ListData &);
@@ -217,19 +216,19 @@ public:
 private:
 	void set_selected_item(Widget *);
 
-	virtual void rebuild_special(const Part &);
-	virtual void render_special(const Part &, GL::Renderer &) const;
+	void rebuild_special(const Part &) override;
+	void render_special(const Part &, GL::Renderer &) const override;
 
 public:
-	virtual bool key_press(unsigned, unsigned);
-	virtual void button_press(int, int, unsigned);
-	virtual void touch_press(int, int, unsigned);
-	virtual void touch_release(int, int, unsigned);
-	virtual void touch_motion(int, int, unsigned);
-	virtual void focus_in();
-	virtual bool navigate(Navigation);
+	bool key_press(unsigned, unsigned) override;
+	void button_press(int, int, unsigned) override;
+	void touch_press(int, int, unsigned) override;
+	void touch_release(int, int, unsigned) override;
+	void touch_motion(int, int, unsigned) override;
+	void focus_in() override;
+	bool navigate(Navigation) override;
 private:
-	virtual void on_style_change();
+	void on_style_change() override;
 
 	void move_focus(Navigation, bool);
 	void set_focus_index(int);