Rework how widget ownership works in Container

[libs/gltk.git] / source / dropdown.h

diff --git a/source/dropdown.h b/source/dropdown.h
index 06aefa5af96d32cc0b6b3cc0d590bb092298164b..e7935f702aaeb1d7c6fd1f0879c6b673c1a4aaa2 100644 (file)
--- a/source/dropdown.h
+++ b/source/dropdown.h
@@ -3,6 +3,7 @@
 
 #include <sigc++/signal.h>
 #include "list.h"
+#include "mspgltk_api.h"
 #include "text.h"
 #include "widget.h"
 
@@ -11,22 +12,23 @@ namespace GLtk {
 
 class List;
 
-class Dropdown: virtual public Widget, private Container
+class MSPGLTK_API Dropdown: virtual public Widget, private Container
 {
 public:
-       class Loader: public DataFile::DerivedObjectLoader<Dropdown, Widget::Loader>
+       class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Dropdown, Widget::Loader>
        {
        public:
                Loader(Dropdown &);
+
        private:
                void item(const std::string &);
        };
 
-       sigc::signal<void, unsigned> signal_item_selected;
+       sigc::signal<void, std::size_t> signal_item_selected;
 
 private:
        List list;
-       bool dropped;
+       bool dropped = false;
        Text text;
 
 public:
@@ -36,10 +38,10 @@ private:
        void init();
 
 public:
-       virtual const char *get_class() const { return "dropdown"; }
+       const char *get_class() const override { return "dropdown"; }
 
 private:
-       virtual void autosize_special(const Part &, Geometry &);
+       void autosize_special(const Part &, Geometry &) const override;
 
 public:
        void set_data(ListData &d) { list.set_data(d); }
@@ -49,22 +51,26 @@ public:
        template<typename T>
        void set_item_type() { list.set_item_type<T>(); }
 
-       void set_selected_index(int);
+       void set_selected_index(int i) { list.set_selected_index(i); }
        int get_selected_index() const { return list.get_selected_index(); }
 
 private:
-       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 void button_press(int, int, unsigned);
+       void button_press(int, int, unsigned) override;
+       bool navigate(Navigation) override;
 private:
-       virtual void on_geometry_change();
-       virtual void on_style_change();
+       void on_size_change() override;
+       void on_style_change() override;
 
+       void open_list();
+       void close_list();
        void list_autosize_changed();
        void resize_list();
-       void list_item_selected(unsigned);
+       void list_item_selected(std::size_t);
+       void list_selection_cleared();
 };
 
 } // namespace GLtk