Author: matt
Date: 2010-04-02 14:39:46 -0700 (Fri, 02 Apr 2010)
New Revision: 7413
Log:
A few more functions.
Modified:
branches/branch-3.0/fltk/Flags.h
branches/branch-3.0/fltk/Valuator.h
branches/branch-3.0/test/arc2.cxx
Modified: branches/branch-3.0/fltk/Flags.h
===================================================================
--- branches/branch-3.0/fltk/Flags.h 2010-04-02 20:52:20 UTC (rev 7412)
+++ branches/branch-3.0/fltk/Flags.h 2010-04-02 21:39:46 UTC (rev 7413)
@@ -5,6 +5,8 @@
#ifndef fltk2_Flags_h
#define fltk2_Flags_h
+#include <fltk3/Enumerations.H>
+
namespace fltk {
typedef int Flags;
Modified: branches/branch-3.0/fltk/Valuator.h
===================================================================
--- branches/branch-3.0/fltk/Valuator.h 2010-04-02 20:52:20 UTC (rev 7412)
+++ branches/branch-3.0/fltk/Valuator.h 2010-04-02 21:39:46 UTC (rev 7413)
@@ -20,18 +20,12 @@
_p->wrapper(this);
}
double value() const { return ((fltk3::Valuator*)_p)->value(); }
- bool value(double v) { return ((fltk3::Valuator*)_p)->value(v); }
-
-#if 0 // fltk123:
- double minimum() const {return minimum_;}
- void minimum(double a) {minimum_ = a;}
-
- double maximum() const {return maximum_;}
- void maximum(double a) {maximum_ = a;}
-#endif
-
+ bool value(double v) { return ((fltk3::Valuator*)_p)->value(v); }
+ double minimum() const { return ((fltk3::Valuator*)_p)->minimum(); }
+ void minimum(double a) { ((fltk3::Valuator*)_p)->minimum(a); }
+ double maximum() const { return ((fltk3::Valuator*)_p)->maximum(); }
+ void maximum(double a) { ((fltk3::Valuator*)_p)->maximum(a); }
void range(double a, double b) { ((fltk3::Valuator*)_p)->range(a, b); }
-
double step() const { return ((fltk3::Valuator*)_p)->step(); }
void step(double a) { ((fltk3::Valuator*)_p)->step(a); }
Modified: branches/branch-3.0/test/arc2.cxx
===================================================================
--- branches/branch-3.0/test/arc2.cxx 2010-04-02 20:52:20 UTC (rev 7412)
+++ branches/branch-3.0/test/arc2.cxx 2010-04-02 21:39:46 UTC (rev 7413)
@@ -39,6 +39,7 @@
class Drawing : public Widget {
void draw() {
+#if 0 // fltk123:
push_clip(0,0, w(), h());
setcolor_alpha(BLUE,0.6);
fillrect(0,0,w(), h());
@@ -69,6 +70,7 @@
addchord(r,dargs[4],dargs[5]);
fillstrokepath(GRAY90);
pop_clip();
+#endif
}
public:
Drawing(int X,int Y,int W,int H) : Widget(X,Y,W,H) {}
@@ -95,7 +97,7 @@
if (n<4) {s->minimum(0); s->maximum(300);}
else if (n==6) {s->minimum(0); s->maximum(360);}
else {s->minimum(-360); s->maximum(360);}
- s->type(Slider::TICK_ABOVE);
+ // fltk123: s->type(Slider::TICK_ABOVE);
s->step(1);
s->value(dargs[n]);
s->clear_flag(ALIGN_MASK);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
