diff options
Diffstat (limited to 'FL')
53 files changed, 643 insertions, 643 deletions
diff --git a/FL/Fl_Adjuster.H b/FL/Fl_Adjuster.H index 4807a65d1..dba81f1cc 100644 --- a/FL/Fl_Adjuster.H +++ b/FL/Fl_Adjuster.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Adjuster.H,v 1.5.2.3.2.2 2002/08/09 01:09:48 easysw Exp $" +// "$Id: Fl_Adjuster.H,v 1.5.2.3.2.3 2002/08/14 16:49:37 easysw Exp $" // // Adjuster widget header file for the Fast Light Tool Kit (FLTK). // @@ -32,22 +32,22 @@ #include "Fl_Valuator.H" #endif -class Fl_Adjuster : public Fl_Valuator { +class FL_EXPORT Fl_Adjuster : public Fl_Valuator { int drag; int ix; int soft_; protected: - FL_EXPORT void draw(); - FL_EXPORT int handle(int); - FL_EXPORT void value_damage(); + void draw(); + int handle(int); + void value_damage(); public: - FL_EXPORT Fl_Adjuster(int X,int Y,int W,int H,const char *l=0); - FL_EXPORT void soft(int s) {soft_ = s;} - FL_EXPORT int soft() const {return soft_;} + Fl_Adjuster(int X,int Y,int W,int H,const char *l=0); + void soft(int s) {soft_ = s;} + int soft() const {return soft_;} }; #endif // -// End of "$Id: Fl_Adjuster.H,v 1.5.2.3.2.2 2002/08/09 01:09:48 easysw Exp $". +// End of "$Id: Fl_Adjuster.H,v 1.5.2.3.2.3 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Box.H b/FL/Fl_Box.H index adceb4571..4bc8cc789 100644 --- a/FL/Fl_Box.H +++ b/FL/Fl_Box.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Box.H,v 1.5.2.4.2.3 2002/08/09 01:09:48 easysw Exp $" +// "$Id: Fl_Box.H,v 1.5.2.4.2.4 2002/08/14 16:49:37 easysw Exp $" // // Box header file for the Fast Light Tool Kit (FLTK). // @@ -30,20 +30,20 @@ #include "Fl_Widget.H" #endif -class Fl_Box : public Fl_Widget { +class FL_EXPORT Fl_Box : public Fl_Widget { protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT Fl_Box(int X, int Y, int W, int H, const char *l=0) + Fl_Box(int X, int Y, int W, int H, const char *l=0) : Fl_Widget(X,Y,W,H,l) {} - FL_EXPORT Fl_Box(Fl_Boxtype b, int X, int Y, int W, int H, const char *l) + Fl_Box(Fl_Boxtype b, int X, int Y, int W, int H, const char *l) : Fl_Widget(X,Y,W,H,l) {box(b);} - virtual FL_EXPORT int handle(int); + virtual int handle(int); }; #endif // -// End of "$Id: Fl_Box.H,v 1.5.2.4.2.3 2002/08/09 01:09:48 easysw Exp $". +// End of "$Id: Fl_Box.H,v 1.5.2.4.2.4 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Browser.H b/FL/Fl_Browser.H index 9ffc3c51e..7f5cef53f 100644 --- a/FL/Fl_Browser.H +++ b/FL/Fl_Browser.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Browser.H,v 1.8.2.7.2.2 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Browser.H,v 1.8.2.7.2.3 2002/08/14 16:49:37 easysw Exp $" // // Browser header file for the Fast Light Tool Kit (FLTK). // @@ -34,7 +34,7 @@ struct FL_BLINE; -class Fl_Browser : public Fl_Browser_ { +class FL_EXPORT Fl_Browser : public Fl_Browser_ { FL_BLINE *first; // the array of lines FL_BLINE *last; @@ -49,56 +49,56 @@ class Fl_Browser : public Fl_Browser_ { protected: // required routines for Fl_Browser_ subclass: - FL_EXPORT void* item_first() const ; - FL_EXPORT void* item_next(void*) const ; - FL_EXPORT void* item_prev(void*) const ; - FL_EXPORT int item_selected(void*) const ; - FL_EXPORT void item_select(void*, int); - FL_EXPORT int item_height(void*) const ; - FL_EXPORT int item_width(void*) const ; - FL_EXPORT void item_draw(void*, int, int, int, int) const ; - FL_EXPORT int full_height() const ; - FL_EXPORT int incr_height() const ; - - FL_EXPORT FL_BLINE* find_line(int) const ; - FL_EXPORT FL_BLINE* _remove(int) ; - FL_EXPORT void insert(int, FL_BLINE*); - FL_EXPORT int lineno(void*) const ; + void* item_first() const ; + void* item_next(void*) const ; + void* item_prev(void*) const ; + int item_selected(void*) const ; + void item_select(void*, int); + int item_height(void*) const ; + int item_width(void*) const ; + void item_draw(void*, int, int, int, int) const ; + int full_height() const ; + int incr_height() const ; + + FL_BLINE* find_line(int) const ; + FL_BLINE* _remove(int) ; + void insert(int, FL_BLINE*); + int lineno(void*) const ; public: - FL_EXPORT void remove(int); - FL_EXPORT void add(const char*, void* = 0); - FL_EXPORT void insert(int, const char*, void* = 0); - FL_EXPORT void move(int to, int from); - FL_EXPORT int load(const char* filename); - FL_EXPORT void clear(); + void remove(int); + void add(const char*, void* = 0); + void insert(int, const char*, void* = 0); + void move(int to, int from); + int load(const char* filename); + void clear(); int size() const {return lines;} - FL_EXPORT int topline() const ; + int topline() const ; enum Fl_Line_Position { TOP, BOTTOM, MIDDLE }; - FL_EXPORT void lineposition(int, Fl_Line_Position); + void lineposition(int, Fl_Line_Position); void topline(int l) { lineposition(l, TOP); } void bottomline(int l) { lineposition(l, BOTTOM); } void middleline(int l) { lineposition(l, MIDDLE); } - FL_EXPORT int select(int, int=1); - FL_EXPORT int selected(int) const ; - FL_EXPORT void show(int n); + int select(int, int=1); + int selected(int) const ; + void show(int n); void show() {Fl_Widget::show();} - FL_EXPORT void hide(int n); + void hide(int n); void hide() {Fl_Widget::hide();} - FL_EXPORT int visible(int n) const ; + int visible(int n) const ; - FL_EXPORT int value() const ; + int value() const ; void value(int v) {select(v);} - FL_EXPORT const char* text(int) const ; - FL_EXPORT void text(int, const char*); - FL_EXPORT void* data(int) const ; - FL_EXPORT void data(int, void* v); + const char* text(int) const ; + void text(int, const char*); + void* data(int) const ; + void data(int, void* v); - FL_EXPORT Fl_Browser(int, int, int, int, const char* = 0); + Fl_Browser(int, int, int, int, const char* = 0); ~Fl_Browser() { clear(); } char format_char() const {return format_char_;} @@ -117,11 +117,11 @@ public: // for back compatability only: void replace(int a, const char* b) {text(a, b);} - FL_EXPORT void display(int, int=1); + void display(int, int=1); }; #endif // -// End of "$Id: Fl_Browser.H,v 1.8.2.7.2.2 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Browser.H,v 1.8.2.7.2.3 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Browser_.H b/FL/Fl_Browser_.H index bdfa81d53..fa809c16c 100644 --- a/FL/Fl_Browser_.H +++ b/FL/Fl_Browser_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Browser_.H,v 1.6.2.4.2.2 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Browser_.H,v 1.6.2.4.2.3 2002/08/14 16:49:37 easysw Exp $" // // Common browser header file for the Fast Light Tool Kit (FLTK). // @@ -43,7 +43,7 @@ #define FL_HOLD_BROWSER 2 #define FL_MULTI_BROWSER 3 -class Fl_Browser_ : public Fl_Group { +class FL_EXPORT Fl_Browser_ : public Fl_Group { int position_; // where user wants it scrolled to int real_position_; // the current vertical scrolling position int hposition_; // where user wants it panned to @@ -60,61 +60,61 @@ class Fl_Browser_ : public Fl_Group { static int scrollbar_width_; - FL_EXPORT void update_top(); + void update_top(); protected: // All of the following must be supplied by the subclass: - virtual FL_EXPORT void *item_first() const = 0; - virtual FL_EXPORT void *item_next(void *) const = 0; - virtual FL_EXPORT void *item_prev(void *) const = 0; - virtual FL_EXPORT int item_height(void *) const = 0; - virtual FL_EXPORT int item_width(void *) const = 0; - virtual FL_EXPORT int item_quick_height(void *) const ; - virtual FL_EXPORT void item_draw(void *,int,int,int,int) const = 0; + virtual void *item_first() const = 0; + virtual void *item_next(void *) const = 0; + virtual void *item_prev(void *) const = 0; + virtual int item_height(void *) const = 0; + virtual int item_width(void *) const = 0; + virtual int item_quick_height(void *) const ; + virtual void item_draw(void *,int,int,int,int) const = 0; // you don't have to provide these but it may help speed it up: - virtual FL_EXPORT int full_width() const ; // current width of all items - virtual FL_EXPORT int full_height() const ; // current height of all items - virtual FL_EXPORT int incr_height() const ; // average height of an item + virtual int full_width() const ; // current width of all items + virtual int full_height() const ; // current height of all items + virtual int incr_height() const ; // average height of an item // These only need to be done by subclass if you want a multi-browser: - virtual FL_EXPORT void item_select(void *,int=1); - virtual FL_EXPORT int item_selected(void *) const ; + virtual void item_select(void *,int=1); + virtual int item_selected(void *) const ; // things the subclass may want to call: - FL_EXPORT void *top() const {return top_;} - FL_EXPORT void *selection() const {return selection_;} - FL_EXPORT void new_list(); // completely clobber all data, as though list replaced - FL_EXPORT void deleting(void *a); // get rid of any pointers to a - FL_EXPORT void replacing(void *a,void *b); // change a pointers to b - FL_EXPORT void inserting(void *a,void *b); // insert a before b - FL_EXPORT int displayed(void *) const ; // true if this line is visible - FL_EXPORT void redraw_line(void *); // minimal update, no change in size - FL_EXPORT void redraw_lines() {damage(FL_DAMAGE_SCROLL);} // redraw all of them - FL_EXPORT void bbox(int&,int&,int&,int&) const; - FL_EXPORT int leftedge() const; // x position after scrollbar & border - FL_EXPORT void *find_item(int my); // item under mouse - FL_EXPORT void draw(int,int,int,int); - FL_EXPORT int handle(int,int,int,int,int); - - FL_EXPORT void draw(); - FL_EXPORT Fl_Browser_(int,int,int,int,const char * = 0); + void *top() const {return top_;} + void *selection() const {return selection_;} + void new_list(); // completely clobber all data, as though list replaced + void deleting(void *a); // get rid of any pointers to a + void replacing(void *a,void *b); // change a pointers to b + void inserting(void *a,void *b); // insert a before b + int displayed(void *) const ; // true if this line is visible + void redraw_line(void *); // minimal update, no change in size + void redraw_lines() {damage(FL_DAMAGE_SCROLL);} // redraw all of them + void bbox(int&,int&,int&,int&) const; + int leftedge() const; // x position after scrollbar & border + void *find_item(int my); // item under mouse + void draw(int,int,int,int); + int handle(int,int,int,int,int); + + void draw(); + Fl_Browser_(int,int,int,int,const char * = 0); public: Fl_Scrollbar scrollbar; // Vertical scrollbar Fl_Scrollbar hscrollbar; // Horizontal scrollbar - FL_EXPORT int handle(int); - FL_EXPORT void resize(int,int,int,int); + int handle(int); + void resize(int,int,int,int); - FL_EXPORT int select(void *,int=1,int docallbacks=0); - FL_EXPORT int select_only(void *,int docallbacks=0); - FL_EXPORT int deselect(int docallbacks=0); + int select(void *,int=1,int docallbacks=0); + int select_only(void *,int docallbacks=0); + int deselect(int docallbacks=0); int position() const {return position_;} int hposition() const {return hposition_;} - FL_EXPORT void position(int); // scroll to here - FL_EXPORT void hposition(int); // pan to here - FL_EXPORT void display(void*); // scroll so this item is shown + void position(int); // scroll to here + void hposition(int); // pan to here + void display(void*); // scroll so this item is shown uchar has_scrollbar() const {return has_scrollbar_;} void has_scrollbar(uchar i) {has_scrollbar_ = i;} @@ -147,5 +147,5 @@ public: #endif // -// End of "$Id: Fl_Browser_.H,v 1.6.2.4.2.2 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Browser_.H,v 1.6.2.4.2.3 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Button.H b/FL/Fl_Button.H index 5c2830f8b..607806e6b 100644 --- a/FL/Fl_Button.H +++ b/FL/Fl_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Button.H,v 1.5.2.3.2.3 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Button.H,v 1.5.2.3.2.4 2002/08/14 16:49:37 easysw Exp $" // // Button header file for the Fast Light Tool Kit (FLTK). // @@ -38,7 +38,7 @@ extern FL_EXPORT int fl_old_shortcut(const char*); -class Fl_Button : public Fl_Widget { +class FL_EXPORT Fl_Button : public Fl_Widget { int shortcut_; char value_; @@ -47,17 +47,17 @@ class Fl_Button : public Fl_Widget { protected: - virtual FL_EXPORT void draw(); + virtual void draw(); public: - virtual FL_EXPORT int handle(int); - FL_EXPORT Fl_Button(int,int,int,int,const char * = 0); - FL_EXPORT int value(int); + virtual int handle(int); + Fl_Button(int,int,int,int,const char * = 0); + int value(int); char value() const {return value_;} int set() {return value(1);} int clear() {return value(0);} - FL_EXPORT void setonly(); // this should only be called on FL_RADIO_BUTTONs + void setonly(); // this should only be called on FL_RADIO_BUTTONs int shortcut() const {return shortcut_;} void shortcut(int s) {shortcut_ = s;} Fl_Boxtype down_box() const {return (Fl_Boxtype)down_box_;} @@ -72,5 +72,5 @@ public: #endif // -// End of "$Id: Fl_Button.H,v 1.5.2.3.2.3 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Button.H,v 1.5.2.3.2.4 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Chart.H b/FL/Fl_Chart.H index a4d697ead..11af43fbb 100644 --- a/FL/Fl_Chart.H +++ b/FL/Fl_Chart.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Chart.H,v 1.6.2.3.2.2 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Chart.H,v 1.6.2.3.2.3 2002/08/14 16:49:37 easysw Exp $" // // Forms chart header file for the Fast Light Tool Kit (FLTK). // @@ -50,7 +50,7 @@ struct FL_CHART_ENTRY { char str[FL_CHART_LABEL_MAX+1]; }; -class Fl_Chart : public Fl_Widget { +class FL_EXPORT Fl_Chart : public Fl_Widget { int numb; int maxnumb; int sizenumb; @@ -60,18 +60,18 @@ class Fl_Chart : public Fl_Widget { uchar textfont_,textsize_; unsigned textcolor_; protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT Fl_Chart(int,int,int,int,const char * = 0); - FL_EXPORT void clear(); - FL_EXPORT void add(double, const char * =0, unsigned=0); - FL_EXPORT void insert(int, double, const char * =0, unsigned=0); - FL_EXPORT void replace(int, double, const char * =0, unsigned=0); + Fl_Chart(int,int,int,int,const char * = 0); + void clear(); + void add(double, const char * =0, unsigned=0); + void insert(int, double, const char * =0, unsigned=0); + void replace(int, double, const char * =0, unsigned=0); void bounds(double *a,double *b) const {*a = min; *b = max;} - FL_EXPORT void bounds(double a,double b); + void bounds(double a,double b); int size() const {return numb;} int maxsize() const {return maxnumb;} - FL_EXPORT void maxsize(int); + void maxsize(int); Fl_Font textfont() const {return (Fl_Font)textfont_;} void textfont(uchar s) {textfont_ = s;} uchar textsize() const {return textsize_;} @@ -85,5 +85,5 @@ public: #endif // -// End of "$Id: Fl_Chart.H,v 1.6.2.3.2.2 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Chart.H,v 1.6.2.3.2.3 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Check_Browser.H b/FL/Fl_Check_Browser.H index 2820be660..e137b89ca 100644 --- a/FL/Fl_Check_Browser.H +++ b/FL/Fl_Check_Browser.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Check_Browser.H,v 1.1.2.3 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Check_Browser.H,v 1.1.2.4 2002/08/14 16:49:37 easysw Exp $" // // Fl_Check_Browser header file for the Fast Light Tool Kit (FLTK). // @@ -29,17 +29,17 @@ #include "Fl.H" #include "Fl_Browser_.H" -class Fl_Check_Browser : public Fl_Browser_ { +class FL_EXPORT Fl_Check_Browser : public Fl_Browser_ { /* required routines for Fl_Browser_ subclass: */ - FL_EXPORT void *item_first() const; - FL_EXPORT void *item_next(void *) const; - FL_EXPORT void *item_prev(void *) const; - FL_EXPORT int item_height(void *) const; - FL_EXPORT int item_width(void *) const; - FL_EXPORT void item_draw(void *, int, int, int, int) const; - FL_EXPORT void item_select(void *, int); - FL_EXPORT int item_selected(void *) const; + void *item_first() const; + void *item_next(void *) const; + void *item_prev(void *) const; + int item_height(void *) const; + int item_width(void *) const; + void item_draw(void *, int, int, int, int) const; + void item_select(void *, int); + int item_selected(void *) const; /* private data */ @@ -61,31 +61,31 @@ class Fl_Check_Browser : public Fl_Browser_ { int cached_item; int nitems_; int nchecked_; - FL_EXPORT cb_item *find_item(int) const; - FL_EXPORT int lineno(cb_item *) const; + cb_item *find_item(int) const; + int lineno(cb_item *) const; public: - FL_EXPORT Fl_Check_Browser(int x, int y, int w, int h, const char *l = 0); + Fl_Check_Browser(int x, int y, int w, int h, const char *l = 0); - FL_EXPORT int add(char *s); // add an (unchecked) item - FL_EXPORT int add(char *s, int b); // add an item and set checked + int add(char *s); // add an (unchecked) item + int add(char *s, int b); // add an item and set checked // both return the new nitems() - FL_EXPORT void clear(); // delete all items + void clear(); // delete all items int nitems() const { return nitems_; } int nchecked() const { return nchecked_; } - FL_EXPORT int checked(int item) const; - FL_EXPORT void checked(int item, int b); + int checked(int item) const; + void checked(int item, int b); void set_checked(int item) { checked(item, 1); } - FL_EXPORT void check_all(); - FL_EXPORT void check_none(); - FL_EXPORT int value() const; // currently selected item - FL_EXPORT char *text(int item) const; // returns pointer to internal buffer + void check_all(); + void check_none(); + int value() const; // currently selected item + char *text(int item) const; // returns pointer to internal buffer }; #endif // Fl_Check_Browser_H // -// End of "$Id: Fl_Check_Browser.H,v 1.1.2.3 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Check_Browser.H,v 1.1.2.4 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Check_Button.H b/FL/Fl_Check_Button.H index 21a5b9e42..3462449de 100644 --- a/FL/Fl_Check_Button.H +++ b/FL/Fl_Check_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Check_Button.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Check_Button.H,v 1.5.2.3.2.2 2002/08/14 16:49:37 easysw Exp $" // // Check button header file for the Fast Light Tool Kit (FLTK). // @@ -28,13 +28,13 @@ #include "Fl_Light_Button.H" -class Fl_Check_Button : public Fl_Light_Button { +class FL_EXPORT Fl_Check_Button : public Fl_Light_Button { public: - FL_EXPORT Fl_Check_Button(int x,int y,int w,int h,const char *l = 0); + Fl_Check_Button(int x,int y,int w,int h,const char *l = 0); }; #endif // -// End of "$Id: Fl_Check_Button.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Check_Button.H,v 1.5.2.3.2.2 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Choice.H b/FL/Fl_Choice.H index 35222c215..bac479a5f 100644 --- a/FL/Fl_Choice.H +++ b/FL/Fl_Choice.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Choice.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Choice.H,v 1.5.2.3.2.2 2002/08/14 16:49:37 easysw Exp $" // // Choice header file for the Fast Light Tool Kit (FLTK). // @@ -28,18 +28,18 @@ #include "Fl_Menu_.H" -class Fl_Choice : public Fl_Menu_ { +class FL_EXPORT Fl_Choice : public Fl_Menu_ { protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT int handle(int); - FL_EXPORT Fl_Choice(int,int,int,int,const char * = 0); - FL_EXPORT int value(int i); - FL_EXPORT int value() const {return Fl_Menu_::value();} + int handle(int); + Fl_Choice(int,int,int,int,const char * = 0); + int value(int i); + int value() const {return Fl_Menu_::value();} }; #endif // -// End of "$Id: Fl_Choice.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Choice.H,v 1.5.2.3.2.2 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Clock.H b/FL/Fl_Clock.H index 4b36b2e13..c5b3f0c6e 100644 --- a/FL/Fl_Clock.H +++ b/FL/Fl_Clock.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Clock.H,v 1.6.2.4.2.1 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Clock.H,v 1.6.2.4.2.2 2002/08/14 16:49:37 easysw Exp $" // // Clock header file for the Fast Light Tool Kit (FLTK). // @@ -38,17 +38,17 @@ // a Fl_Clock_Output can be used to display a program-supplied time: -class Fl_Clock_Output : public Fl_Widget { +class FL_EXPORT Fl_Clock_Output : public Fl_Widget { int hour_, minute_, second_; ulong value_; - FL_EXPORT void drawhands(Fl_Color,Fl_Color); // part of draw + void drawhands(Fl_Color,Fl_Color); // part of draw protected: - FL_EXPORT void draw(int, int, int, int); - FL_EXPORT void draw(); + void draw(int, int, int, int); + void draw(); public: - FL_EXPORT Fl_Clock_Output(int x,int y,int w,int h, const char *l = 0); - FL_EXPORT void value(ulong v); // set to this Unix time - FL_EXPORT void value(int,int,int); // set hour, minute, second + 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_;} int hour() const {return hour_;} int minute() const {return minute_;} @@ -57,17 +57,17 @@ public: // a Fl_Clock displays the current time always by using a timeout: -class Fl_Clock : public Fl_Clock_Output { +class FL_EXPORT Fl_Clock : public Fl_Clock_Output { public: - FL_EXPORT int handle(int); - FL_EXPORT void update(); - FL_EXPORT Fl_Clock(int x,int y,int w,int h, const char *l = 0); - FL_EXPORT Fl_Clock(uchar t,int x,int y,int w,int h, const char *l); - FL_EXPORT ~Fl_Clock(); + int handle(int); + 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.6.2.4.2.1 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Clock.H,v 1.6.2.4.2.2 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Color_Chooser.H b/FL/Fl_Color_Chooser.H index ffb693c67..1a40cdc46 100644 --- a/FL/Fl_Color_Chooser.H +++ b/FL/Fl_Color_Chooser.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Color_Chooser.H,v 1.5.2.4.2.2 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Color_Chooser.H,v 1.5.2.4.2.3 2002/08/14 16:49:37 easysw Exp $" // // Color chooser header file for the Fast Light Tool Kit (FLTK). // @@ -36,35 +36,35 @@ #include <FL/Fl_Choice.H> #include <FL/Fl_Value_Input.H> -class Flcc_HueBox : public Fl_Widget { +class FL_EXPORT Flcc_HueBox : public Fl_Widget { int px, py; protected: - FL_EXPORT void draw(); - FL_EXPORT int handle_key(int); + void draw(); + int handle_key(int); public: - FL_EXPORT int handle(int); + int handle(int); Flcc_HueBox(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) { px = py = 0;} }; -class Flcc_ValueBox : public Fl_Widget { +class FL_EXPORT Flcc_ValueBox : public Fl_Widget { int py; protected: - FL_EXPORT void draw(); - FL_EXPORT int handle_key(int); + void draw(); + int handle_key(int); public: - FL_EXPORT int handle(int); + int handle(int); Flcc_ValueBox(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) { py = 0;} }; -class Flcc_Value_Input : public Fl_Value_Input { +class FL_EXPORT Flcc_Value_Input : public Fl_Value_Input { public: - FL_EXPORT int format(char*); + int format(char*); Flcc_Value_Input(int X, int Y, int W, int H) : Fl_Value_Input(X,Y,W,H) {} }; -class Fl_Color_Chooser : public Fl_Group { +class FL_EXPORT Fl_Color_Chooser : public Fl_Group { Flcc_HueBox huebox; Flcc_ValueBox valuebox; Fl_Choice choice; @@ -74,9 +74,9 @@ class Fl_Color_Chooser : public Fl_Group { Fl_Box resize_box; double hue_, saturation_, value_; double r_, g_, b_; - FL_EXPORT void set_valuators(); - static FL_EXPORT void rgb_cb(Fl_Widget*, void*); - static FL_EXPORT void mode_cb(Fl_Widget*, void*); + void set_valuators(); + static void rgb_cb(Fl_Widget*, void*); + static void mode_cb(Fl_Widget*, void*); public: int mode() {return choice.value();} double hue() const {return hue_;} @@ -85,11 +85,11 @@ public: double r() const {return r_;} double g() const {return g_;} double b() const {return b_;} - FL_EXPORT int hsv(double,double,double); - FL_EXPORT int rgb(double,double,double); - static FL_EXPORT void hsv2rgb(double, double, double,double&,double&,double&); - static FL_EXPORT void rgb2hsv(double, double, double,double&,double&,double&); - FL_EXPORT Fl_Color_Chooser(int,int,int,int,const char* = 0); + int hsv(double,double,double); + int rgb(double,double,double); + static void hsv2rgb(double, double, double,double&,double&,double&); + static void rgb2hsv(double, double, double,double&,double&,double&); + Fl_Color_Chooser(int,int,int,int,const char* = 0); }; FL_EXPORT int fl_color_chooser(const char* name, double& r, double& g, double& b); @@ -98,5 +98,5 @@ FL_EXPORT int fl_color_chooser(const char* name, uchar& r, uchar& g, uchar& b); #endif // -// End of "$Id: Fl_Color_Chooser.H,v 1.5.2.4.2.2 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Color_Chooser.H,v 1.5.2.4.2.3 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Counter.H b/FL/Fl_Counter.H index 7c46547b8..73627b9cb 100644 --- a/FL/Fl_Counter.H +++ b/FL/Fl_Counter.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Counter.H,v 1.5.2.3.2.2 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Counter.H,v 1.5.2.3.2.3 2002/08/14 16:49:37 easysw Exp $" // // Counter header file for the Fast Light Tool Kit (FLTK). // @@ -36,25 +36,25 @@ #define FL_NORMAL_COUNTER 0 #define FL_SIMPLE_COUNTER 1 -class Fl_Counter : public Fl_Valuator { +class FL_EXPORT Fl_Counter : public Fl_Valuator { uchar textfont_, textsize_; unsigned textcolor_; double lstep_; uchar mouseobj; - static FL_EXPORT void repeat_callback(void *); - FL_EXPORT int calc_mouseobj(); - FL_EXPORT void increment_cb(); + static void repeat_callback(void *); + int calc_mouseobj(); + void increment_cb(); protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT int handle(int); - FL_EXPORT Fl_Counter(int,int,int,int,const char * = 0); - FL_EXPORT ~Fl_Counter(); + int handle(int); + Fl_Counter(int,int,int,int,const char * = 0); + ~Fl_Counter(); void lstep(double a) {lstep_ = a;} void step(double a,double b) {Fl_Valuator::step(a); lstep_ = b;} void step(double a) {Fl_Valuator::step(a);} @@ -70,5 +70,5 @@ public: #endif // -// End of "$Id: Fl_Counter.H,v 1.5.2.3.2.2 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Counter.H,v 1.5.2.3.2.3 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Dial.H b/FL/Fl_Dial.H index a88c88dd0..85e2c25b0 100644 --- a/FL/Fl_Dial.H +++ b/FL/Fl_Dial.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Dial.H,v 1.7.2.3.2.1 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Dial.H,v 1.7.2.3.2.2 2002/08/14 16:49:37 easysw Exp $" // // Dial header file for the Fast Light Tool Kit (FLTK). // @@ -35,21 +35,21 @@ #define FL_LINE_DIAL 1 #define FL_FILL_DIAL 2 -class Fl_Dial : public Fl_Valuator { +class FL_EXPORT Fl_Dial : public Fl_Valuator { short a1,a2; protected: // these allow subclasses to put the dial in a smaller area: - FL_EXPORT void draw(int, int, int, int); - FL_EXPORT int handle(int, int, int, int, int); - FL_EXPORT void draw(); + void draw(int, int, int, int); + int handle(int, int, int, int, int); + void draw(); public: - FL_EXPORT int handle(int); - FL_EXPORT Fl_Dial(int x,int y,int w,int h, const char *l = 0); + int handle(int); + Fl_Dial(int x,int y,int w,int h, const char *l = 0); short angle1() const {return a1;} void angle1(short a) {a1 = a;} short angle2() const {return a2;} @@ -61,5 +61,5 @@ public: #endif // -// End of "$Id: Fl_Dial.H,v 1.7.2.3.2.1 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Dial.H,v 1.7.2.3.2.2 2002/08/14 16:49:37 easysw Exp $". // diff --git a/FL/Fl_Double_Window.H b/FL/Fl_Double_Window.H index 65054cff5..0c6510842 100644 --- a/FL/Fl_Double_Window.H +++ b/FL/Fl_Double_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Double_Window.H,v 1.7.2.3.2.2 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Double_Window.H,v 1.7.2.3.2.3 2002/08/14 16:49:38 easysw Exp $" // // Double-buffered window header file for the Fast Light Tool Kit (FLTK). // @@ -28,17 +28,17 @@ #include "Fl_Window.H" -class Fl_Double_Window : public Fl_Window { +class FL_EXPORT Fl_Double_Window : public Fl_Window { protected: - FL_EXPORT void flush(int eraseoverlay); + void flush(int eraseoverlay); char force_doublebuffering_; // force db, even if the OS already buffers windows (overlays need that on MacOS and Windows2000) public: - FL_EXPORT void show(); + void show(); void show(int a, char **b) {Fl_Window::show(a,b);} - FL_EXPORT void flush(); - FL_EXPORT void resize(int,int,int,int); - FL_EXPORT void hide(); - FL_EXPORT ~Fl_Double_Window(); + void flush(); + void resize(int,int,int,int); + void hide(); + ~Fl_Double_Window(); Fl_Double_Window(int W, int H, const char *l = 0) : Fl_Window(W,H,l), force_doublebuffering_(0) {} Fl_Double_Window(int X, int Y, int W, int H, const char *l = 0) @@ -48,5 +48,5 @@ public: #endif // -// End of "$Id: Fl_Double_Window.H,v 1.7.2.3.2.2 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Double_Window.H,v 1.7.2.3.2.3 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_File_Browser.H b/FL/Fl_File_Browser.H index 67c33e179..b78976b98 100644 --- a/FL/Fl_File_Browser.H +++ b/FL/Fl_File_Browser.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Browser.H,v 1.1.2.3 2002/05/02 14:31:10 easysw Exp $" +// "$Id: Fl_File_Browser.H,v 1.1.2.4 2002/08/14 16:49:38 easysw Exp $" // // FileBrowser definitions. // @@ -39,7 +39,7 @@ // Fl_File_Browser class... // -class Fl_File_Browser : public Fl_Browser +class FL_EXPORT Fl_File_Browser : public Fl_Browser { int filetype_; const char *directory_; @@ -55,15 +55,15 @@ class Fl_File_Browser : public Fl_Browser public: enum { FILES, DIRECTORIES }; - FL_EXPORT Fl_File_Browser(int, int, int, int, const char * = 0); + Fl_File_Browser(int, int, int, int, const char * = 0); uchar iconsize() const { return (iconsize_); }; void iconsize(uchar s) { iconsize_ = s; redraw(); }; - FL_EXPORT void filter(const char *pattern); + void filter(const char *pattern); const char *filter() const { return (pattern_); }; - FL_EXPORT int load(const char *directory, Fl_File_Sort_F *sort = fl_numericsort); + int load(const char *directory, Fl_File_Sort_F *sort = fl_numericsort); uchar textsize() const { return (Fl_Browser::textsize()); }; void textsize(uchar s) { Fl_Browser::textsize(s); iconsize_ = 3 * s / 2; }; @@ -75,5 +75,5 @@ public: #endif // !_Fl_File_Browser_H_ // -// End of "$Id: Fl_File_Browser.H,v 1.1.2.3 2002/05/02 14:31:10 easysw Exp $". +// End of "$Id: Fl_File_Browser.H,v 1.1.2.4 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_File_Icon.H b/FL/Fl_File_Icon.H index fc8096fe1..e1aa5404e 100644 --- a/FL/Fl_File_Icon.H +++ b/FL/Fl_File_Icon.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Icon.H,v 1.1.2.6 2002/05/10 00:18:37 easysw Exp $" +// "$Id: Fl_File_Icon.H,v 1.1.2.7 2002/08/14 16:49:38 easysw Exp $" // // Fl_File_Icon definitions. // @@ -44,9 +44,9 @@ // Fl_File_Icon class... // -class Fl_File_Icon //// Icon data +class FL_EXPORT Fl_File_Icon //// Icon data { - FL_EXPORT static Fl_File_Icon *first_; // Pointer to first icon/filetype + static Fl_File_Icon *first_; // Pointer to first icon/filetype Fl_File_Icon *next_; // Pointer to next icon/filetype const char *pattern_; // Pattern string int type_; // Match only if directory or file? @@ -77,10 +77,10 @@ class Fl_File_Icon //// Icon data VERTEX // Followed by scaled X,Y }; - FL_EXPORT Fl_File_Icon(const char *p, int t, int nd = 0, short *d = 0); - FL_EXPORT ~Fl_File_Icon(); + Fl_File_Icon(const char *p, int t, int nd = 0, short *d = 0); + ~Fl_File_Icon(); - FL_EXPORT short *add(short d); + short *add(short d); short *add_color(Fl_Color c) { short *d = add(COLOR); add(c >> 16); add(c); return (d); } short *add_vertex(int x, int y) @@ -89,25 +89,25 @@ class Fl_File_Icon //// Icon data { short *d = add(VERTEX); add((int)(x * 10000.0)); add((int)(y * 10000.0)); return (d); } void clear() { num_data_ = 0; } - FL_EXPORT void draw(int x, int y, int w, int h, Fl_Color ic, int active = 1); - FL_EXPORT void label(Fl_Widget *w); - FL_EXPORT static void labeltype(const Fl_Label *o, int x, int y, int w, int h, Fl_Align a); - FL_EXPORT void load(const char *f); - FL_EXPORT int load_fti(const char *fti); - FL_EXPORT int load_image(const char *i); + void draw(int x, int y, int w, int h, Fl_Color ic, int active = 1); + void label(Fl_Widget *w); + static void labeltype(const Fl_Label *o, int x, int y, int w, int h, Fl_Align a); + void load(const char *f); + int load_fti(const char *fti); + int load_image(const char *i); Fl_File_Icon *next() { return (next_); } const char *pattern() { return (pattern_); } int size() { return (num_data_); } int type() { return (type_); } short *value() { return (data_); } - FL_EXPORT static Fl_File_Icon *find(const char *filename, int filetype = ANY); + static Fl_File_Icon *find(const char *filename, int filetype = ANY); static Fl_File_Icon *first() { return (first_); } - FL_EXPORT static void load_system_icons(void); + static void load_system_icons(void); }; #endif // !_Fl_Fl_File_Icon_H_ // -// End of "$Id: Fl_File_Icon.H,v 1.1.2.6 2002/05/10 00:18:37 easysw Exp $". +// End of "$Id: Fl_File_Icon.H,v 1.1.2.7 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_File_Input.H b/FL/Fl_File_Input.H index 0cd4123e9..99e268b5a 100644 --- a/FL/Fl_File_Input.H +++ b/FL/Fl_File_Input.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Input.H,v 1.1.2.1 2002/04/30 21:50:16 easysw Exp $" +// "$Id: Fl_File_Input.H,v 1.1.2.2 2002/08/14 16:49:38 easysw Exp $" // // File_Input header file for the Fast Light Tool Kit (FLTK). // @@ -30,7 +30,7 @@ # include <FL/Fl_Input.H> -class Fl_File_Input : public Fl_Input +class FL_EXPORT Fl_File_Input : public Fl_Input { Fl_Color errorcolor_; char ok_entry_; @@ -44,17 +44,17 @@ class Fl_File_Input : public Fl_Input public: - FL_EXPORT Fl_File_Input(int,int,int,int,const char *t=0); + Fl_File_Input(int,int,int,int,const char *t=0); - FL_EXPORT virtual int handle(int); - FL_EXPORT virtual void draw(); + virtual int handle(int); + virtual void draw(); Fl_Boxtype down_box() const { return (Fl_Boxtype)down_box_; } void down_box(Fl_Boxtype b) { down_box_ = b; } Fl_Color errorcolor() const { return errorcolor_; } void errorcolor(Fl_Color c) { errorcolor_ = c; } - FL_EXPORT int value(const char*); - FL_EXPORT int value(const char*, int); + int value(const char*); + int value(const char*, int); const char *value() { return Fl_Input_::value(); } }; @@ -62,5 +62,5 @@ public: // -// End of "$Id: Fl_File_Input.H,v 1.1.2.1 2002/04/30 21:50:16 easysw Exp $". +// End of "$Id: Fl_File_Input.H,v 1.1.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_FormsBitmap.H b/FL/Fl_FormsBitmap.H index c39d4ee75..2405d08e2 100644 --- a/FL/Fl_FormsBitmap.H +++ b/FL/Fl_FormsBitmap.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_FormsBitmap.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_FormsBitmap.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Forms bitmap header file for the Fast Light Tool Kit (FLTK). // @@ -28,13 +28,13 @@ #include "Fl_Bitmap.H" -class Fl_FormsBitmap : public Fl_Widget { +class FL_EXPORT Fl_FormsBitmap : public Fl_Widget { Fl_Bitmap *b; protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT Fl_FormsBitmap(Fl_Boxtype, int, int, int, int, const char * = 0); - FL_EXPORT void set(int W, int H, const uchar *bits); + Fl_FormsBitmap(Fl_Boxtype, int, int, int, int, const char * = 0); + void set(int W, int H, const uchar *bits); void bitmap(Fl_Bitmap *B) {b = B;} Fl_Bitmap *bitmap() const {return b;} }; @@ -42,5 +42,5 @@ public: #endif // -// End of "$Id: Fl_FormsBitmap.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_FormsBitmap.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_FormsPixmap.H b/FL/Fl_FormsPixmap.H index fbc994a52..7dcc11044 100644 --- a/FL/Fl_FormsPixmap.H +++ b/FL/Fl_FormsPixmap.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_FormsPixmap.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_FormsPixmap.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Forms pixmap header file for the Fast Light Tool Kit (FLTK). // @@ -28,13 +28,13 @@ #include "Fl_Pixmap.H" -class Fl_FormsPixmap : public Fl_Widget { +class FL_EXPORT Fl_FormsPixmap : public Fl_Widget { Fl_Pixmap *b; protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT Fl_FormsPixmap(Fl_Boxtype, int, int, int, int, const char * = 0); - FL_EXPORT void set(/*const*/char * const * bits); + Fl_FormsPixmap(Fl_Boxtype, int, int, int, int, const char * = 0); + void set(/*const*/char * const * bits); void Pixmap(Fl_Pixmap *B) {b = B;} Fl_Pixmap *Pixmap() const {return b;} }; @@ -42,5 +42,5 @@ public: #endif // -// End of "$Id: Fl_FormsPixmap.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_FormsPixmap.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Free.H b/FL/Fl_Free.H index 8212a506b..b2c4c4774 100644 --- a/FL/Fl_Free.H +++ b/FL/Fl_Free.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Free.H,v 1.5.2.4.2.1 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Free.H,v 1.5.2.4.2.2 2002/08/14 16:49:38 easysw Exp $" // // Forms free header file for the Fast Light Tool Kit (FLTK). // @@ -38,15 +38,15 @@ typedef int (*FL_HANDLEPTR)(Fl_Widget *, int , float, float, char); -class Fl_Free : public Fl_Widget { +class FL_EXPORT Fl_Free : public Fl_Widget { FL_HANDLEPTR hfunc; - static FL_EXPORT void step(void *); + static void step(void *); protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT int handle(int); - FL_EXPORT Fl_Free(uchar t,int x,int y,int w,int h,const char *l,FL_HANDLEPTR hdl); - FL_EXPORT ~Fl_Free(); + int handle(int); + Fl_Free(uchar t,int x,int y,int w,int h,const char *l,FL_HANDLEPTR hdl); + ~Fl_Free(); }; // old event names for compatability: @@ -60,5 +60,5 @@ public: #endif // -// End of "$Id: Fl_Free.H,v 1.5.2.4.2.1 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Free.H,v 1.5.2.4.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Gl_Window.H b/FL/Fl_Gl_Window.H index b34141098..c3f626dfc 100644 --- a/FL/Fl_Gl_Window.H +++ b/FL/Fl_Gl_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Gl_Window.H,v 1.7.2.5.2.2 2002/08/09 03:17:29 easysw Exp $" +// "$Id: Fl_Gl_Window.H,v 1.7.2.5.2.3 2002/08/14 16:49:38 easysw Exp $" // // OpenGL header file for the Fast Light Tool Kit (FLTK). // @@ -33,7 +33,7 @@ typedef void* GLContext; // actually a GLXContext or HGLDC class Fl_Gl_Choice; // structure to hold result of glXChooseVisual -class Fl_Gl_Window : public Fl_Window { +class FL_EXPORT Fl_Gl_Window : public Fl_Window { int mode_; const int *alist; @@ -41,27 +41,27 @@ class Fl_Gl_Window : public Fl_Window { GLContext context_; char valid_; char damage1_; // damage() of back buffer - virtual FL_EXPORT void draw_overlay(); - FL_EXPORT void init(); + virtual void draw_overlay(); + void init(); void *overlay; - FL_EXPORT void make_overlay(); + void make_overlay(); friend class _Fl_Gl_Overlay; - static FL_EXPORT int can_do(int, const int *); - FL_EXPORT int mode(int, const int *); + static int can_do(int, const int *); + int mode(int, const int *); public: - FL_EXPORT void show(); + void show(); void show(int a, char **b) {Fl_Window::show(a,b);} - FL_EXPORT void flush(); - FL_EXPORT void hide(); - FL_EXPORT void resize(int,int,int,int); + void flush(); + void hide(); + void resize(int,int,int,int); char valid() const {return valid_;} void valid(char v) {valid_ = v;} - FL_EXPORT void invalidate(); + void invalidate(); static int can_do(int m) {return can_do(m,0);} static int can_do(const int *m) {return can_do(0, m);} @@ -71,17 +71,17 @@ public: int mode(const int *a) {return mode(0, a);} void* context() const {return context_;} - FL_EXPORT void context(void*, int destroy_flag = 0); - FL_EXPORT void make_current(); - FL_EXPORT void swap_buffers(); - FL_EXPORT void ortho(); + void context(void*, int destroy_flag = 0); + void make_current(); + void swap_buffers(); + void ortho(); - FL_EXPORT int can_do_overlay(); - FL_EXPORT void redraw_overlay(); - FL_EXPORT void hide_overlay(); - FL_EXPORT void make_overlay_current(); + int can_do_overlay(); + void redraw_overlay(); + void hide_overlay(); + void make_overlay_current(); - FL_EXPORT ~Fl_Gl_Window(); + ~Fl_Gl_Window(); Fl_Gl_Window(int W, int H, const char *l=0) : Fl_Window(W,H,l) {init();} Fl_Gl_Window(int X, int Y, int W, int H, const char *l=0) : Fl_Window(X,Y,W,H,l) {init();} @@ -90,5 +90,5 @@ public: #endif // -// End of "$Id: Fl_Gl_Window.H,v 1.7.2.5.2.2 2002/08/09 03:17:29 easysw Exp $". +// End of "$Id: Fl_Gl_Window.H,v 1.7.2.5.2.3 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Input.H b/FL/Fl_Input.H index fb05ce82e..a6807f4d2 100644 --- a/FL/Fl_Input.H +++ b/FL/Fl_Input.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Input.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Input header file for the Fast Light Tool Kit (FLTK). // @@ -28,19 +28,19 @@ #include "Fl_Input_.H" -class Fl_Input : public Fl_Input_ { - FL_EXPORT int handle_key(); - FL_EXPORT int shift_position(int p); - FL_EXPORT int shift_up_down_position(int p); - FL_EXPORT void handle_mouse(int keepmark=0); +class FL_EXPORT Fl_Input : public Fl_Input_ { + int handle_key(); + int shift_position(int p); + int shift_up_down_position(int p); + void handle_mouse(int keepmark=0); public: - FL_EXPORT void draw(); - FL_EXPORT int handle(int); - FL_EXPORT Fl_Input(int,int,int,int,const char * = 0); + void draw(); + int handle(int); + Fl_Input(int,int,int,int,const char * = 0); }; #endif // -// End of "$Id: Fl_Input.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Input.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H index 1e6db90e2..b2edc0f68 100644 --- a/FL/Fl_Input_.H +++ b/FL/Fl_Input_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input_.H,v 1.6.2.4.2.5 2002/07/23 16:28:18 easysw Exp $" +// "$Id: Fl_Input_.H,v 1.6.2.4.2.6 2002/08/14 16:49:38 easysw Exp $" // // Input base class header file for the Fast Light Tool Kit (FLTK). // @@ -44,7 +44,7 @@ #define FL_MULTILINE_INPUT_WRAP (FL_MULTILINE_INPUT | FL_INPUT_WRAP) #define FL_MULTILINE_OUTPUT_WRAP (FL_MULTILINE_INPUT | FL_INPUT_READONLY | FL_INPUT_WRAP) -class Fl_Input_ : public Fl_Widget { +class FL_EXPORT Fl_Input_ : public Fl_Widget { const char* value_; char* buffer; @@ -63,39 +63,39 @@ class Fl_Input_ : public Fl_Widget { unsigned textcolor_; unsigned cursor_color_; - FL_EXPORT const char* expand(const char*, char*) const; - FL_EXPORT double expandpos(const char*, const char*, const char*, int*) const; - FL_EXPORT void minimal_update(int, int); - FL_EXPORT void minimal_update(int p); - FL_EXPORT void put_in_buffer(int newsize); + const char* expand(const char*, char*) const; + double expandpos(const char*, const char*, const char*, int*) const; + void minimal_update(int, int); + void minimal_update(int p); + void put_in_buffer(int newsize); - FL_EXPORT void setfont() const; + void setfont() const; protected: - FL_EXPORT int word_start(int i) const; - FL_EXPORT int word_end(int i) const; - FL_EXPORT int line_start(int i) const; - FL_EXPORT int line_end(int i) const; - FL_EXPORT void drawtext(int, int, int, int); - FL_EXPORT int up_down_position(int, int keepmark=0); - FL_EXPORT void handle_mouse(int, int, int, int, int keepmark=0); - FL_EXPORT int handletext(int e, int, int, int, int); - FL_EXPORT void maybe_do_callback(); + int word_start(int i) const; + int word_end(int i) const; + int line_start(int i) const; + int line_end(int i) const; + void drawtext(int, int, int, int); + int up_down_position(int, int keepmark=0); + void handle_mouse(int, int, int, int, int keepmark=0); + int handletext(int e, int, int, int, int); + void maybe_do_callback(); int xscroll() const {return xscroll_;} int yscroll() const {return yscroll_;} public: - FL_EXPORT void resize(int, int, int, int); + void resize(int, int, int, int); - FL_EXPORT Fl_Input_(int, int, int, int, const char* = 0); - FL_EXPORT ~Fl_Input_(); + Fl_Input_(int, int, int, int, const char* = 0); + ~Fl_Input_(); - FL_EXPORT int value(const char*); - FL_EXPORT int value(const char*, int); - FL_EXPORT int static_value(const char*); - FL_EXPORT int static_value(const char*, int); + int value(const char*); + int value(const char*, int); + int static_value(const char*); + int static_value(const char*, int); const char* value() const {return value_;} char index(int i) const {return value_[i];} int size() const {return size_;} @@ -104,17 +104,17 @@ public: int position() const {return position_;} int mark() const {return mark_;} - FL_EXPORT int position(int p, int m); + int position(int p, int m); int position(int p) {return position(p, p);} int mark(int m) {return position(position(), m);} - FL_EXPORT int replace(int, int, const char*, int=0); + int replace(int, int, const char*, int=0); int cut() {return replace(position(), mark(), 0);} int cut(int n) {return replace(position(), position()+n, 0);} int cut(int a, int b) {return replace(a, b, 0);} int insert(const char* t, int l=0){return replace(position_, mark_, t, l);} - FL_EXPORT int copy(int clipboard); - FL_EXPORT int undo(); - FL_EXPORT int copy_cuts(); + int copy(int clipboard); + int undo(); + int copy_cuts(); Fl_Font textfont() const {return (Fl_Font)textfont_;} void textfont(uchar s) {textfont_ = s;} @@ -138,5 +138,5 @@ public: #endif // -// End of "$Id: Fl_Input_.H,v 1.6.2.4.2.5 2002/07/23 16:28:18 easysw Exp $". +// End of "$Id: Fl_Input_.H,v 1.6.2.4.2.6 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Light_Button.H b/FL/Fl_Light_Button.H index 990ce7af3..74ff09548 100644 --- a/FL/Fl_Light_Button.H +++ b/FL/Fl_Light_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Light_Button.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $" +// "$Id: Fl_Light_Button.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Lighted button header file for the Fast Light Tool Kit (FLTK). // @@ -28,16 +28,16 @@ #include "Fl_Button.H" -class Fl_Light_Button : public Fl_Button { +class FL_EXPORT Fl_Light_Button : public Fl_Button { protected: - virtual FL_EXPORT void draw(); + virtual void draw(); public: - virtual FL_EXPORT int handle(int); - FL_EXPORT Fl_Light_Button(int x,int y,int w,int h,const char *l = 0); + virtual int handle(int); + Fl_Light_Button(int x,int y,int w,int h,const char *l = 0); }; #endif // -// End of "$Id: Fl_Light_Button.H,v 1.5.2.3.2.1 2002/01/01 15:11:27 easysw Exp $". +// End of "$Id: Fl_Light_Button.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Menu_.H b/FL/Fl_Menu_.H index 6c547703e..c64058b5b 100644 --- a/FL/Fl_Menu_.H +++ b/FL/Fl_Menu_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_.H,v 1.7.2.4.2.3 2002/08/09 01:09:48 easysw Exp $" +// "$Id: Fl_Menu_.H,v 1.7.2.4.2.4 2002/08/14 16:49:38 easysw Exp $" // // Menu base class header file for the Fast Light Tool Kit (FLTK). // @@ -31,7 +31,7 @@ #endif #include "Fl_Menu_Item.H" -class Fl_Menu_ : public Fl_Widget { +class FL_EXPORT Fl_Menu_ : public Fl_Widget { Fl_Menu_Item *menu_; const Fl_Menu_Item *value_; @@ -45,32 +45,32 @@ protected: unsigned textcolor_; public: - FL_EXPORT const Fl_Menu_Item* picked(const Fl_Menu_Item*); + const Fl_Menu_Item* picked(const Fl_Menu_Item*); - FL_EXPORT Fl_Menu_(int,int,int,int,const char * =0); - FL_EXPORT ~Fl_Menu_(); + Fl_Menu_(int,int,int,int,const char * =0); + ~Fl_Menu_(); const Fl_Menu_Item* test_shortcut() {return picked(menu()->test_shortcut());} - FL_EXPORT void global(); + void global(); const Fl_Menu_Item *menu() const {return menu_;} - FL_EXPORT void menu(const Fl_Menu_Item *m); - FL_EXPORT void copy(const Fl_Menu_Item *m, void* user_data = 0); - FL_EXPORT int add(const char*, int shortcut, Fl_Callback*, void* = 0, int = 0); + void menu(const Fl_Menu_Item *m); + void copy(const Fl_Menu_Item *m, void* user_data = 0); + int add(const char*, int shortcut, Fl_Callback*, void* = 0, int = 0); int add(const char* a, const char* b, Fl_Callback* c, void* d = 0, int e = 0) {return add(a,fl_old_shortcut(b),c,d,e);} - FL_EXPORT int size() const ; - FL_EXPORT void clear(); - FL_EXPORT int add(const char *); - FL_EXPORT void replace(int,const char *); - FL_EXPORT void remove(int); + int size() const ; + void clear(); + int add(const char *); + void replace(int,const char *); + void remove(int); void shortcut(int i, int s) {menu_[i].shortcut(s);} void mode(int i,int fl) {menu_[i].flags = fl;} int mode(int i) const {return menu_[i].flags;} const Fl_Menu_Item *mvalue() const {return value_;} int value() const {return value_-menu_;} - FL_EXPORT int value(const Fl_Menu_Item*); + int value(const Fl_Menu_Item*); int value(int i) {return value(menu_+i);} const char *text() const {return value_ ? value_->text : 0;} const char *text(int i) const {return menu_[i].text;} @@ -93,5 +93,5 @@ public: #endif // -// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.3 2002/08/09 01:09:48 easysw Exp $". +// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.4 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Menu_Bar.H b/FL/Fl_Menu_Bar.H index 43f131b62..262c864b8 100644 --- a/FL/Fl_Menu_Bar.H +++ b/FL/Fl_Menu_Bar.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Bar.H,v 1.5.2.4.2.2 2002/08/09 01:09:48 easysw Exp $" +// "$Id: Fl_Menu_Bar.H,v 1.5.2.4.2.3 2002/08/14 16:49:38 easysw Exp $" // // Menu bar header file for the Fast Light Tool Kit (FLTK). // @@ -28,11 +28,11 @@ #include "Fl_Menu_.H" -class Fl_Menu_Bar : public Fl_Menu_ { +class FL_EXPORT Fl_Menu_Bar : public Fl_Menu_ { protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT int handle(int); + int handle(int); Fl_Menu_Bar(int X, int Y, int W, int H,const char *l=0) : Fl_Menu_(X,Y,W,H,l) {} }; @@ -40,5 +40,5 @@ public: #endif // -// End of "$Id: Fl_Menu_Bar.H,v 1.5.2.4.2.2 2002/08/09 01:09:48 easysw Exp $". +// End of "$Id: Fl_Menu_Bar.H,v 1.5.2.4.2.3 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Menu_Button.H b/FL/Fl_Menu_Button.H index a985e8f17..30b53238f 100644 --- a/FL/Fl_Menu_Button.H +++ b/FL/Fl_Menu_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Button.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Menu_Button.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Menu button header file for the Fast Light Tool Kit (FLTK). // @@ -28,19 +28,19 @@ #include "Fl_Menu_.H" -class Fl_Menu_Button : public Fl_Menu_ { +class FL_EXPORT Fl_Menu_Button : public Fl_Menu_ { protected: - FL_EXPORT void draw(); + void draw(); public: // values for type: enum {POPUP1 = 1, POPUP2, POPUP12, POPUP3, POPUP13, POPUP23, POPUP123}; - FL_EXPORT int handle(int); - FL_EXPORT const Fl_Menu_Item* popup(); - FL_EXPORT Fl_Menu_Button(int,int,int,int,const char * =0); + int handle(int); + const Fl_Menu_Item* popup(); + Fl_Menu_Button(int,int,int,int,const char * =0); }; #endif // -// End of "$Id: Fl_Menu_Button.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Menu_Button.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H index 1f37014c7..98b4b9f0d 100644 --- a/FL/Fl_Menu_Item.H +++ b/FL/Fl_Menu_Item.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.5 2002/08/01 02:02:03 easysw Exp $" +// "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.6 2002/08/14 16:49:38 easysw Exp $" // // Menu item header file for the Fast Light Tool Kit (FLTK). // @@ -49,7 +49,7 @@ extern FL_EXPORT int fl_old_shortcut(const char*); class Fl_Menu_; -struct Fl_Menu_Item { +struct FL_EXPORT Fl_Menu_Item { const char *text; // label() int shortcut_; Fl_Callback *callback_; @@ -61,7 +61,7 @@ struct Fl_Menu_Item { unsigned labelcolor_; // advance N items, skipping submenus: - FL_EXPORT const Fl_Menu_Item *next(int=1) const; + const Fl_Menu_Item *next(int=1) const; Fl_Menu_Item *next(int i=1) { return (Fl_Menu_Item*)(((const Fl_Menu_Item*)this)->next(i));} @@ -94,7 +94,7 @@ struct Fl_Menu_Item { int value() const {return flags&FL_MENU_VALUE;} void set() {flags |= FL_MENU_VALUE;} void clear() {flags &= ~FL_MENU_VALUE;} - FL_EXPORT void setonly(); + void setonly(); int visible() const {return !(flags&FL_MENU_INVISIBLE);} void show() {flags &= ~FL_MENU_INVISIBLE;} void hide() {flags |= FL_MENU_INVISIBLE;} @@ -108,23 +108,23 @@ struct Fl_Menu_Item { void image(Fl_Image& a) {a.label(this);} // used by menubar: - FL_EXPORT int measure(int* h, const Fl_Menu_*) const; - FL_EXPORT void draw(int x, int y, int w, int h, const Fl_Menu_*, int t=0) const; + int measure(int* h, const Fl_Menu_*) const; + void draw(int x, int y, int w, int h, const Fl_Menu_*, int t=0) const; // popup menus without using an Fl_Menu_ widget: - FL_EXPORT const Fl_Menu_Item* popup( + const Fl_Menu_Item* popup( int X, int Y, const char *title = 0, const Fl_Menu_Item* picked=0, const Fl_Menu_* = 0) const; - FL_EXPORT const Fl_Menu_Item* pulldown( + const Fl_Menu_Item* pulldown( int X, int Y, int W, int H, const Fl_Menu_Item* picked = 0, const Fl_Menu_* = 0, const Fl_Menu_Item* title = 0, int menubar=0) const; - FL_EXPORT const Fl_Menu_Item* test_shortcut() const; - FL_EXPORT const Fl_Menu_Item* find_shortcut(int *ip=0) const; + const Fl_Menu_Item* test_shortcut() const; + const Fl_Menu_Item* find_shortcut(int *ip=0) const; void do_callback(Fl_Widget* o) const {callback_(o, user_data_);} void do_callback(Fl_Widget* o,void* arg) const {callback_(o, arg);} @@ -134,11 +134,11 @@ struct Fl_Menu_Item { int checked() const {return flags&FL_MENU_VALUE;} void check() {flags |= FL_MENU_VALUE;} void uncheck() {flags &= ~FL_MENU_VALUE;} - FL_EXPORT int add(const char*, int shortcut, Fl_Callback*, void* =0, int = 0); + int add(const char*, int shortcut, Fl_Callback*, void* =0, int = 0); int add(const char*a, const char* b, Fl_Callback* c, void* d = 0, int e = 0) { return add(a,fl_old_shortcut(b),c,d,e);} - FL_EXPORT int size() const ; + int size() const ; }; typedef Fl_Menu_Item Fl_Menu; // back compatability @@ -159,5 +159,5 @@ enum { // back-compatability enum: #endif // -// End of "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.5 2002/08/01 02:02:03 easysw Exp $". +// End of "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.6 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Menu_Window.H b/FL/Fl_Menu_Window.H index 7d3a6cd6b..fbe699058 100644 --- a/FL/Fl_Menu_Window.H +++ b/FL/Fl_Menu_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Window.H,v 1.5.2.3.2.2 2002/01/07 18:47:27 easysw Exp $" +// "$Id: Fl_Menu_Window.H,v 1.5.2.3.2.3 2002/08/14 16:49:38 easysw Exp $" // // Menu window header file for the Fast Light Tool Kit (FLTK). // @@ -28,17 +28,17 @@ #include "Fl_Single_Window.H" -class Fl_Menu_Window : public Fl_Single_Window { +class FL_EXPORT Fl_Menu_Window : public Fl_Single_Window { enum {NO_OVERLAY = 128}; public: - FL_EXPORT void show(); - FL_EXPORT void erase(); - FL_EXPORT void flush(); - FL_EXPORT void hide(); + void show(); + void erase(); + void flush(); + void hide(); int overlay() {return !(flags()&NO_OVERLAY);} void set_overlay() {clear_flag(NO_OVERLAY);} void clear_overlay() {set_flag(NO_OVERLAY);} - FL_EXPORT ~Fl_Menu_Window(); + ~Fl_Menu_Window(); Fl_Menu_Window(int W, int H, const char *l = 0) : Fl_Single_Window(W,H,l) { image(0); } Fl_Menu_Window(int X, int Y, int W, int H, const char *l = 0) @@ -48,5 +48,5 @@ public: #endif // -// End of "$Id: Fl_Menu_Window.H,v 1.5.2.3.2.2 2002/01/07 18:47:27 easysw Exp $". +// End of "$Id: Fl_Menu_Window.H,v 1.5.2.3.2.3 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Multi_Label.H b/FL/Fl_Multi_Label.H index ea79f6620..58abf7b6c 100644 --- a/FL/Fl_Multi_Label.H +++ b/FL/Fl_Multi_Label.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Multi_Label.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Multi_Label.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Multi-label header file for the Fast Light Tool Kit (FLTK). // @@ -29,17 +29,17 @@ class Fl_Widget; struct Fl_Menu_Item; -struct Fl_Multi_Label { +struct FL_EXPORT Fl_Multi_Label { const char* labela; const char* labelb; uchar typea; uchar typeb; - FL_EXPORT void label(Fl_Widget*); - FL_EXPORT void label(Fl_Menu_Item*); + void label(Fl_Widget*); + void label(Fl_Menu_Item*); }; #endif // -// End of "$Id: Fl_Multi_Label.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Multi_Label.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Overlay_Window.H b/FL/Fl_Overlay_Window.H index f3a742b20..d7f0e087d 100644 --- a/FL/Fl_Overlay_Window.H +++ b/FL/Fl_Overlay_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Overlay_Window.H,v 1.5.2.3.2.3 2002/01/07 18:47:27 easysw Exp $" +// "$Id: Fl_Overlay_Window.H,v 1.5.2.3.2.4 2002/08/14 16:49:38 easysw Exp $" // // Overlay window header file for the Fast Light Tool Kit (FLTK). // @@ -28,18 +28,18 @@ #include "Fl_Double_Window.H" -class Fl_Overlay_Window : public Fl_Double_Window { +class FL_EXPORT Fl_Overlay_Window : public Fl_Double_Window { friend class _Fl_Overlay; - virtual FL_EXPORT void draw_overlay() = 0; + virtual void draw_overlay() = 0; Fl_Window *overlay_; public: - FL_EXPORT void show(); - FL_EXPORT void flush(); - FL_EXPORT void hide(); - FL_EXPORT void resize(int,int,int,int); - FL_EXPORT ~Fl_Overlay_Window(); - FL_EXPORT int can_do_overlay(); - FL_EXPORT void redraw_overlay(); + void show(); + void flush(); + void hide(); + void resize(int,int,int,int); + ~Fl_Overlay_Window(); + int can_do_overlay(); + void redraw_overlay(); Fl_Overlay_Window(int W, int H, const char *l=0) : Fl_Double_Window(W,H,l) {overlay_ = 0; force_doublebuffering_=1; image(0); } Fl_Overlay_Window(int X, int Y, int W, int H, const char *l=0) @@ -50,5 +50,5 @@ public: #endif // -// End of "$Id: Fl_Overlay_Window.H,v 1.5.2.3.2.3 2002/01/07 18:47:27 easysw Exp $". +// End of "$Id: Fl_Overlay_Window.H,v 1.5.2.3.2.4 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Pack.H b/FL/Fl_Pack.H index 9c42d8d06..96470c9b8 100644 --- a/FL/Fl_Pack.H +++ b/FL/Fl_Pack.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Pack.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Pack.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Pack header file for the Fast Light Tool Kit (FLTK). // @@ -28,15 +28,15 @@ #include <FL/Fl_Group.H> -class Fl_Pack : public Fl_Group { +class FL_EXPORT Fl_Pack : public Fl_Group { int spacing_; public: enum { // values for type(int) VERTICAL = 0, HORIZONTAL = 1 }; - FL_EXPORT void draw(); - FL_EXPORT Fl_Pack(int x,int y,int w ,int h,const char *l = 0); + void draw(); + Fl_Pack(int x,int y,int w ,int h,const char *l = 0); int spacing() const {return spacing_;} void spacing(int i) {spacing_ = i;} uchar horizontal() const {return type();} @@ -45,5 +45,5 @@ public: #endif // -// End of "$Id: Fl_Pack.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Pack.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Positioner.H b/FL/Fl_Positioner.H index 45f4b23d2..1515adeba 100644 --- a/FL/Fl_Positioner.H +++ b/FL/Fl_Positioner.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Positioner.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Positioner.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Positioner header file for the Fast Light Tool Kit (FLTK). // @@ -30,7 +30,7 @@ #include "Fl_Widget.H" #endif -class Fl_Positioner : public Fl_Widget { +class FL_EXPORT Fl_Positioner : public Fl_Widget { double xmin, ymin; double xmax, ymax; @@ -40,25 +40,25 @@ class Fl_Positioner : public Fl_Widget { protected: // these allow subclasses to put the dial in a smaller area: - FL_EXPORT void draw(int, int, int, int); - FL_EXPORT int handle(int, int, int, int, int); - FL_EXPORT void draw(); + void draw(int, int, int, int); + int handle(int, int, int, int, int); + void draw(); public: - FL_EXPORT int handle(int); - FL_EXPORT Fl_Positioner(int x,int y,int w,int h, const char *l=0); + int handle(int); + Fl_Positioner(int x,int y,int w,int h, const char *l=0); double xvalue() const {return xvalue_;} double yvalue() const {return yvalue_;} - FL_EXPORT int xvalue(double); - FL_EXPORT int yvalue(double); - FL_EXPORT int value(double,double); - FL_EXPORT void xbounds(double, double); + int xvalue(double); + int yvalue(double); + int value(double,double); + void xbounds(double, double); double xminimum() const {return xmin;} void xminimum(double a) {xbounds(a,xmax);} double xmaximum() const {return xmax;} void xmaximum(double a) {xbounds(xmin,a);} - FL_EXPORT void ybounds(double, double); + void ybounds(double, double); double yminimum() const {return ymin;} void yminimum(double a) {ybounds(a,ymax);} double ymaximum() const {return ymax;} @@ -71,5 +71,5 @@ public: #endif // -// End of "$Id: Fl_Positioner.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Positioner.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Progress.H b/FL/Fl_Progress.H index a1f95bf2c..d40843766 100644 --- a/FL/Fl_Progress.H +++ b/FL/Fl_Progress.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Progress.H,v 1.1.2.3 2002/04/18 20:37:29 easysw Exp $" +// "$Id: Fl_Progress.H,v 1.1.2.4 2002/08/14 16:49:38 easysw Exp $" // // Progress bar widget definitions. // @@ -37,7 +37,7 @@ // Progress class... // -class Fl_Progress : public Fl_Widget +class FL_EXPORT Fl_Progress : public Fl_Widget { float value_, minimum_, @@ -45,11 +45,11 @@ class Fl_Progress : public Fl_Widget protected: - FL_EXPORT virtual void draw(); + virtual void draw(); public: - FL_EXPORT Fl_Progress(int x, int y, int w, int h, const char *l = 0); + Fl_Progress(int x, int y, int w, int h, const char *l = 0); void maximum(float v) { maximum_ = v; redraw(); } float maximum() const { return (maximum_); } @@ -64,5 +64,5 @@ class Fl_Progress : public Fl_Widget #endif // !_Fl_Progress_H_ // -// End of "$Id: Fl_Progress.H,v 1.1.2.3 2002/04/18 20:37:29 easysw Exp $". +// End of "$Id: Fl_Progress.H,v 1.1.2.4 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Repeat_Button.H b/FL/Fl_Repeat_Button.H index 4bf73b85c..ffa5b474a 100644 --- a/FL/Fl_Repeat_Button.H +++ b/FL/Fl_Repeat_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Repeat_Button.H,v 1.5.2.5.2.2 2002/08/09 03:17:29 easysw Exp $" +// "$Id: Fl_Repeat_Button.H,v 1.5.2.5.2.3 2002/08/14 16:49:38 easysw Exp $" // // Repeat button header file for the Fast Light Tool Kit (FLTK). // @@ -28,10 +28,10 @@ #include "Fl.H" #include "Fl_Button.H" -class Fl_Repeat_Button : public Fl_Button { - static FL_EXPORT void repeat_callback(void *); +class FL_EXPORT Fl_Repeat_Button : public Fl_Button { + static void repeat_callback(void *); public: - FL_EXPORT int handle(int); + int handle(int); Fl_Repeat_Button(int X,int Y,int W,int H,const char *l=0) : Fl_Button(X,Y,W,H,l) {} void deactivate() { @@ -43,5 +43,5 @@ public: #endif // -// End of "$Id: Fl_Repeat_Button.H,v 1.5.2.5.2.2 2002/08/09 03:17:29 easysw Exp $". +// End of "$Id: Fl_Repeat_Button.H,v 1.5.2.5.2.3 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Return_Button.H b/FL/Fl_Return_Button.H index 5ea161e12..815457a35 100644 --- a/FL/Fl_Return_Button.H +++ b/FL/Fl_Return_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Return_Button.H,v 1.5.2.3.2.2 2002/08/09 01:09:48 easysw Exp $" +// "$Id: Fl_Return_Button.H,v 1.5.2.3.2.3 2002/08/14 16:49:38 easysw Exp $" // // Return button header file for the Fast Light Tool Kit (FLTK). // @@ -27,11 +27,11 @@ #define Fl_Return_Button_H #include "Fl_Button.H" -class Fl_Return_Button : public Fl_Button { +class FL_EXPORT Fl_Return_Button : public Fl_Button { protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT int handle(int); + int handle(int); Fl_Return_Button(int X, int Y, int W, int H,const char *l=0) : Fl_Button(X,Y,W,H,l) {} }; @@ -39,5 +39,5 @@ public: #endif // -// End of "$Id: Fl_Return_Button.H,v 1.5.2.3.2.2 2002/08/09 01:09:48 easysw Exp $". +// End of "$Id: Fl_Return_Button.H,v 1.5.2.3.2.3 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Roller.H b/FL/Fl_Roller.H index c07de8722..e6cb1459b 100644 --- a/FL/Fl_Roller.H +++ b/FL/Fl_Roller.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Roller.H,v 1.5.2.4.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Roller.H,v 1.5.2.4.2.2 2002/08/14 16:49:38 easysw Exp $" // // Roller header file for the Fast Light Tool Kit (FLTK). // @@ -30,16 +30,16 @@ #include "Fl_Valuator.H" #endif -class Fl_Roller : public Fl_Valuator { +class FL_EXPORT Fl_Roller : public Fl_Valuator { protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT int handle(int); - FL_EXPORT Fl_Roller(int X,int Y,int W,int H,const char* L=0); + int handle(int); + Fl_Roller(int X,int Y,int W,int H,const char* L=0); }; #endif // -// End of "$Id: Fl_Roller.H,v 1.5.2.4.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Roller.H,v 1.5.2.4.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Round_Button.H b/FL/Fl_Round_Button.H index f203e2dbe..7d730eac7 100644 --- a/FL/Fl_Round_Button.H +++ b/FL/Fl_Round_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Round_Button.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Round_Button.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Round button header file for the Fast Light Tool Kit (FLTK). // @@ -28,13 +28,13 @@ #include "Fl_Light_Button.H" -class Fl_Round_Button : public Fl_Light_Button { +class FL_EXPORT Fl_Round_Button : public Fl_Light_Button { public: - FL_EXPORT Fl_Round_Button(int x,int y,int w,int h,const char *l = 0); + Fl_Round_Button(int x,int y,int w,int h,const char *l = 0); }; #endif // -// End of "$Id: Fl_Round_Button.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Round_Button.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Scroll.H b/FL/Fl_Scroll.H index e02e60898..6d794ff42 100644 --- a/FL/Fl_Scroll.H +++ b/FL/Fl_Scroll.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Scroll.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Scroll.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Scroll header file for the Fast Light Tool Kit (FLTK). // @@ -29,30 +29,30 @@ #include "Fl_Group.H" #include "Fl_Scrollbar.H" -class Fl_Scroll : public Fl_Group { +class FL_EXPORT Fl_Scroll : public Fl_Group { int xposition_, yposition_; int width_, height_; int oldx, oldy; - static FL_EXPORT void hscrollbar_cb(Fl_Widget*, void*); - static FL_EXPORT void scrollbar_cb(Fl_Widget*, void*); - FL_EXPORT void fix_scrollbar_order(); - static FL_EXPORT void draw_clip(void*,int,int,int,int); - FL_EXPORT void bbox(int&,int&,int&,int&); + static void hscrollbar_cb(Fl_Widget*, void*); + static void scrollbar_cb(Fl_Widget*, void*); + void fix_scrollbar_order(); + static void draw_clip(void*,int,int,int,int); + void bbox(int&,int&,int&,int&); protected: - FL_EXPORT void draw(); + void draw(); public: Fl_Scrollbar scrollbar; Fl_Scrollbar hscrollbar; - FL_EXPORT void resize(int,int,int,int); - FL_EXPORT int handle(int); + void resize(int,int,int,int); + int handle(int); - FL_EXPORT Fl_Scroll(int X,int Y,int W,int H,const char*l=0); + Fl_Scroll(int X,int Y,int W,int H,const char*l=0); enum { // values for type() HORIZONTAL = 1, @@ -66,11 +66,11 @@ public: int xposition() const {return xposition_;} int yposition() const {return yposition_;} - FL_EXPORT void position(int, int); + void position(int, int); }; #endif // -// End of "$Id: Fl_Scroll.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Scroll.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Single_Window.H b/FL/Fl_Single_Window.H index 02cfeb6aa..bb4de8292 100644 --- a/FL/Fl_Single_Window.H +++ b/FL/Fl_Single_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Single_Window.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Single_Window.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Single-buffered window header file for the Fast Light Tool Kit (FLTK). // @@ -28,11 +28,11 @@ #include "Fl_Window.H" -class Fl_Single_Window : public Fl_Window { +class FL_EXPORT Fl_Single_Window : public Fl_Window { public: - FL_EXPORT void show(); + void show(); void show(int a, char **b) {Fl_Window::show(a,b);} - FL_EXPORT void flush(); + void flush(); Fl_Single_Window(int W, int H, const char *l=0) : Fl_Window(W,H,l) {} Fl_Single_Window(int X, int Y, int W, int H, const char *l=0) @@ -43,5 +43,5 @@ public: #endif // -// End of "$Id: Fl_Single_Window.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Single_Window.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H index 44fd88305..db1a16aaf 100644 --- a/FL/Fl_Sys_Menu_Bar.H +++ b/FL/Fl_Sys_Menu_Bar.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Sys_Menu_Bar.H,v 1.1.2.2 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Sys_Menu_Bar.H,v 1.1.2.3 2002/08/14 16:49:38 easysw Exp $" // // MacOS system menu bar header file for the Fast Light Tool Kit (FLTK). // @@ -28,19 +28,19 @@ #include "Fl_Menu_Bar.H" -class Fl_Sys_Menu_Bar : public Fl_Menu_Bar { +class FL_EXPORT Fl_Sys_Menu_Bar : public Fl_Menu_Bar { protected: - FL_EXPORT void draw(); + void draw(); public: -//FL_EXPORT int handle(int); +//int handle(int); Fl_Sys_Menu_Bar(int x,int y,int w,int h,const char *l=0) : Fl_Menu_Bar(x,y,w,h,l) {} - FL_EXPORT void menu(const Fl_Menu_Item *m); -// FL_EXPORT Fl_Menu_Item* picked(const Fl_Menu_Item* v); + void menu(const Fl_Menu_Item *m); +// Fl_Menu_Item* picked(const Fl_Menu_Item* v); }; #endif // -// End of "$Id: Fl_Sys_Menu_Bar.H,v 1.1.2.2 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Sys_Menu_Bar.H,v 1.1.2.3 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Tabs.H b/FL/Fl_Tabs.H index 9e84d5195..6380b0875 100644 --- a/FL/Fl_Tabs.H +++ b/FL/Fl_Tabs.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tabs.H,v 1.5.2.4.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Tabs.H,v 1.5.2.4.2.2 2002/08/14 16:49:38 easysw Exp $" // // Tab header file for the Fast Light Tool Kit (FLTK). // @@ -28,27 +28,27 @@ #include "Fl_Group.H" -class Fl_Tabs : public Fl_Group { +class FL_EXPORT Fl_Tabs : public Fl_Group { Fl_Widget *value_; Fl_Widget *push_; - FL_EXPORT int tab_positions(int*, int*); - FL_EXPORT int tab_height(); - FL_EXPORT void draw_tab(int x1, int x2, int W, int H, Fl_Widget* o, int sel=0); + int tab_positions(int*, int*); + int tab_height(); + void draw_tab(int x1, int x2, int W, int H, Fl_Widget* o, int sel=0); protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT int handle(int); - FL_EXPORT Fl_Widget *value(); - FL_EXPORT int value(Fl_Widget *); + int handle(int); + Fl_Widget *value(); + int value(Fl_Widget *); Fl_Widget *push() const {return push_;} - FL_EXPORT int push(Fl_Widget *); - FL_EXPORT Fl_Tabs(int,int,int,int,const char * = 0); - FL_EXPORT Fl_Widget *which(int event_x, int event_y); + int push(Fl_Widget *); + Fl_Tabs(int,int,int,int,const char * = 0); + Fl_Widget *which(int event_x, int event_y); }; #endif // -// End of "$Id: Fl_Tabs.H,v 1.5.2.4.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Tabs.H,v 1.5.2.4.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H index 1b64c43bc..45a068c20 100644 --- a/FL/Fl_Text_Display.H +++ b/FL/Fl_Text_Display.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Display.H,v 1.4.2.10 2002/08/09 03:17:29 easysw Exp $" +// "$Id: Fl_Text_Display.H,v 1.4.2.11 2002/08/14 16:49:38 easysw Exp $" // // Header file for Fl_Text_Display class. // @@ -34,7 +34,7 @@ #include "Fl_Scrollbar.H" #include "Fl_Text_Buffer.H" -class Fl_Text_Display: public Fl_Group { +class FL_EXPORT Fl_Text_Display: public Fl_Group { public: enum { NORMAL_CURSOR, CARET_CURSOR, DIM_CURSOR, @@ -62,37 +62,37 @@ class Fl_Text_Display: public Fl_Group { ATTR_HIDDEN = 2 }; - struct FL_EXPORT Style_Table_Entry { + struct Style_Table_Entry { Fl_Color color; Fl_Font font; int size; unsigned attr; }; - FL_EXPORT Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0); - FL_EXPORT ~Fl_Text_Display(); + Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0); + ~Fl_Text_Display(); - FL_EXPORT virtual int handle(int e); - FL_EXPORT void buffer(Fl_Text_Buffer* buf); + virtual int handle(int e); + void buffer(Fl_Text_Buffer* buf); void buffer(Fl_Text_Buffer& buf) { buffer(&buf); } Fl_Text_Buffer* buffer() { return mBuffer; } - FL_EXPORT void redisplay_range(int start, int end); - FL_EXPORT void scroll(int topLineNum, int horizOffset); - FL_EXPORT void insert(const char* text); - FL_EXPORT void overstrike(const char* text); - FL_EXPORT void insert_position(int newPos); + void redisplay_range(int start, int end); + void scroll(int topLineNum, int horizOffset); + void insert(const char* text); + void overstrike(const char* text); + void insert_position(int newPos); int insert_position() { return mCursorPos; } - FL_EXPORT int in_selection(int x, int y); - FL_EXPORT void show_insert_position(); - FL_EXPORT int move_right(); - FL_EXPORT int move_left(); - FL_EXPORT int move_up(); - FL_EXPORT int move_down(); - FL_EXPORT void next_word(void); - FL_EXPORT void previous_word(void); - FL_EXPORT void show_cursor(int b = 1); + int in_selection(int x, int y); + void show_insert_position(); + int move_right(); + int move_left(); + int move_up(); + int move_down(); + void next_word(void); + void previous_word(void); + void show_cursor(int b = 1); void hide_cursor() { show_cursor(0); } - FL_EXPORT void cursor_style(int style); + void cursor_style(int style); int scrollbar_width() { return scrollbar_width_; } Fl_Align scrollbar_align() { return scrollbar_align_; } void scrollbar_width(int W) { scrollbar_width_ = W; } @@ -101,13 +101,13 @@ class Fl_Text_Display: public Fl_Group { int word_end(int pos) { return buffer()->word_end(pos); } - FL_EXPORT void highlight_data(Fl_Text_Buffer *styleBuffer, + void highlight_data(Fl_Text_Buffer *styleBuffer, const Style_Table_Entry *styleTable, int nStyles, char unfinishedStyle, Unfinished_Style_Cb unfinishedHighlightCB, void *cbArg); - FL_EXPORT int position_style(int lineStartPos, int lineLen, int lineIndex, + int position_style(int lineStartPos, int lineLen, int lineIndex, int dispIndex); Fl_Font textfont() const {return (Fl_Font)textfont_;} @@ -117,7 +117,7 @@ class Fl_Text_Display: public Fl_Group { Fl_Color textcolor() const {return (Fl_Color)textcolor_;} void textcolor(unsigned n) {textcolor_ = n;} - FL_EXPORT virtual void resize(int X, int Y, int W, int H); + virtual void resize(int X, int Y, int W, int H); protected: // Most (all?) of this stuff should only be called from resize() or @@ -125,54 +125,54 @@ class Fl_Text_Display: public Fl_Group { // Anything with "vline" indicates thats it deals with currently // visible lines. - FL_EXPORT virtual void draw(); - FL_EXPORT void draw_text(int X, int Y, int W, int H); - FL_EXPORT void draw_range(int start, int end); - FL_EXPORT void draw_cursor(int, int); + virtual void draw(); + void draw_text(int X, int Y, int W, int H); + void draw_range(int start, int end); + void draw_cursor(int, int); - FL_EXPORT void draw_string(int style, int x, int y, int toX, const char *string, + void draw_string(int style, int x, int y, int toX, const char *string, int nChars); - FL_EXPORT void draw_vline(int visLineNum, int leftClip, int rightClip, + void draw_vline(int visLineNum, int leftClip, int rightClip, int leftCharIndex, int rightCharIndex); - FL_EXPORT void clear_rect(int style, int x, int y, int width, int height); - FL_EXPORT void display_insert(); + void clear_rect(int style, int x, int y, int width, int height); + void display_insert(); - FL_EXPORT void offset_line_starts(int newTopLineNum); + void offset_line_starts(int newTopLineNum); - FL_EXPORT void calc_line_starts(int startLine, int endLine); + void calc_line_starts(int startLine, int endLine); - FL_EXPORT void update_line_starts(int pos, int charsInserted, int charsDeleted, + void update_line_starts(int pos, int charsInserted, int charsDeleted, int linesInserted, int linesDeleted, int *scrolled); - FL_EXPORT void calc_last_char(); + void calc_last_char(); - FL_EXPORT int position_to_line( int pos, int* lineNum ); - FL_EXPORT int string_width(const char* string, int length, int style); + int position_to_line( int pos, int* lineNum ); + int string_width(const char* string, int length, int style); - FL_EXPORT static void buffer_modified_cb(int pos, int nInserted, int nDeleted, + static void buffer_modified_cb(int pos, int nInserted, int nDeleted, int nRestyled, const char* deletedText, void* cbArg); - FL_EXPORT static void h_scrollbar_cb(Fl_Scrollbar* w, Fl_Text_Display* d); - FL_EXPORT static void v_scrollbar_cb( Fl_Scrollbar* w, Fl_Text_Display* d); - FL_EXPORT void update_v_scrollbar(); - FL_EXPORT void update_h_scrollbar(); - FL_EXPORT int measure_vline(int visLineNum); - FL_EXPORT int longest_vline(); - FL_EXPORT int empty_vlines(); - FL_EXPORT int vline_length(int visLineNum); - FL_EXPORT int xy_to_position(int x, int y, int PosType = CHARACTER_POS); - - FL_EXPORT void xy_to_rowcol(int x, int y, int* row, int* column, + static void h_scrollbar_cb(Fl_Scrollbar* w, Fl_Text_Display* d); + static void v_scrollbar_cb( Fl_Scrollbar* w, Fl_Text_Display* d); + void update_v_scrollbar(); + void update_h_scrollbar(); + int measure_vline(int visLineNum); + int longest_vline(); + int empty_vlines(); + int vline_length(int visLineNum); + int xy_to_position(int x, int y, int PosType = CHARACTER_POS); + + void xy_to_rowcol(int x, int y, int* row, int* column, int PosType = CHARACTER_POS); - FL_EXPORT int position_to_xy(int pos, int* x, int* y); - FL_EXPORT int position_to_linecol(int pos, int* lineNum, int* column); - FL_EXPORT void scroll_(int topLineNum, int horizOffset); + int position_to_xy(int pos, int* x, int* y); + int position_to_linecol(int pos, int* lineNum, int* column); + void scroll_(int topLineNum, int horizOffset); - FL_EXPORT void extend_range_for_styles(int* start, int* end); + void extend_range_for_styles(int* start, int* end); int damage_range1_start, damage_range1_end; @@ -243,5 +243,5 @@ class Fl_Text_Display: public Fl_Group { #endif // -// End of "$Id: Fl_Text_Display.H,v 1.4.2.10 2002/08/09 03:17:29 easysw Exp $". +// End of "$Id: Fl_Text_Display.H,v 1.4.2.11 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Text_Editor.H b/FL/Fl_Text_Editor.H index 3efb8b207..27b168ddd 100644 --- a/FL/Fl_Text_Editor.H +++ b/FL/Fl_Text_Editor.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Editor.H,v 1.1.2.3 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Text_Editor.H,v 1.1.2.4 2002/08/14 16:49:38 easysw Exp $" // // Header file for Fl_Text_Editor class. // @@ -34,73 +34,73 @@ // key will match in any state #define FL_TEXT_EDITOR_ANY_STATE (-1L) -class Fl_Text_Editor : public Fl_Text_Display { +class FL_EXPORT Fl_Text_Editor : public Fl_Text_Display { public: typedef int (*Key_Func)(int key, Fl_Text_Editor* editor); - struct FL_EXPORT Key_Binding { + struct Key_Binding { int key; int state; Key_Func function; Key_Binding* next; }; - FL_EXPORT Fl_Text_Editor(int X, int Y, int W, int H, const char* l = 0); + Fl_Text_Editor(int X, int Y, int W, int H, const char* l = 0); ~Fl_Text_Editor() { remove_all_key_bindings(); } - FL_EXPORT virtual int handle(int e); + virtual int handle(int e); void insert_mode(int b) { insert_mode_ = b; } int insert_mode() { return insert_mode_; } - FL_EXPORT void add_key_binding(int key, int state, Key_Func f, Key_Binding** list); + void add_key_binding(int key, int state, Key_Func f, Key_Binding** list); void add_key_binding(int key, int state, Key_Func f) { add_key_binding(key, state, f, &key_bindings); } - FL_EXPORT void remove_key_binding(int key, int state, Key_Binding** list); + void remove_key_binding(int key, int state, Key_Binding** list); void remove_key_binding(int key, int state) { remove_key_binding(key, state, &key_bindings); } - FL_EXPORT void remove_all_key_bindings(Key_Binding** list); + void remove_all_key_bindings(Key_Binding** list); void remove_all_key_bindings() { remove_all_key_bindings(&key_bindings); } - FL_EXPORT void add_default_key_bindings(Key_Binding** list); - FL_EXPORT Key_Func bound_key_function(int key, int state, Key_Binding* list); + void add_default_key_bindings(Key_Binding** list); + Key_Func bound_key_function(int key, int state, Key_Binding* list); Key_Func bound_key_function(int key, int state) { return bound_key_function(key, state, key_bindings); } void default_key_function(Key_Func f) { default_key_function_ = f; } // functions for the built in default bindings - FL_EXPORT static int kf_default(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_ignore(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_backspace(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_enter(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_move(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_shift_move(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_ctrl_move(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_c_s_move(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_home(int, Fl_Text_Editor* e); - FL_EXPORT static int kf_end(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_left(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_up(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_right(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_down(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_page_up(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_page_down(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_insert(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_delete(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_copy(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_cut(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_paste(int c, Fl_Text_Editor* e); - FL_EXPORT static int kf_select_all(int c, Fl_Text_Editor* e); + static int kf_default(int c, Fl_Text_Editor* e); + static int kf_ignore(int c, Fl_Text_Editor* e); + static int kf_backspace(int c, Fl_Text_Editor* e); + static int kf_enter(int c, Fl_Text_Editor* e); + static int kf_move(int c, Fl_Text_Editor* e); + static int kf_shift_move(int c, Fl_Text_Editor* e); + static int kf_ctrl_move(int c, Fl_Text_Editor* e); + static int kf_c_s_move(int c, Fl_Text_Editor* e); + static int kf_home(int, Fl_Text_Editor* e); + static int kf_end(int c, Fl_Text_Editor* e); + static int kf_left(int c, Fl_Text_Editor* e); + static int kf_up(int c, Fl_Text_Editor* e); + static int kf_right(int c, Fl_Text_Editor* e); + static int kf_down(int c, Fl_Text_Editor* e); + static int kf_page_up(int c, Fl_Text_Editor* e); + static int kf_page_down(int c, Fl_Text_Editor* e); + static int kf_insert(int c, Fl_Text_Editor* e); + static int kf_delete(int c, Fl_Text_Editor* e); + static int kf_copy(int c, Fl_Text_Editor* e); + static int kf_cut(int c, Fl_Text_Editor* e); + static int kf_paste(int c, Fl_Text_Editor* e); + static int kf_select_all(int c, Fl_Text_Editor* e); protected: - FL_EXPORT int handle_key(); + int handle_key(); int insert_mode_; Key_Binding* key_bindings; - FL_EXPORT static Key_Binding* global_key_bindings; + static Key_Binding* global_key_bindings; Key_Func default_key_function_; }; #endif // -// End of "$Id: Fl_Text_Editor.H,v 1.1.2.3 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Text_Editor.H,v 1.1.2.4 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Tile.H b/FL/Fl_Tile.H index 125293867..f94fdd158 100644 --- a/FL/Fl_Tile.H +++ b/FL/Fl_Tile.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tile.H,v 1.6.2.3.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Tile.H,v 1.6.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Tile header file for the Fast Light Tool Kit (FLTK). // @@ -28,16 +28,16 @@ #include "Fl_Group.H" -class Fl_Tile : public Fl_Group { +class FL_EXPORT Fl_Tile : public Fl_Group { public: - FL_EXPORT int handle(int); + int handle(int); Fl_Tile(int X,int Y,int W,int H,const char*l=0) : Fl_Group(X,Y,W,H,l) {} - FL_EXPORT void resize(int, int, int, int); - FL_EXPORT void position(int, int, int, int); + void resize(int, int, int, int); + void position(int, int, int, int); }; #endif // -// End of "$Id: Fl_Tile.H,v 1.6.2.3.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Tile.H,v 1.6.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Timer.H b/FL/Fl_Timer.H index bf8f6f939..71692171f 100644 --- a/FL/Fl_Timer.H +++ b/FL/Fl_Timer.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Timer.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Timer.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $" // // Timer header file for the Fast Light Tool Kit (FLTK). // @@ -35,29 +35,29 @@ #define FL_VALUE_TIMER 1 #define FL_HIDDEN_TIMER 2 -class Fl_Timer : public Fl_Widget { - static FL_EXPORT void stepcb(void *); - FL_EXPORT void step(); +class FL_EXPORT Fl_Timer : public Fl_Widget { + static void stepcb(void *); + void step(); char on, direction_; double delay, total; long lastsec,lastusec; protected: - FL_EXPORT void draw(); + void draw(); public: - FL_EXPORT int handle(int); - FL_EXPORT Fl_Timer(uchar t,int x,int y,int w,int h, const char *l); - FL_EXPORT ~Fl_Timer(); - FL_EXPORT void value(double); + int handle(int); + Fl_Timer(uchar t,int x,int y,int w,int h, const char *l); + ~Fl_Timer(); + void value(double); double value() const {return delay>0.0?delay:0.0;} char direction() const {return direction_;} void direction(char d) {direction_ = d;} char suspended() const {return !on;} - FL_EXPORT void suspended(char d); + void suspended(char d); }; #endif // -// End of "$Id: Fl_Timer.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Timer.H,v 1.5.2.3.2.2 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Value_Input.H b/FL/Fl_Value_Input.H index 7fa2d41ac..d95a1e5be 100644 --- a/FL/Fl_Value_Input.H +++ b/FL/Fl_Value_Input.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Value_Input.H,v 1.5.2.3.2.3 2002/08/09 01:09:48 easysw Exp $" +// "$Id: Fl_Value_Input.H,v 1.5.2.3.2.4 2002/08/14 16:49:38 easysw Exp $" // // Value input header file for the Fast Light Tool Kit (FLTK). // @@ -29,18 +29,18 @@ #include "Fl_Valuator.H" #include "Fl_Input.H" -class Fl_Value_Input : public Fl_Valuator { +class FL_EXPORT Fl_Value_Input : public Fl_Valuator { public: Fl_Input input; private: char soft_; - static FL_EXPORT void input_cb(Fl_Widget*,void*); - virtual FL_EXPORT void value_damage(); // cause damage() due to value() changing + static void input_cb(Fl_Widget*,void*); + virtual void value_damage(); // cause damage() due to value() changing public: - FL_EXPORT int handle(int); - FL_EXPORT void draw(); - FL_EXPORT void resize(int,int,int,int); - FL_EXPORT Fl_Value_Input(int x,int y,int w,int h,const char *l=0); + int handle(int); + void draw(); + void resize(int,int,int,int); + Fl_Value_Input(int x,int y,int w,int h,const char *l=0); void soft(char s) {soft_ = s;} char soft() const {return soft_;} @@ -59,5 +59,5 @@ public: #endif // -// End of "$Id: Fl_Value_Input.H,v 1.5.2.3.2.3 2002/08/09 01:09:48 easysw Exp $". +// End of "$Id: Fl_Value_Input.H,v 1.5.2.3.2.4 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Value_Output.H b/FL/Fl_Value_Output.H index a8ed97958..9199a5e74 100644 --- a/FL/Fl_Value_Output.H +++ b/FL/Fl_Value_Output.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Value_Output.H,v 1.5.2.3.2.3 2002/08/09 03:17:29 easysw Exp $" +// "$Id: Fl_Value_Output.H,v 1.5.2.3.2.4 2002/08/14 16:49:38 easysw Exp $" // // Value output header file for the Fast Light Tool Kit (FLTK). // @@ -30,13 +30,13 @@ #include "Fl_Valuator.H" #endif -class Fl_Value_Output : public Fl_Valuator { +class FL_EXPORT Fl_Value_Output : public Fl_Valuator { uchar textfont_, textsize_, soft_; unsigned textcolor_; public: - FL_EXPORT int handle(int); - FL_EXPORT void draw(); - FL_EXPORT Fl_Value_Output(int x,int y,int w,int h,const char *l=0); + int handle(int); + void draw(); + Fl_Value_Output(int x,int y,int w,int h,const char *l=0); void soft(uchar s) {soft_ = s;} uchar soft() const {return soft_;} @@ -52,5 +52,5 @@ public: #endif // -// End of "$Id: Fl_Value_Output.H,v 1.5.2.3.2.3 2002/08/09 03:17:29 easysw Exp $". +// End of "$Id: Fl_Value_Output.H,v 1.5.2.3.2.4 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/Fl_Value_Slider.H b/FL/Fl_Value_Slider.H index cfaa3c79b..cb87726a8 100644 --- a/FL/Fl_Value_Slider.H +++ b/FL/Fl_Value_Slider.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Value_Slider.H,v 1.5.2.3.2.2 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Value_Slider.H,v 1.5.2.3.2.3 2002/08/14 16:49:38 easysw Exp $" // // Value slider header file for the Fast Light Tool Kit (FLTK). // @@ -28,13 +28,13 @@ #include "Fl_Slider.H" -class Fl_Value_Slider : public Fl_Slider { +class FL_EXPORT Fl_Value_Slider : public Fl_Slider { uchar textfont_, textsize_; unsigned textcolor_; public: - FL_EXPORT void draw(); - FL_EXPORT int handle(int); - FL_EXPORT Fl_Value_Slider(int x,int y,int w,int h, const char *l = 0); + void draw(); + int handle(int); + Fl_Value_Slider(int x,int y,int w,int h, const char *l = 0); Fl_Font textfont() const {return (Fl_Font)textfont_;} void textfont(uchar s) {textfont_ = s;} uchar textsize() const {return textsize_;} @@ -46,5 +46,5 @@ public: #endif // -// End of "$Id: Fl_Value_Slider.H,v 1.5.2.3.2.2 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Value_Slider.H,v 1.5.2.3.2.3 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/forms.H b/FL/forms.H index 0a3171cec..ccd744567 100644 --- a/FL/forms.H +++ b/FL/forms.H @@ -1,5 +1,5 @@ // -// "$Id: forms.H,v 1.7.2.7.2.5 2002/08/09 03:17:29 easysw Exp $" +// "$Id: forms.H,v 1.7.2.7.2.6 2002/08/14 16:49:38 easysw Exp $" // // Forms emulation header file for the Fast Light Tool Kit (FLTK). // @@ -807,10 +807,10 @@ inline void fl_set_slider_precision(Fl_Widget* o, int i) { // filter function! // The forms text object was the same as an Fl_Box except it inverted the -// meaning of FL_ALIGN_INSIDE. Implementation in forms.C -class Fl_FormsText : public Fl_Widget { +// meaning of FL_ALIGN_INSIDE. Implementation in forms.cxx +class FL_EXPORT Fl_FormsText : public Fl_Widget { protected: - FL_EXPORT void draw(); + void draw(); public: Fl_FormsText(Fl_Boxtype b, int X, int Y, int W, int H, const char* l=0) : Fl_Widget(X,Y,W,H,l) {box(b); align(FL_ALIGN_LEFT);} @@ -838,5 +838,5 @@ inline void fl_draw() {Fl::flush();} #endif /* define __FORMS_H__ */ // -// End of "$Id: forms.H,v 1.7.2.7.2.5 2002/08/09 03:17:29 easysw Exp $". +// End of "$Id: forms.H,v 1.7.2.7.2.6 2002/08/14 16:49:38 easysw Exp $". // @@ -1,5 +1,5 @@ // -// "$Id: glut.H,v 1.6.2.10.2.2 2002/03/25 16:41:01 easysw Exp $" +// "$Id: glut.H,v 1.6.2.10.2.3 2002/08/14 16:49:38 easysw Exp $" // // GLUT emulation header file for the Fast Light Tool Kit (FLTK). // @@ -54,17 +54,17 @@ #include "Fl.H" #include "Fl_Gl_Window.H" -class Fl_Glut_Window : public Fl_Gl_Window { - FL_EXPORT void _init(); +class FL_EXPORT Fl_Glut_Window : public Fl_Gl_Window { + void _init(); int mouse_down; protected: - FL_EXPORT void draw(); - FL_EXPORT void draw_overlay(); - FL_EXPORT int handle(int); + void draw(); + void draw_overlay(); + int handle(int); public: // so the inline functions work int number; int menu[3]; - FL_EXPORT void make_current(); + void make_current(); void (*display)(); void (*overlaydisplay)(); void (*reshape)(int w, int h); @@ -75,9 +75,9 @@ public: // so the inline functions work void (*entry)(int); void (*visibility)(int); void (*special)(int, int x, int y); - FL_EXPORT Fl_Glut_Window(int w, int h, const char *); - FL_EXPORT Fl_Glut_Window(int x, int y, int w, int h, const char *); - FL_EXPORT ~Fl_Glut_Window(); + Fl_Glut_Window(int w, int h, const char *); + Fl_Glut_Window(int x, int y, int w, int h, const char *); + ~Fl_Glut_Window(); }; extern FL_EXPORT Fl_Glut_Window *glut_window; // the current window @@ -470,5 +470,5 @@ extern void APIENTRY glutSolidIcosahedron(); #endif /* __glut_h__ */ // -// End of "$Id: glut.H,v 1.6.2.10.2.2 2002/03/25 16:41:01 easysw Exp $". +// End of "$Id: glut.H,v 1.6.2.10.2.3 2002/08/14 16:49:38 easysw Exp $". // diff --git a/FL/win32.H b/FL/win32.H index fad9fbdac..c1b365535 100644 --- a/FL/win32.H +++ b/FL/win32.H @@ -1,5 +1,5 @@ // -// "$Id: win32.H,v 1.15.2.3.2.8 2002/07/01 20:14:08 easysw Exp $" +// "$Id: win32.H,v 1.15.2.3.2.9 2002/08/14 16:49:38 easysw Exp $" // // WIN32 header file for the Fast Light Tool Kit (FLTK). // @@ -66,7 +66,7 @@ inline void XClipBox(Fl_Region r,XRectangle* rect) { #include "Fl_Window.H" // this object contains all win32-specific stuff about a window: // Warning: this object is highly subject to change! -class Fl_X { +class FL_EXPORT Fl_X { public: Window xid; HBITMAP other_xid; // for double-buffered windows @@ -76,15 +76,15 @@ public: int wait_for_expose; HDC private_dc; // used for OpenGL HCURSOR cursor; - static FL_EXPORT Fl_X* first; - static FL_EXPORT Fl_X* i(const Fl_Window* w) {return w->i;} - static FL_EXPORT int fake_X_wm(const Fl_Window* w,int &X, int &Y, + static Fl_X* first; + static Fl_X* i(const Fl_Window* w) {return w->i;} + static int fake_X_wm(const Fl_Window* w,int &X, int &Y, int &bt,int &bx,int &by); - FL_EXPORT void setwindow(Fl_Window* wi) {w=wi; wi->i=this;} - FL_EXPORT void flush() {w->flush();} - FL_EXPORT void set_minmax(LPMINMAXINFO minmax); - FL_EXPORT void mapraise(); - static FL_EXPORT Fl_X* make(Fl_Window*); + void setwindow(Fl_Window* wi) {w=wi; wi->i=this;} + void flush() {w->flush();} + void set_minmax(LPMINMAXINFO minmax); + void mapraise(); + static Fl_X* make(Fl_Window*); }; extern FL_EXPORT HCURSOR fl_default_cursor; extern FL_EXPORT UINT fl_wake_msg; @@ -135,5 +135,5 @@ extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm); extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b); // -// End of "$Id: win32.H,v 1.15.2.3.2.8 2002/07/01 20:14:08 easysw Exp $". +// End of "$Id: win32.H,v 1.15.2.3.2.9 2002/08/14 16:49:38 easysw Exp $". // @@ -1,5 +1,5 @@ // -// "$Id: x.H,v 1.10.2.8.2.10 2002/08/09 01:09:48 easysw Exp $" +// "$Id: x.H,v 1.10.2.8.2.11 2002/08/14 16:49:38 easysw Exp $" // // X11 header file for the Fast Light Tool Kit (FLTK). // @@ -104,7 +104,7 @@ extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm); // this object contains all X-specific stuff about a window: // Warning: this object is highly subject to change! It's definition // is only here so that fl_xid can be declared inline: -class Fl_X { +class FL_EXPORT Fl_X { public: Window xid; Window other_xid; @@ -113,16 +113,16 @@ public: Fl_X *next; char wait_for_expose; char backbuffer_bad; // used for XDBE - static FL_EXPORT Fl_X* first; - static FL_EXPORT Fl_X* i(const Fl_Window* wi) {return wi->i;} - FL_EXPORT void setwindow(Fl_Window* wi) {w=wi; wi->i=this;} - FL_EXPORT void sendxjunk(); - static FL_EXPORT void make_xid(Fl_Window*,XVisualInfo* =fl_visual, Colormap=fl_colormap); - static FL_EXPORT Fl_X* set_xid(Fl_Window*, Window); + static Fl_X* first; + static Fl_X* i(const Fl_Window* wi) {return wi->i;} + void setwindow(Fl_Window* wi) {w=wi; wi->i=this;} + void sendxjunk(); + static void make_xid(Fl_Window*,XVisualInfo* =fl_visual, Colormap=fl_colormap); + static Fl_X* set_xid(Fl_Window*, Window); // kludges to get around protection: - FL_EXPORT void flush() {w->flush();} - static FL_EXPORT void x(Fl_Window* wi, int X) {wi->x(X);} - static FL_EXPORT void y(Fl_Window* wi, int Y) {wi->y(Y);} + void flush() {w->flush();} + static void x(Fl_Window* wi, int X) {wi->x(X);} + static void y(Fl_Window* wi, int Y) {wi->y(Y);} }; // convert xid <-> Fl_Window: @@ -138,5 +138,5 @@ extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b) #endif // -// End of "$Id: x.H,v 1.10.2.8.2.10 2002/08/09 01:09:48 easysw Exp $". +// End of "$Id: x.H,v 1.10.2.8.2.11 2002/08/14 16:49:38 easysw Exp $". // |