X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fslider.h;h=a95a6a57665fd905577d3e76f54afa76ef5313f1;hb=f0b600c3b1739f7e088da6ab8eb7c2e67adf592c;hp=6c95526f13f2699f14c89049fe5f252510383a2e;hpb=c435423919a20a87d100e1ee4cd1fc6ce223040c;p=libs%2Fgltk.git

diff --git a/source/slider.h b/source/slider.h
index 6c95526..a95a6a5 100644
--- a/source/slider.h
+++ b/source/slider.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_SLIDER_H_
 #define MSP_GLTK_SLIDER_H_
 
@@ -22,13 +15,14 @@ variations.
 class Slider: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Slider, Widget::Loader>
 	{
 	public:
 		Loader(Slider &);
-		Slider &get_object() const;
 	};
 
+	sigc::signal<void, double> signal_value_changed;
+
 protected:
 	double min, max;
 	double value;
@@ -38,18 +32,19 @@ protected:
 	double drag_start_pos;
 	double drag_start_value;
 	unsigned drag_area_size;
+	unsigned drag_area_offset;
+	unsigned slider_size;
 
-public:
-	sigc::signal<void, double> signal_value_changed;
+	Slider();
 
-protected:
-	Slider(const Resources &);
 public:
 	void set_value(double);
 	void set_range(double, double);
 	void set_step(double);
 	double get_value() const { return value; }
+
 protected:
+	void click(int);
 	void start_drag(int);
 	void drag(int);
 	void end_drag();