Implement keyboard navigation for most widgets

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

diff --git a/source/toggle.h b/source/toggle.h
index 58a03b6ea1aad0cdc5399213b1709946c4705679..4845796c854cfd882387f0e780d5b51585142a6e 100644 (file)
--- a/source/toggle.h
+++ b/source/toggle.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_TOGGLE_H_
 #define MSP_GLTK_TOGGLE_H_
 
@@ -21,11 +14,10 @@ Allows toggling a value between two states.
 class Toggle: public Widget
 {
 public:
-       class Loader: public Widget::Loader
+       class Loader: public DataFile::DerivedObjectLoader<Toggle, Widget::Loader>
        {
        public:
                Loader(Toggle &);
-               Toggle &get_object() const;
        private:
                virtual void finish();
                void text(const std::string &);
@@ -44,8 +36,10 @@ public:
 
        virtual const char *get_class() const { return "toggle"; }
 
-       virtual void autosize();
+private:
+       virtual void autosize_special(const Part &, Geometry &) const;
 
+public:
        void set_text(const std::string &);
        void set_exclusive(bool);
        bool get_exclusive() const { return exclusive; }
@@ -56,11 +50,12 @@ public:
        bool get_value() const { return value; }
 
 private:
-       virtual void render_special(const Part &) const;
+       virtual void rebuild_special(const Part &);
 
 public:
        virtual void button_press(int, int, unsigned);
        virtual void button_release(int, int, unsigned);
+       virtual bool navigate(Navigation);
 private:
        virtual void on_style_change();
 };