Browse Source

Remove useless Fl_Clock.

tags/v1.3.1000
Jonathan Moore Liles 13 years ago
parent
commit
fb1bfecebf
16 changed files with 7 additions and 521 deletions
  1. +0
    -137
      FL/Fl_Clock.H
  2. +1
    -3
      fluid/Fl_Type.cxx
  3. +0
    -15
      fluid/factory.cxx
  4. +0
    -6
      fluid/function_panel.cxx
  5. +0
    -6
      fluid/function_panel.fl
  6. +2
    -2
      fluid/makedepend
  7. +0
    -28
      fluid/pixmaps/flClock.xpm
  8. +0
    -3
      forms.h
  9. +0
    -218
      src/Fl_Clock.cxx
  10. +0
    -1
      src/Makefile
  11. +0
    -4
      test/Makefile
  12. +0
    -53
      test/clock.cxx
  13. +0
    -2
      test/device.cxx
  14. +0
    -4
      test/inactive.fl
  15. +4
    -31
      test/makedepend
  16. +0
    -8
      test/tabs.fl

+ 0
- 137
FL/Fl_Clock.H View File

@@ -1,137 +0,0 @@
//
// "$Id: Fl_Clock.H 7981 2010-12-08 23:53:04Z greg.ercolano $"
//
// Clock header file for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2010 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Library General Public License for more details.
//
// You should have received a copy of the GNU Library General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
// Please report all bugs and problems on the following page:
//
// http://www.fltk.org/str.php
//

/* \file
Fl_Clock, Fl_Clock_Output widgets . */

#ifndef Fl_Clock_H
#define Fl_Clock_H

#ifndef Fl_Widget_H
#include "Fl_Widget.H"
#endif

// values for type:
#define FL_SQUARE_CLOCK 0 /**< type() of Square Clock variant */
#define FL_ROUND_CLOCK 1 /**< type() of Round Clock variant */
#define FL_ANALOG_CLOCK FL_SQUARE_CLOCK /**< An analog clock is square */
#define FL_DIGITAL_CLOCK FL_SQUARE_CLOCK /**< Not yet implemented */

// fabien: Please keep the horizontal formatting of both images in class desc,
// don't lose vert. space for nothing!

/**
\class Fl_Clock_Output
\brief This widget can be used to display a program-supplied time.
The time shown on the clock is not updated. To display the current time,
use Fl_Clock instead.

\htmlonly <BR> <table align=CENTER border=1 cellpadding=5 >
<caption align=bottom>type() FL_SQUARE_CLOCK and FL_ROUND_CLOCK </caption> <TR><TD> \endhtmlonly
\image html clock.png
\htmlonly </TD> <TD> \endhtmlonly
\image html round_clock.png
\htmlonly </TD> </TR> </table> \endhtmlonly
\image latex clock.png "FL_SQUARE_CLOCK type" width=4cm
\image latex round_clock.png "FL_ROUND_CLOCK type" width=4cm
*/
class FL_EXPORT Fl_Clock_Output : public Fl_Widget {
int hour_, minute_, second_;
ulong value_;
void drawhands(Fl_Color,Fl_Color); // part of draw
protected:
void draw();
void draw(int X, int Y, int W, int H);
public:

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 H, int m, int s);

/**
Returns the displayed time.
Returns the time in seconds since the UNIX epoch (January 1, 1970).
\see value(ulong)
*/
ulong value() const {return value_;}

/**
Returns the displayed hour (0 to 23).
\see value(), minute(), second()
*/
int hour() const {return hour_;}

/**
Returns the displayed minute (0 to 59).
\see value(), hour(), second()
*/
int minute() const {return minute_;}

/**
Returns the displayed second (0 to 60, 60=leap second).
\see value(), hour(), minute()
*/
int second() const {return second_;}
};

// a Fl_Clock displays the current time always by using a timeout:

