diff options
| author | Bill Spitzak <spitzak@gmail.com> | 1999-03-10 08:17:43 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 1999-03-10 08:17:43 +0000 |
| commit | b6115887c86b6f3fa9591becb23a77af19fc2b95 (patch) | |
| tree | 6d7d47819b1dfa77f7641d70fc7b7d27b37d0eae /FL | |
| parent | 170c31cada99660d123aa81993da0b995778be83 (diff) | |
Changes to dial so that counter-clockwise motion is supported if you
set angle2 < angle1. Deleted the unimplemented direction() control.
Fixed the documentation, this new code allows any 2 values for the
angles as long as abs(a-b)<=360.
git-svn-id: file:///fltk/svn/fltk/trunk@399 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Dial.H | 16 | ||||
| -rw-r--r-- | FL/forms.H | 10 |
2 files changed, 12 insertions, 14 deletions
diff --git a/FL/Fl_Dial.H b/FL/Fl_Dial.H index 438f2abb2..ce6fdb312 100644 --- a/FL/Fl_Dial.H +++ b/FL/Fl_Dial.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Dial.H,v 1.6 1999/03/08 21:44:28 carl Exp $" +// "$Id: Fl_Dial.H,v 1.7 1999/03/10 08:17:40 bill Exp $" // // Dial header file for the Fast Light Tool Kit (FLTK). // @@ -35,13 +35,9 @@ #define FL_LINE_DIAL 1 #define FL_FILL_DIAL 2 -#define FL_DIAL_CW 0 -#define FL_DIAL_CCW 1 - class Fl_Dial : public Fl_Valuator { short a1,a2; - uchar direction_; protected: @@ -54,14 +50,16 @@ public: FL_EXPORT int handle(int); FL_EXPORT Fl_Dial(int x,int y,int w,int h, const char *l = 0); - void angles(short a, short b); - void direction(uchar d) {direction_ = d;} - uchar direction() const {return direction_;} + short angle1() const {return a1;} + void angle1(short a) {a1 = a;} + short angle2() const {return a2;} + void angle2(short a) {a2 = a;} + void angles(short a, short b) {a1 = a; a2 = b;} }; #endif // -// End of "$Id: Fl_Dial.H,v 1.6 1999/03/08 21:44:28 carl Exp $". +// End of "$Id: Fl_Dial.H,v 1.7 1999/03/10 08:17:40 bill Exp $". // diff --git a/FL/forms.H b/FL/forms.H index 635d75fb5..ac84dc421 100644 --- a/FL/forms.H +++ b/FL/forms.H @@ -1,5 +1,5 @@ // -// "$Id: forms.H,v 1.6 1999/02/16 21:59:48 mike Exp $" +// "$Id: forms.H,v 1.7 1999/03/10 08:17:40 bill Exp $" // // Forms emulation header file for the Fast Light Tool Kit (FLTK). // @@ -618,10 +618,10 @@ inline void fl_get_dial_bounds(Fl_Widget* o, float* a, float* b) { inline void fl_set_dial_return(Fl_Widget* o, int i) { ((Fl_Dial*)o)->when((Fl_When)(i|FL_WHEN_RELEASE));} inline void fl_set_dial_angles(Fl_Widget* o, int a, int b) { - ((Fl_Dial*)o)->angles(a,b);} + ((Fl_Dial*)o)->angles(a, b);} //inline void fl_set_dial_cross(Fl_Widget* o, int); -inline void fl_set_dial_direction(Fl_Widget* o, uchar d) { - ((Fl_Dial*)o)->direction(d);} +// inline void fl_set_dial_direction(Fl_Widget* o, uchar d) { +// ((Fl_Dial*)o)->direction(d);} inline void fl_set_dial_step(Fl_Widget* o, double v) { ((Fl_Dial*)o)->step(v);} @@ -841,5 +841,5 @@ inline void fl_draw() {Fl::flush();} #endif /* define __FORMS_H__ */ // -// End of "$Id: forms.H,v 1.6 1999/02/16 21:59:48 mike Exp $". +// End of "$Id: forms.H,v 1.7 1999/03/10 08:17:40 bill Exp $". // |