Add protected functions for manipulating widget state

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

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 6d2a10b16644d6254163b53b26c6f92ead7754ce..f2cf55202183f44d42cf132bb2d9746a165b096f 100644 (file)
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -59,12 +59,12 @@ void Toggle::set_value(bool v)
        value = v;
        if(value)
        {
-               state |= ACTIVE;
+               set_state(ACTIVE);
                if(exclusive && parent)
                        exclude_siblings();
        }
        else
-               state &= ~ACTIVE;
+               clear_state(ACTIVE);
 }
 
 void Toggle::render_special(const Part &part) const
@@ -115,10 +115,7 @@ Toggle &Toggle::Loader::get_object() const
 void Toggle::Loader::finish()
 {
        Toggle &tgl = get_object();
-       if(tgl.value)
-               tgl.state |= ACTIVE;
-       else
-               tgl.state &= ~ACTIVE;
+       tgl.set_state(ACTIVE, (tgl.value ? ACTIVE : NORMAL));
 }
 
 void Toggle::Loader::text(const string &t)