/**
\class Fl_Clock
\brief This widget provides a round analog clock display.

Fl_Clock is provided for Forms compatibility.
It installs a 1-second timeout callback using Fl::add_timeout().
You can choose the rounded or square type of the clock with type(), see below.
\htmlonly <BR> <table align=CENTER border=1 cellpadding=5 >
<caption align=bottom>type() FL_SQUARE_CLOCK and FL_ROUND_CLOCK </caption> <TR><TD> \endhtmlonly
\image html clock.png
\htmlonly </TD> <TD> \endhtmlonly
\image html round_clock.png
\htmlonly </TD> </TR> </table> \endhtmlonly
\image latex clock.png "FL_SQUARE_CLOCK type" width=4cm
\image latex round_clock.png "FL_ROUND_CLOCK type" width=4cm
*/
class FL_EXPORT Fl_Clock : public Fl_Clock_Output {
public:
int handle(int);

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 7981 2010-12-08 23:53:04Z greg.ercolano $".
//

+ 1
- 3
fluid/Fl_Type.cxx View File

@@ -91,7 +91,6 @@ static Fl_Pixmap protected_pixmap(protected_xpm);
#include "pixmaps/flBrowser.xpm"
#include "pixmaps/flCheckBrowser.xpm"
#include "pixmaps/flFileBrowser.xpm"
#include "pixmaps/flClock.xpm"
#include "pixmaps/flHelp.xpm"
#include "pixmaps/flProgress.xpm"
#include "pixmaps/flSlider.xpm"
@@ -142,7 +141,6 @@ static Fl_Pixmap fileinput_pixmap(flFileInput_xpm);
static Fl_Pixmap browser_pixmap(flBrowser_xpm);
static Fl_Pixmap checkbrowser_pixmap(flCheckBrowser_xpm);
static Fl_Pixmap filebrowser_pixmap(flFileBrowser_xpm);
static Fl_Pixmap clock_pixmap(flClock_xpm);
static Fl_Pixmap help_pixmap(flHelp_xpm);
static Fl_Pixmap progress_pixmap(flProgress_xpm);
static Fl_Pixmap slider_pixmap(flSlider_xpm);
@@ -166,7 +164,7 @@ Fl_Pixmap *pixmap[] = { 0, &window_pixmap, &button_pixmap, &checkbutton_pixmap,
&menuitem_pixmap, &menubar_pixmap, &submenu_pixmap, &scroll_pixmap, &tile_pixmap, &wizard_pixmap, /* 16..21 */
&pack_pixmap, &returnbutton_pixmap, &lightbutton_pixmap, &repeatbutton_pixmap, &menubutton_pixmap, /* 22..26 */
&output_pixmap, &textdisplay_pixmap, &textedit_pixmap, &fileinput_pixmap, &browser_pixmap, /* 27..32 */
&checkbrowser_pixmap, &filebrowser_pixmap, &clock_pixmap, &help_pixmap, &progress_pixmap, /* 33..36 */
&checkbrowser_pixmap, &filebrowser_pixmap, NULL, &help_pixmap, &progress_pixmap, /* 33..36 */
&slider_pixmap, &scrollbar_pixmap, &valueslider_pixmap, &adjuster_pixmap, &counter_pixmap, /* 37..41 */
&dial_pixmap, &roller_pixmap, &valueinput_pixmap, &valueoutput_pixmap, &comment_pixmap, /* 42..46 */
&spinner_pixmap, &widgetclass_pixmap, &data_pixmap, &tree_pixmap, &table_pixmap }; /* 47..51 */


+ 0
- 15
fluid/factory.cxx View File

@@ -642,20 +642,6 @@ int Fl_Text_Editor_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {

////////////////////////////////////////////////////////////////

#include <FL/Fl_Clock.H>
class Fl_Clock_Type : public Fl_Widget_Type {
public:
virtual const char *type_name() {return "Fl_Clock";}
virtual const char *alt_type_name() {return "fltk::Clock";}
Fl_Widget *widget(int x,int y,int w,int h) {
return new Fl_Clock(x,y,w,h);}
Fl_Widget_Type *_make() {return new Fl_Clock_Type();}
int pixmapID() { return 34; }
};
static Fl_Clock_Type Fl_Clock_type;

////////////////////////////////////////////////////////////////

#include <FL/Fl_Help_View.H>
class Fl_Help_View_Type : public Fl_Widget_Type {
public:
@@ -1073,7 +1059,6 @@ Fl_Menu_Item New_Menu[] = {
{0},
{"Other",0,0,0,FL_SUBMENU},
{0,0,cb,(void*)&Fl_Box_type},
{0,0,cb,(void*)&Fl_Clock_type},
{0,0,cb,(void*)&Fl_Help_View_type},
{0,0,cb,(void*)&Fl_Progress_type},
{0},


+ 0
- 6
fluid/function_panel.cxx View File

@@ -1030,12 +1030,6 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Box"));
o->image(pixmap[5]);
} // Fl_Button* o
{ Fl_Button* o = new Fl_Button(542, 5, 24, 24);
o->tooltip("Clock");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Clock"));
o->image(pixmap[34]);
} // Fl_Button* o
{ Fl_Button* o = new Fl_Button(517, 30, 24, 24);
o->tooltip("Help Browser");
o->box(FL_THIN_UP_BOX);


+ 0
- 6
fluid/function_panel.fl View File

@@ -860,12 +860,6 @@ else
tooltip Box xywh {517 5 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[5]);}
}
Fl_Button {} {
user_data {"Fl_Clock"}
callback type_make_cb
tooltip Clock xywh {542 5 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[34]);}
}
Fl_Button {} {
user_data {"Fl_Help_View"}
callback type_make_cb


+ 2
- 2
fluid/makedepend View File

@@ -110,7 +110,7 @@ Fl_Type.o: pixmaps/flMenuButton.xpm pixmaps/flOutput.xpm
Fl_Type.o: pixmaps/flTextDisplay.xpm pixmaps/flTextEdit.xpm
Fl_Type.o: pixmaps/flFileInput.xpm pixmaps/flBrowser.xpm
Fl_Type.o: pixmaps/flCheckBrowser.xpm pixmaps/flFileBrowser.xpm
Fl_Type.o: pixmaps/flClock.xpm pixmaps/flHelp.xpm pixmaps/flProgress.xpm
Fl_Type.o: pixmaps/flHelp.xpm pixmaps/flProgress.xpm
Fl_Type.o: pixmaps/flSlider.xpm pixmaps/flScrollBar.xpm
Fl_Type.o: pixmaps/flValueSlider.xpm pixmaps/flAdjuster.xpm
Fl_Type.o: pixmaps/flCounter.xpm pixmaps/flDial.xpm pixmaps/flRoller.xpm
@@ -287,7 +287,7 @@ factory.o: ../FL/Fl_Check_Browser.H ../FL/Fl_File_Browser.H
factory.o: ../FL/Fl_Browser.H ../FL/Fl_File_Icon.H ../FL/filename.H
factory.o: ../FL/Fl_Counter.H ../FL/Fl_Spinner.H ../FL/Fl_File_Input.H
factory.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Text_Buffer.H
factory.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/Fl_Clock.H
factory.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H
factory.o: ../FL/Fl_Help_View.H ../FL/Fl_Shared_Image.H ../FL/Fl_Progress.H
factory.o: ../FL/Fl_Adjuster.H ../FL/Fl_Dial.H ../FL/Fl_Roller.H
factory.o: ../FL/Fl_Output.H ../FL/Fl_Input.H ../FL/Fl_Value_Input.H


+ 0
- 28
fluid/pixmaps/flClock.xpm View File

@@ -1,28 +0,0 @@
/* XPM */
static const char *flClock_xpm[] = {
/* width height ncolors chars_per_pixel */
"16 16 5 1",
/* colors */
". c none",
"a c #000000",
"b c #c0c0c0",
"c c #000000",
"' c #202080",
/* pixels */
"................",
"................",
"....aaaaaaa.....",
"..aabbbbbbbcc...",
".abbbbbbbbb'bc..",
".abb'bbbbb'bbc..",
"abbbb'bbb'bbbbc.",
"abbbbb'b'bbbbbc.",
"abbbbbb'bbbbbbc.",
"abbbbbbbbbbbbbc.",
"abbbbbbbbbbbbbc.",
".abbbbbbbbbbbc..",
".abbbbbbbbbbbc..",
"..ccbbbbbbbcc...",
"....ccccccc.....",
"................",
};

+ 0
- 3
forms.h View File

@@ -1,3 +0,0 @@
// this file allows some forms programs to be compiled with no change.
// put it in your include path.
#include <FL/forms.H>

+ 0
- 218
src/Fl_Clock.cxx View File

@@ -1,218 +0,0 @@
//
// "$Id: Fl_Clock.cxx 7903 2010-11-28 21:06:39Z matt $"
//
// Clock widget for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2010 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Library General Public License for more details.
//
// You should have received a copy of the GNU Library General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
// Please report all bugs and problems on the following page:
//
// http://www.fltk.org/str.php
//

#include <FL/Fl.H>
#include <FL/Fl_Clock.H>
#include <FL/fl_draw.H>
#include <math.h>
#include <time.h>
#ifndef WIN32
# include <sys/time.h>
#endif /* !WIN32 */

// Original clock display written by Paul Haeberli at SGI.
// Modifications by Mark Overmars for Forms
// Further changes by Bill Spitzak for fltk

const float hourhand[4][2] = {{-0.5f, 0}, {0, 1.5f}, {0.5f, 0}, {0, -7.0f}};
const float minhand[4][2] = {{-0.5f, 0}, {0, 1.5f}, {0.5f, 0}, {0, -11.5f}};
const float sechand[4][2] = {{-0.1f, 0}, {0, 2.0f}, {0.1f, 0}, {0, -11.5f}};

static void drawhand(double ang,const float v[][2],Fl_Color fill,Fl_Color line)
{
fl_push_matrix();
fl_rotate(ang);
fl_color(fill); fl_begin_polygon();
int i; for (i=0; i<4; i++) fl_vertex(v[i][0],v[i][1]); fl_end_polygon();
fl_color(line); fl_begin_loop();
for (i=0; i<4; i++) fl_vertex(v[i][0],v[i][1]); fl_end_loop();
fl_pop_matrix();
}

void Fl_Clock_Output::drawhands(Fl_Color fill, Fl_Color line) {
if (!active_r()) {
fill = fl_inactive(fill);
line = fl_inactive(line);
}
drawhand(-360*(hour()+minute()/60.0)/12, hourhand, fill, line);
drawhand(-360*(minute()+second()/60.0)/60, minhand, fill, line);
drawhand(-360*(second()/60.0), sechand, fill, line);
}

static void rect(double x, double y, double w, double h) {
double r = x+w;
double t = y+h;
fl_begin_polygon();
fl_vertex(x, y);
fl_vertex(r, y);
fl_vertex(r, t);
fl_vertex(x, t);
fl_end_polygon();
}

/**
Draw clock with the given position and size.
\param[in] X, Y, W, H position and size
*/
void Fl_Clock_Output::draw(int X, int Y, int W, int H) {
Fl_Color box_color = type()==FL_ROUND_CLOCK ? FL_GRAY : color();
Fl_Color shadow_color = fl_color_average(box_color, FL_BLACK, 0.5);
draw_box(box(), X, Y, W, H, box_color);
fl_push_matrix();
fl_translate(X+W/2.0-.5, Y+H/2.0-.5);
fl_scale((W-1)/28.0, (H-1)/28.0);
if (type() == FL_ROUND_CLOCK) {
fl_color(active_r() ? color() : fl_inactive(color()));
fl_begin_polygon(); fl_circle(0,0,14); fl_end_polygon();
fl_color(active_r() ? FL_FOREGROUND_COLOR : fl_inactive(FL_FOREGROUND_COLOR));
fl_begin_loop(); fl_circle(0,0,14); fl_end_loop();
}
// draw the shadows:
fl_push_matrix();
fl_translate(0.60, 0.60);
drawhands(shadow_color, shadow_color);
fl_pop_matrix();
// draw the tick marks:
fl_push_matrix();
fl_color(active_r() ? FL_FOREGROUND_COLOR : fl_inactive(FL_FOREGROUND_COLOR));
for (int i=0; i<12; i++) {
if (i==6) rect(-0.5, 9, 1, 2);
else if (i==3 || i==0 || i== 9) rect(-0.5, 9.5, 1, 1);
else rect(-0.25, 9.5, .5, 1);
fl_rotate(-30);
}
fl_pop_matrix();
// draw the hands:
drawhands(selection_color(), FL_FOREGROUND_COLOR); // color was 54
fl_pop_matrix();
}

/**
Draw clock with current position and size.
*/
void Fl_Clock_Output::draw() {
draw(x(), y(), w(), h());
draw_label();
}

/**
Set the displayed time.
Set the time in hours, minutes, and seconds.
\param[in] H, m, s displayed time
\see hour(), minute(), second()
*/
void Fl_Clock_Output::value(int H, int m, int s) {
if (H!=hour_ || m!=minute_ || s!=second_) {
hour_ = H; minute_ = m; second_ = s;
value_ = (H * 60 + m) * 60 + s;
damage(FL_DAMAGE_CHILD);
}
}

/**
Set the displayed time.
Set the time in seconds since the UNIX epoch (January 1, 1970).
\param[in] v seconds since epoch
\see value()
*/
void Fl_Clock_Output::value(ulong v) {
value_ = v;
struct tm *timeofday;
// Some platforms, notably Windows, now use a 64-bit time_t value...
time_t vv = (time_t)v;
timeofday = localtime(&vv);
value(timeofday->tm_hour, timeofday->tm_min, timeofday->tm_sec);
}

/**
Create a new Fl_Clock_Output widget with the given position, size and label.
The default boxtype is \c FL_NO_BOX.
\param[in] X, Y, W, H position and size of the widget
\param[in] L widget label, default is no label
*/
Fl_Clock_Output::Fl_Clock_Output(int X, int Y, int W, int H, const char *L)
: Fl_Widget(X, Y, W, H, L) {
box(FL_UP_BOX);
selection_color(fl_gray_ramp(5));
align(FL_ALIGN_BOTTOM);
hour_ = 0;
minute_ = 0;
second_ = 0;
value_ = 0;
}

////////////////////////////////////////////////////////////////

/**
Create an Fl_Clock widget using the given position, size, and label string.
The default boxtype is \c FL_NO_BOX.
\param[in] X, Y, W, H position and size of the widget
\param[in] L widget label, default is no label
*/
Fl_Clock::Fl_Clock(int X, int Y, int W, int H, const char *L)
: Fl_Clock_Output(X, Y, W, H, L) {}

/**
Create an Fl_Clock widget using the given boxtype, position, size, and
label string.
\param[in] t boxtype
\param[in] X, Y, W, H position and size of the widget
\param[in] L widget label, default is no label
*/
Fl_Clock::Fl_Clock(uchar t, int X, int Y, int W, int H, const char *L)
: Fl_Clock_Output(X, Y, W, H, L) {
type(t);
box(t==FL_ROUND_CLOCK ? FL_NO_BOX : FL_UP_BOX);
}

static void tick(void *v) {
((Fl_Clock*)v)->value(time(0));
Fl::add_timeout(1.0, tick, v);
}

int Fl_Clock::handle(int event) {
switch (event) {
case FL_SHOW:
tick(this);
break;
case FL_HIDE:
Fl::remove_timeout(tick, this);
break;
}
return Fl_Clock_Output::handle(event);
}
/**
The destructor removes the clock.
*/
Fl_Clock::~Fl_Clock() {
Fl::remove_timeout(tick, this);
}

//
// End of "$Id: Fl_Clock.cxx 7903 2010-11-28 21:06:39Z matt $".
//

+ 0
- 1
src/Makefile View File

@@ -39,7 +39,6 @@ CPPFILES = \
Fl_Check_Browser.cxx \
Fl_Check_Button.cxx \
Fl_Choice.cxx \
Fl_Clock.cxx \
Fl_Color_Chooser.cxx \
Fl_Counter.cxx \
Fl_Dial.cxx \


+ 0
- 4
test/Makefile View File

@@ -40,7 +40,6 @@ CPPFILES =\
buttons.cxx \
cairo_test.cxx \
checkers.cxx \
clock.cxx \
colbrowser.cxx \
color_chooser.cxx \
cube.cxx \
@@ -114,7 +113,6 @@ ALL = \
buttons$(EXEEXT) \
cairo_test$(EXEEXT) \
checkers$(EXEEXT) \
clock$(EXEEXT) \
colbrowser$(EXEEXT) \
color_chooser$(EXEEXT) \
cursor$(EXEEXT) \
@@ -304,8 +302,6 @@ checkers$(EXEEXT): checkers.o
$(CXX) $(ARCHFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
$(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS

clock$(EXEEXT): clock.o

colbrowser$(EXEEXT): colbrowser.o
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)


+ 0
- 53
test/clock.cxx View File

@@ -1,53 +0,0 @@
//
// "$Id: clock.cxx 7903 2010-11-28 21:06:39Z matt $"
//
// Clock test program for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2010 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Library General Public License for more details.
//
// You should have received a copy of the GNU Library General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
// Please report all bugs and problems on the following page:
//
// http://www.fltk.org/str.php
//

#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Clock.H>
#include <FL/Fl_Round_Clock.H>

int main(int argc, char **argv) {
Fl_Double_Window window(220,220,"Fl_Clock");
Fl_Clock c1(0,0,220,220); // c1.color(2,1);
window.resizable(c1);
window.end();
Fl_Double_Window window2(220,220,"Fl_Round_Clock");
Fl_Round_Clock c2(0,0,220,220); // c2.color(3,4);
window2.resizable(c2);
window2.end();
// my machine had a clock* Xresource set for another program, so
// I don't want the class to be "clock":
window.xclass("Fl_Clock");
window2.xclass("Fl_Clock");
window.show(argc,argv);
window2.show();
return Fl::run();
}

//
// End of "$Id: clock.cxx 7903 2010-11-28 21:06:39Z matt $".
//

+ 0
- 2
test/device.cxx View File

@@ -31,7 +31,6 @@
#include <FL/Fl_Overlay_Window.H>
#include <FL/Fl_Light_Button.H>
#include <FL/fl_draw.H>
#include <FL/Fl_Clock.H>
#include "pixmaps/porsche.xpm"
#include <FL/Fl_Pixmap.H>
#include <FL/Fl_Bitmap.H>
@@ -637,7 +636,6 @@ int main(int argc, char ** argv) {
b_bitmap.labelcolor(FL_GREEN);
b_bitmap.image(new Fl_Bitmap(sorceress_bits,sorceress_width,sorceress_height));
new Fl_Clock(360,230,120,120);
Fl_Return_Button * ret = new Fl_Return_Button (360, 360, 120,30, "Return");
ret->deactivate();
Fl_Button but1(360, 390, 30, 30, "@->|");


+ 0
- 4
test/inactive.fl View File

@@ -101,10 +101,6 @@ Function {} {open
label dial
xywh {275 235 50 50}
}
Fl_Clock {} {
label clock
xywh {335 235 50 50}
}
}
Fl_Button {} {
label active


+ 4
- 31
test/makedepend View File

@@ -83,10 +83,6 @@ checkers.o: pixmaps/blackking_4.xbm pixmaps/whiteking_1.xbm
checkers.o: pixmaps/whiteking_2.xbm pixmaps/whiteking_3.xbm
checkers.o: pixmaps/whiteking_4.xbm ../FL/Fl_Box.H ../FL/Fl_Slider.H
checkers.o: ../FL/Fl_Valuator.H ../FL/Fl_Value_Output.H
clock.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
clock.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Double_Window.H
clock.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
clock.o: ../FL/Fl_Clock.H ../FL/Fl_Round_Clock.H ../FL/Fl_Clock.H
colbrowser.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
colbrowser.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Double_Window.H
colbrowser.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
@@ -150,7 +146,7 @@ device.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
device.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Overlay_Window.H
device.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
device.o: ../FL/Fl_Widget.H ../FL/Fl_Light_Button.H ../FL/fl_draw.H
device.o: ../FL/Fl_Clock.H pixmaps/porsche.xpm ../FL/Fl_Pixmap.H
device.o: pixmaps/porsche.xpm ../FL/Fl_Pixmap.H
device.o: ../FL/Fl_Image.H ../FL/Fl_Bitmap.H ../FL/Fl_Round_Button.H
device.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Printer.H
device.o: ../FL/x.H ../FL/Fl_Paged_Device.H ../FL/Fl_Device.H
@@ -216,29 +212,6 @@ fonts.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Tile.H
fonts.o: ../FL/Fl_Hold_Browser.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
fonts.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
fonts.o: ../FL/Fl_Image.H ../FL/fl_draw.H ../FL/Fl_Box.H ../FL/fl_ask.H
forms.o: ../FL/forms.H ../FL/Fl.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
forms.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_types.h
forms.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/x.H ../FL/Xutf8.h
forms.o: ../FL/Enumerations.H ../FL/Fl_Window.H ../FL/Fl_Device.H
forms.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
forms.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H
forms.o: ../FL/Fl_RGB_Image.H ../FL/Fl_FormsBitmap.H ../FL/Fl_Bitmap.H
forms.o: ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H ../FL/Fl_Box.H
forms.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
forms.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl.H ../FL/fl_utf8.h
forms.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H
forms.o: ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H ../FL/Fl_Choice.H
forms.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H
forms.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H ../FL/fl_ask.H
forms.o: ../FL/fl_show_colormap.H ../FL/filename.H ../FL/Fl_File_Chooser.H
forms.o: ../FL/Fl_Double_Window.H ../FL/Fl_Group.H ../FL/Fl_Choice.H
forms.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H ../FL/Fl_Preferences.H
forms.o: ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H
forms.o: ../FL/Fl_Box.H ../FL/Fl_Check_Button.H ../FL/Fl_File_Input.H
forms.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H
forms.o: ../FL/fl_ask.H ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H
forms.o: ../FL/Fl_Positioner.H ../FL/Fl_Value_Slider.H ../FL/Fl_Timer.H
forms.o: pixmaps/srs.xbm
fractals.o: ../config.h ../FL/glut.H ../FL/gl.h ../FL/Enumerations.H
fractals.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Fl.H
fractals.o: ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
@@ -291,7 +264,7 @@ inactive.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Input.H
inactive.o: ../FL/Fl_Input_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
inactive.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H ../FL/Fl_Value_Output.H
inactive.o: ../FL/Fl_Box.H ../FL/Fl_Scrollbar.H ../FL/Fl_Roller.H
inactive.o: ../FL/Fl_Dial.H ../FL/Fl_Clock.H
inactive.o: ../FL/Fl_Dial.H
input.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
input.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Window.H
input.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Float_Input.H
@@ -431,7 +404,7 @@ device.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
device.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Overlay_Window.H
device.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
device.o: ../FL/Fl_Widget.H ../FL/Fl_Light_Button.H ../FL/fl_draw.H
device.o: ../FL/Fl_Clock.H pixmaps/porsche.xpm ../FL/Fl_Pixmap.H
device.o: pixmaps/porsche.xpm ../FL/Fl_Pixmap.H
device.o: ../FL/Fl_Image.H ../FL/Fl_Bitmap.H ../FL/Fl_Round_Button.H
device.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Printer.H
device.o: ../FL/x.H ../FL/Fl_Paged_Device.H ../FL/Fl_Device.H
@@ -520,7 +493,7 @@ tabs.o: tabs.h ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
tabs.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Double_Window.H
tabs.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Box.H
tabs.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
tabs.o: ../FL/Fl_Button.H ../FL/fl_ask.H ../FL/Fl_Clock.H ../FL/Fl_Wizard.H
tabs.o: ../FL/Fl_Button.H ../FL/fl_ask.H ../FL/Fl_Wizard.H
tabs.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
threads.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H
threads.o: ../FL/fl_types.h ../FL/Xutf8.h ../FL/Enumerations.H


+ 0
- 8
test/tabs.fl View File

@@ -105,10 +105,6 @@ Function {} {open
label button
xywh {90 75 60 80}
}
Fl_Clock {} {
label {Make sure this clock does not use processor time when this tab is hidden or window is iconized}
xywh {160 75 100 100} box OSHADOW_BOX color 238 selection_color 0 labelfont 8 labelsize 10 align 130
}
Fl_Group {} {open
xywh {20 175 40 55} box THIN_DOWN_BOX color 173 align 16
class Fl_Window
@@ -221,10 +217,6 @@ Function {} {open
label button
xywh {405 75 60 80}
}
Fl_Clock {} {
label {Make sure this clock does not use processor time when this tab is hidden or window is iconized}
xywh {475 75 100 100} box OSHADOW_BOX color 238 selection_color 0 labelfont 8 labelsize 10 align 130
}
Fl_Group {} {open
xywh {335 175 40 55} box THIN_DOWN_BOX color 173 align 16
class Fl_Window


Loading…
Cancel
Save