diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-01-13 15:45:50 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-01-13 15:45:50 +0000 |
| commit | ab5771b62fbff2510ff495ba6dd2fcd8d1720593 (patch) | |
| tree | 053c436d4a29715f964a5955c9da1e51aad0f693 /FL | |
| parent | a64292cc5f56e165b471f5bb23acea765d838c7e (diff) | |
Fixes from Bill:
- Fl_Clock now uses the Fl_Clock_Output base class to get the
system time.
- Fl_Window::iconize() and Fl_Window::icon() now coexist
peacefully with all X window managers.
- Minor fixes to mandelbrot and shape demos.
- Menu code cleanup.
git-svn-id: file:///fltk/svn/fltk/trunk@209 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Clock.H | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/FL/Fl_Clock.H b/FL/Fl_Clock.H index a095c6452..8a17ee338 100644 --- a/FL/Fl_Clock.H +++ b/FL/Fl_Clock.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Clock.H,v 1.4 1999/01/07 19:16:52 mike Exp $" +// "$Id: Fl_Clock.H,v 1.5 1999/01/13 15:45:48 mike Exp $" // // Clock header file for the Fast Light Tool Kit (FLTK). // @@ -36,19 +36,17 @@ #define FL_ANALOG_CLOCK FL_SQUARE_CLOCK #define FL_DIGITAL_CLOCK FL_SQUARE_CLOCK // nyi -class Fl_Clock : public Fl_Widget { +// a Fl_Clock_Output can be used to display a program-supplied time: + +class Fl_Clock_Output : public Fl_Widget { int hour_, minute_, second_; ulong value_; void drawhands(Fl_Color,Fl_Color); // part of draw protected: void draw(int, int, int, int); void draw(); - void _Fl_Clock(); - int handle(int); public: - Fl_Clock(int x,int y,int w,int h, const char *l = 0); - Fl_Clock(uchar t,int x,int y,int w,int h, const char *l); - ~Fl_Clock(); + Fl_Clock_Output(int x,int y,int w,int h, const char *l = 0); void value(ulong v); // set to this Unix time void value(int,int,int); // set hour, minute, second ulong value() const {return value_;} @@ -57,8 +55,19 @@ public: int second() const {return second_;} }; +// a Fl_Clock displays the current time always by using a timeout: + +class Fl_Clock : public Fl_Clock_Output { + int handle(int); +public: + void update(); + Fl_Clock(int x,int y,int w,int h, const char *l = 0); + Fl_Clock(uchar t,int x,int y,int w,int h, const char *l); + ~Fl_Clock(); +}; + #endif // -// End of "$Id: Fl_Clock.H,v 1.4 1999/01/07 19:16:52 mike Exp $". +// End of "$Id: Fl_Clock.H,v 1.5 1999/01/13 15:45:48 mike Exp $". // |