Add protected functions for manipulating widget state

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

diff --git a/source/slider.cpp b/source/slider.cpp
index 425f721f0ccf052bd0eb74a78b44eaca80570498..de4d12e3d69646f4960d65c5ee4316901cbc9bcd 100644 (file)
--- a/source/slider.cpp
+++ b/source/slider.cpp
@@ -1,17 +1,9 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "slider.h"
 
 namespace Msp {
 namespace GLtk {
 
-Slider::Slider(const Resources &r):
-       Widget(r),
+Slider::Slider():
        min(0),
        max(1),
        value(0),
@@ -56,7 +48,7 @@ void Slider::start_drag(int p)
        dragging = true;
        drag_start_pos = p;
        drag_start_value = value;
-       state |= ACTIVE;
+       set_state(ACTIVE);
 }
 
 void Slider::drag(int p)
@@ -68,7 +60,7 @@ void Slider::drag(int p)
 void Slider::end_drag()
 {
        dragging = false;
-       state &= ~ACTIVE;
+       clear_state(ACTIVE);
 }
 
 
@@ -82,7 +74,7 @@ Slider::Loader::Loader(Slider &s):
 
 Slider &Slider::Loader::get_object() const
 {
-       return static_cast<Slider &>(wdg);
+       return static_cast<Slider &>(obj);
 }
 
 } // namespace GLtk