diff options
Diffstat (limited to 'FL')
63 files changed, 1037 insertions, 997 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index d820355b0..4cb85c9fd 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -1,5 +1,5 @@ // -// "$Id: Enumerations.H,v 1.11 1999/01/25 20:43:03 mike Exp $" +// "$Id: Enumerations.H,v 1.12 1999/02/16 21:59:33 mike Exp $" // // Enumerations for the Fast Light Tool Kit (FLTK). // @@ -27,6 +27,23 @@ #define Fl_Enumerations_H // +// The following is only used when building DLLs under WIN32 or OS/2... +// + +#if defined(WIN32) || defined(__EMX__) +# ifdef FL_DLL +# define FL_EXPORT __declspec(dllexport) +# define FL_IMPORT __declspec(dllimport) +# else +# define FL_EXPORT __declspec(dllimport) +# define FL_IMPORT __declspec(dllexport) +# endif /* FL_DLL */ +#else +# define FL_EXPORT +# define FL_IMPORT +#endif /* WIN32 || __EMX__ */ + +// // The FLTK version number; this is changed slightly from the beta versions // because the old "const double" definition would not allow for conditional // compilation... @@ -148,23 +165,23 @@ enum Fl_Boxtype { // boxtypes (if you change these you must fix fl_boxtype.C): _FL_OVAL_FRAME, _FL_OFLAT_BOX, FL_FREE_BOXTYPE }; -extern Fl_Boxtype define_FL_ROUND_UP_BOX(); +extern FL_EXPORT Fl_Boxtype define_FL_ROUND_UP_BOX(); #define FL_ROUND_UP_BOX define_FL_ROUND_UP_BOX() #define FL_ROUND_DOWN_BOX (Fl_Boxtype)(define_FL_ROUND_UP_BOX()+1) -extern Fl_Boxtype define_FL_SHADOW_BOX(); +extern FL_EXPORT Fl_Boxtype define_FL_SHADOW_BOX(); #define FL_SHADOW_BOX define_FL_SHADOW_BOX() #define FL_SHADOW_FRAME (Fl_Boxtype)(define_FL_SHADOW_BOX()+2) -extern Fl_Boxtype define_FL_ROUNDED_BOX(); +extern FL_EXPORT Fl_Boxtype define_FL_ROUNDED_BOX(); #define FL_ROUNDED_BOX define_FL_ROUNDED_BOX() #define FL_ROUNDED_FRAME (Fl_Boxtype)(define_FL_ROUNDED_BOX()+2) -extern Fl_Boxtype define_FL_RFLAT_BOX(); +extern FL_EXPORT Fl_Boxtype define_FL_RFLAT_BOX(); #define FL_RFLAT_BOX define_FL_RFLAT_BOX() -extern Fl_Boxtype define_FL_RSHADOW_BOX(); +extern FL_EXPORT Fl_Boxtype define_FL_RSHADOW_BOX(); #define FL_RSHADOW_BOX define_FL_RSHADOW_BOX() -extern Fl_Boxtype define_FL_DIAMOND_BOX(); +extern FL_EXPORT Fl_Boxtype define_FL_DIAMOND_BOX(); #define FL_DIAMOND_UP_BOX define_FL_DIAMOND_BOX() #define FL_DIAMOND_DOWN_BOX (Fl_Boxtype)(define_FL_DIAMOND_BOX()+1) -extern Fl_Boxtype define_FL_OVAL_BOX(); +extern FL_EXPORT Fl_Boxtype define_FL_OVAL_BOX(); #define FL_OVAL_BOX define_FL_OVAL_BOX() #define FL_OSHADOW_BOX (Fl_Boxtype)(define_FL_OVAL_BOX()+1) #define FL_OVAL_FRAME (Fl_Boxtype)(define_FL_OVAL_BOX()+2) @@ -193,13 +210,13 @@ enum Fl_Labeltype { // labeltypes: _FL_MULTI_LABEL, FL_FREE_LABELTYPE }; -extern Fl_Labeltype define_FL_SYMBOL_LABEL(); +extern Fl_Labeltype FL_EXPORT define_FL_SYMBOL_LABEL(); #define FL_SYMBOL_LABEL define_FL_SYMBOL_LABEL() -extern Fl_Labeltype define_FL_SHADOW_LABEL(); +extern Fl_Labeltype FL_EXPORT define_FL_SHADOW_LABEL(); #define FL_SHADOW_LABEL define_FL_SHADOW_LABEL() -extern Fl_Labeltype define_FL_ENGRAVED_LABEL(); +extern Fl_Labeltype FL_EXPORT define_FL_ENGRAVED_LABEL(); #define FL_ENGRAVED_LABEL define_FL_ENGRAVED_LABEL() -extern Fl_Labeltype define_FL_EMBOSSED_LABEL(); +extern Fl_Labeltype FL_EXPORT define_FL_EMBOSSED_LABEL(); #define FL_EMBOSSED_LABEL define_FL_EMBOSSED_LABEL() enum Fl_Align { // align() values @@ -277,9 +294,9 @@ enum Fl_Color { // standard colors FL_COLOR_CUBE = 56 }; -Fl_Color inactive(Fl_Color c); -Fl_Color contrast(Fl_Color fg, Fl_Color bg); -Fl_Color fl_color_average(Fl_Color c1, Fl_Color c2, float weight); +FL_EXPORT Fl_Color inactive(Fl_Color c); +FL_EXPORT Fl_Color contrast(Fl_Color fg, Fl_Color bg); +FL_EXPORT Fl_Color fl_color_average(Fl_Color c1, Fl_Color c2, float weight); inline Fl_Color fl_lighter(Fl_Color c) { return fl_color_average(c, FL_WHITE, .67f); } inline Fl_Color fl_darker(Fl_Color c) { return fl_color_average(c, FL_BLACK, .67f); } @@ -351,5 +368,5 @@ enum Fl_Damage { #endif // -// End of "$Id: Enumerations.H,v 1.11 1999/01/25 20:43:03 mike Exp $". +// End of "$Id: Enumerations.H,v 1.12 1999/02/16 21:59:33 mike Exp $". // @@ -1,5 +1,5 @@ // -// "$Id: Fl.H,v 1.5 1999/02/03 08:43:29 bill Exp $" +// "$Id: Fl.H,v 1.6 1999/02/16 21:59:34 mike Exp $" // // Main header file for the Fast Light Tool Kit (FLTK). // @@ -43,161 +43,161 @@ class Fl { public: // should be private! - static int e_x,e_y,e_x_root,e_y_root; - static int e_state; - static int e_clicks; - static int e_is_click; - static int e_keysym; - static char* e_text; - static int e_length; - static Fl_Widget* belowmouse_; - static Fl_Widget* pushed_; - static Fl_Widget* focus_; - static int damage_; - static Fl_Widget* selection_owner_; - static Fl_Window* modal_; - static Fl_Window* grab_; + static FL_EXPORT int e_x,e_y,e_x_root,e_y_root; + static FL_EXPORT int e_state; + static FL_EXPORT int e_clicks; + static FL_EXPORT int e_is_click; + static FL_EXPORT int e_keysym; + static FL_EXPORT char* e_text; + static FL_EXPORT int e_length; + static FL_EXPORT Fl_Widget* belowmouse_; + static FL_EXPORT Fl_Widget* pushed_; + static FL_EXPORT Fl_Widget* focus_; + static FL_EXPORT int damage_; + static FL_EXPORT Fl_Widget* selection_owner_; + static FL_EXPORT Fl_Window* modal_; + static FL_EXPORT Fl_Window* grab_; static void damage(int x) {damage_ = x;} - static void (*idle)(); + static FL_EXPORT void (*idle)(); public: // argument parsers: - static int arg(int, char**, int&); - static int args(int, char**, int&, int (*)(int,char**,int&) = 0); - static const char* const help; - static void args(int, char**); + static FL_EXPORT int arg(int, char**, int&); + static FL_EXPORT int args(int, char**, int&, int (*)(int,char**,int&) = 0); + static FL_EXPORT const char* const help; + static FL_EXPORT void args(int, char**); // things called by initialization: - static void display(const char*); - static int visual(int); - static int gl_visual(int, int *alist=0); - static void own_colormap(); - static void get_system_colors(); - static void foreground(uchar, uchar, uchar); - static void background(uchar, uchar, uchar); - static void background2(uchar, uchar, uchar); + static FL_EXPORT void display(const char*); + static FL_EXPORT int visual(int); + static FL_EXPORT int gl_visual(int, int *alist=0); + static FL_EXPORT void own_colormap(); + static FL_EXPORT void get_system_colors(); + static FL_EXPORT void foreground(uchar, uchar, uchar); + static FL_EXPORT void background(uchar, uchar, uchar); + static FL_EXPORT void background2(uchar, uchar, uchar); // execution: - static int wait(); - static double wait(double time); - static int check(); - static int ready(); - static int run(); - static Fl_Widget* readqueue(); - static void add_timeout(double t,void (*cb)(void*),void* = 0); - static void remove_timeout(void (*cb)(void*), void* = 0); - static void add_fd(int fd, int when, void (*cb)(int, void*), void* = 0); - static void add_fd(int fd, void (*cb)(int, void*), void* = 0); - static void remove_fd(int); - static void add_idle(void (*cb)(void*), void* = 0); - static void remove_idle(void (*cb)(void*), void* = 0); - static int damage() {return damage_;} - static void redraw(); - static void flush(); - static void (*warning)(const char*, ...); - static void (*error)(const char*, ...); - static void (*fatal)(const char*, ...); - static Fl_Window* first_window(); - static Fl_Window* next_window(const Fl_Window*); - static Fl_Window* modal() {return modal_;} - static Fl_Window* grab() {return grab_;} - static void grab(Fl_Window*); + static FL_EXPORT int wait(); + static FL_EXPORT double wait(double time); + static FL_EXPORT int check(); + static FL_EXPORT int ready(); + static FL_EXPORT int run(); + static FL_EXPORT Fl_Widget* readqueue(); + static FL_EXPORT void add_timeout(double t,void (*cb)(void*),void* = 0); + static FL_EXPORT void remove_timeout(void (*cb)(void*), void* = 0); + static FL_EXPORT void add_fd(int fd, int when, void (*cb)(int, void*), void* = 0); + static FL_EXPORT void add_fd(int fd, void (*cb)(int, void*), void* = 0); + static FL_EXPORT void remove_fd(int); + static FL_EXPORT void add_idle(void (*cb)(void*), void* = 0); + static FL_EXPORT void remove_idle(void (*cb)(void*), void* = 0); + static FL_EXPORT int damage() {return damage_;} + static FL_EXPORT void redraw(); + static FL_EXPORT void flush(); + static FL_EXPORT void (*warning)(const char*, ...); + static FL_EXPORT void (*error)(const char*, ...); + static FL_EXPORT void (*fatal)(const char*, ...); + static FL_EXPORT Fl_Window* first_window(); + static FL_EXPORT Fl_Window* next_window(const Fl_Window*); + static FL_EXPORT Fl_Window* modal() {return modal_;} + static FL_EXPORT Fl_Window* grab() {return grab_;} + static FL_EXPORT void grab(Fl_Window*); // event information: - static int event_x() {return e_x;} - static int event_y() {return e_y;} - static int event_x_root() {return e_x_root;} - static int event_y_root() {return e_y_root;} - static void get_mouse(int &,int &); - static int event_clicks() {return e_clicks;} - static void event_clicks(int i) {e_clicks = i;} - static int event_is_click() {return e_is_click;} - static void event_is_click(int i) {e_is_click = i;} // only 0 works! - static int event_button() {return e_keysym-FL_Button;} - static int event_state() {return e_state;} - static int event_state(int i) {return e_state&i;} - static int event_key() {return e_keysym;} - static int event_key(int); - static int get_key(int); - static const char* event_text() {return e_text;} - static int event_length() {return e_length;} - static int event_inside(int,int,int,int); - static int event_inside(const Fl_Widget*); - static int test_shortcut(int); + static FL_EXPORT int event_x() {return e_x;} + static FL_EXPORT int event_y() {return e_y;} + static FL_EXPORT int event_x_root() {return e_x_root;} + static FL_EXPORT int event_y_root() {return e_y_root;} + static FL_EXPORT void get_mouse(int &,int &); + static FL_EXPORT int event_clicks() {return e_clicks;} + static FL_EXPORT void event_clicks(int i) {e_clicks = i;} + static FL_EXPORT int event_is_click() {return e_is_click;} + static FL_EXPORT void event_is_click(int i) {e_is_click = i;} // only 0 works! + static FL_EXPORT int event_button() {return e_keysym-FL_Button;} + static FL_EXPORT int event_state() {return e_state;} + static FL_EXPORT int event_state(int i) {return e_state&i;} + static FL_EXPORT int event_key() {return e_keysym;} + static FL_EXPORT int event_key(int); + static FL_EXPORT int get_key(int); + static FL_EXPORT const char* event_text() {return e_text;} + static FL_EXPORT int event_length() {return e_length;} + static FL_EXPORT int event_inside(int,int,int,int); + static FL_EXPORT int event_inside(const Fl_Widget*); + static FL_EXPORT int test_shortcut(int); // event destinations: - static int handle(int, Fl_Window*); - static Fl_Widget* belowmouse() {return belowmouse_;} - static void belowmouse(Fl_Widget*); - static Fl_Widget* pushed() {return pushed_;} - static void pushed(Fl_Widget*); - static Fl_Widget* focus() {return focus_;} - static void focus(Fl_Widget*); - static void add_handler(int (*h)(int)); + static FL_EXPORT int handle(int, Fl_Window*); + static FL_EXPORT Fl_Widget* belowmouse() {return belowmouse_;} + static FL_EXPORT void belowmouse(Fl_Widget*); + static FL_EXPORT Fl_Widget* pushed() {return pushed_;} + static FL_EXPORT void pushed(Fl_Widget*); + static FL_EXPORT Fl_Widget* focus() {return focus_;} + static FL_EXPORT void focus(Fl_Widget*); + static FL_EXPORT void add_handler(int (*h)(int)); // cut/paste: - static Fl_Widget* selection_owner() {return selection_owner_;} - static void selection_owner(Fl_Widget*); - static void selection(Fl_Widget &owner, const char* stuff, int len); - static void paste(Fl_Widget &receiver); + static FL_EXPORT Fl_Widget* selection_owner() {return selection_owner_;} + static FL_EXPORT void selection_owner(Fl_Widget*); + static FL_EXPORT void selection(Fl_Widget &owner, const char* stuff, int len); + static FL_EXPORT void paste(Fl_Widget &receiver); // screen size: - static int x() {return 0;} - static int y() {return 0;} - static int w(); - static int h(); + static FL_EXPORT int x() {return 0;} + static FL_EXPORT int y() {return 0;} + static FL_EXPORT int w(); + static FL_EXPORT int h(); // color map: - static void set_color(Fl_Color, uchar, uchar, uchar); - static void set_color(Fl_Color, unsigned); - static unsigned get_color(Fl_Color); - static void get_color(Fl_Color, uchar&, uchar&, uchar&); - static void free_color(Fl_Color, int overlay = 0); + static FL_EXPORT void set_color(Fl_Color, uchar, uchar, uchar); + static FL_EXPORT void set_color(Fl_Color, unsigned); + static FL_EXPORT unsigned get_color(Fl_Color); + static FL_EXPORT void get_color(Fl_Color, uchar&, uchar&, uchar&); + static FL_EXPORT void free_color(Fl_Color, int overlay = 0); // fonts: - static const char* get_font(Fl_Font); - static const char* get_font_name(Fl_Font, int* attributes = 0); - static int get_font_sizes(Fl_Font, int*& sizep); - static void set_font(Fl_Font, const char*); - static void set_font(Fl_Font, Fl_Font); - static Fl_Font set_fonts(const char* = 0); + static FL_EXPORT const char* get_font(Fl_Font); + static FL_EXPORT const char* get_font_name(Fl_Font, int* attributes = 0); + static FL_EXPORT int get_font_sizes(Fl_Font, int*& sizep); + static FL_EXPORT void set_font(Fl_Font, const char*); + static FL_EXPORT void set_font(Fl_Font, Fl_Font); + static FL_EXPORT Fl_Font set_fonts(const char* = 0); // labeltypes: - static void set_labeltype(Fl_Labeltype,Fl_Label_Draw_F*,Fl_Label_Measure_F*); - static void set_labeltype(Fl_Labeltype, Fl_Labeltype from); - static void enable_symbols(); + static FL_EXPORT void set_labeltype(Fl_Labeltype,Fl_Label_Draw_F*,Fl_Label_Measure_F*); + static FL_EXPORT void set_labeltype(Fl_Labeltype, Fl_Labeltype from); + static FL_EXPORT void enable_symbols(); // boxtypes: - static void set_boxtype(Fl_Boxtype, Fl_Box_Draw_F*,uchar,uchar,uchar,uchar); - static void set_boxtype(Fl_Boxtype, Fl_Boxtype from); - static int box_dx(Fl_Boxtype); - static int box_dy(Fl_Boxtype); - static int box_dw(Fl_Boxtype); - static int box_dh(Fl_Boxtype); + static FL_EXPORT void set_boxtype(Fl_Boxtype, Fl_Box_Draw_F*,uchar,uchar,uchar,uchar); + static FL_EXPORT void set_boxtype(Fl_Boxtype, Fl_Boxtype from); + static FL_EXPORT int box_dx(Fl_Boxtype); + static FL_EXPORT int box_dy(Fl_Boxtype); + static FL_EXPORT int box_dw(Fl_Boxtype); + static FL_EXPORT int box_dh(Fl_Boxtype); // back compatability: - static void set_abort(void (*f)(const char*,...)) {fatal = f;} - static void (*atclose)(Fl_Window*,void*); - static void default_atclose(Fl_Window*,void*); - static void set_atclose(void (*f)(Fl_Window*,void*)) {atclose = f;} - static int event_shift() {return e_state&FL_SHIFT;} - static int event_ctrl() {return e_state&FL_CTRL;} - static int event_alt() {return e_state&FL_ALT;} - static int event_buttons() {return e_state&0x7f000000;} - static int event_button1() {return e_state&FL_BUTTON1;} - static int event_button2() {return e_state&FL_BUTTON2;} - static int event_button3() {return e_state&FL_BUTTON3;} - static void set_idle(void (*cb)()) {idle = cb;} - static void grab(Fl_Window&w) {grab(&w);} - static void release() {grab(0);} + static FL_EXPORT void set_abort(void (*f)(const char*,...)) {fatal = f;} + static FL_EXPORT void (*atclose)(Fl_Window*,void*); + static FL_EXPORT void default_atclose(Fl_Window*,void*); + static FL_EXPORT void set_atclose(void (*f)(Fl_Window*,void*)) {atclose = f;} + static FL_EXPORT int event_shift() {return e_state&FL_SHIFT;} + static FL_EXPORT int event_ctrl() {return e_state&FL_CTRL;} + static FL_EXPORT int event_alt() {return e_state&FL_ALT;} + static FL_EXPORT int event_buttons() {return e_state&0x7f000000;} + static FL_EXPORT int event_button1() {return e_state&FL_BUTTON1;} + static FL_EXPORT int event_button2() {return e_state&FL_BUTTON2;} + static FL_EXPORT int event_button3() {return e_state&FL_BUTTON3;} + static FL_EXPORT void set_idle(void (*cb)()) {idle = cb;} + static FL_EXPORT void grab(Fl_Window&w) {grab(&w);} + static FL_EXPORT void release() {grab(0);} }; #endif // -// End of "$Id: Fl.H,v 1.5 1999/02/03 08:43:29 bill Exp $". +// End of "$Id: Fl.H,v 1.6 1999/02/16 21:59:34 mike Exp $". // diff --git a/FL/Fl_Adjuster.H b/FL/Fl_Adjuster.H index c1ec728e1..f497ba7ec 100644 --- a/FL/Fl_Adjuster.H +++ b/FL/Fl_Adjuster.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Adjuster.H,v 1.4 1999/01/07 19:16:50 mike Exp $" +// "$Id: Fl_Adjuster.H,v 1.5 1999/02/16 21:59:34 mike Exp $" // // Adjuster widget header file for the Fast Light Tool Kit (FLTK). // @@ -37,17 +37,17 @@ class Fl_Adjuster : public Fl_Valuator { int ix; int soft_; protected: - void draw(); - int handle(int); - void value_damage(); + FL_EXPORT void draw(); + FL_EXPORT int handle(int); + FL_EXPORT void value_damage(); public: - Fl_Adjuster(int x,int y,int w,int h,const char *l=0); - void soft(int x) {soft_ = x;} - int soft() const {return soft_;} + FL_EXPORT Fl_Adjuster(int x,int y,int w,int h,const char *l=0); + FL_EXPORT void soft(int x) {soft_ = x;} + FL_EXPORT int soft() const {return soft_;} }; #endif // -// End of "$Id: Fl_Adjuster.H,v 1.4 1999/01/07 19:16:50 mike Exp $". +// End of "$Id: Fl_Adjuster.H,v 1.5 1999/02/16 21:59:34 mike Exp $". // diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index 416c93509..3742e4ae7 100644 --- a/FL/Fl_Bitmap.H +++ b/FL/Fl_Bitmap.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Bitmap.H,v 1.4 1999/01/07 19:16:50 mike Exp $" +// "$Id: Fl_Bitmap.H,v 1.5 1999/02/16 21:59:34 mike Exp $" // // Bitmap header file for the Fast Light Tool Kit (FLTK). // @@ -33,19 +33,19 @@ struct Fl_Bitmap { const uchar *array; int w, h; ulong id; // for internal use - Fl_Bitmap(const uchar *bits, int W, int H) : + FL_EXPORT Fl_Bitmap(const uchar *bits, int W, int H) : array(bits), w(W), h(H), id(0) {} - Fl_Bitmap(const char *bits, int W, int H) : + FL_EXPORT Fl_Bitmap(const char *bits, int W, int H) : array((const uchar *)bits), w(W), h(H), id(0) {} - ~Fl_Bitmap(); - void label(Fl_Widget*); - void label(Fl_Menu_Item*); - void draw(int X, int Y, int W, int H, int cx=0, int cy=0); - void draw(int X, int Y) {draw(X, Y, w, h, 0, 0);} + FL_EXPORT ~Fl_Bitmap(); + FL_EXPORT void label(Fl_Widget*); + FL_EXPORT void label(Fl_Menu_Item*); + FL_EXPORT void draw(int X, int Y, int W, int H, int cx=0, int cy=0); + FL_EXPORT void draw(int X, int Y) {draw(X, Y, w, h, 0, 0);} }; #endif // -// End of "$Id: Fl_Bitmap.H,v 1.4 1999/01/07 19:16:50 mike Exp $". +// End of "$Id: Fl_Bitmap.H,v 1.5 1999/02/16 21:59:34 mike Exp $". // diff --git a/FL/Fl_Box.H b/FL/Fl_Box.H index a9c794690..c531b67cf 100644 --- a/FL/Fl_Box.H +++ b/FL/Fl_Box.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Box.H,v 1.4 1999/01/07 19:16:51 mike Exp $" +// "$Id: Fl_Box.H,v 1.5 1999/02/16 21:59:34 mike Exp $" // // Box header file for the Fast Light Tool Kit (FLTK). // @@ -31,16 +31,16 @@ #endif class Fl_Box : public Fl_Widget { - void draw(); + FL_EXPORT void draw(); public: - Fl_Box(int x, int y, int w, int h, const char *l=0) + FL_EXPORT Fl_Box(int x, int y, int w, int h, const char *l=0) : Fl_Widget(x,y,w,h,l) {} - Fl_Box(Fl_Boxtype b, int x, int y, int w, int h, const char *l) + FL_EXPORT 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);} }; #endif // -// End of "$Id: Fl_Box.H,v 1.4 1999/01/07 19:16:51 mike Exp $". +// End of "$Id: Fl_Box.H,v 1.5 1999/02/16 21:59:34 mike Exp $". // diff --git a/FL/Fl_Browser.H b/FL/Fl_Browser.H index 69156991c..b54ef1aaf 100644 --- a/FL/Fl_Browser.H +++ b/FL/Fl_Browser.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Browser.H,v 1.7 1999/01/30 00:39:26 carl Exp $" +// "$Id: Fl_Browser.H,v 1.8 1999/02/16 21:59:35 mike Exp $" // // Browser header file for the Fast Light Tool Kit (FLTK). // @@ -37,16 +37,16 @@ struct FL_BLINE; class Fl_Browser : public Fl_Browser_ { // required routines for Fl_Browser_ subclass: - 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_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_BLINE *first; // the array of lines FL_BLINE *last; @@ -57,44 +57,44 @@ class Fl_Browser : public Fl_Browser_ { const int* column_widths_; char format_char_; // alternative to @-sign char column_char_; // alternative to tab - FL_BLINE* find_line(int) const ; - FL_BLINE* _remove(int) ; - void insert(int, FL_BLINE*); - int lineno(void*) 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 ; public: - 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(); + 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(); int size() const {return lines;} - int topline() const ; + FL_EXPORT int topline() const ; enum Fl_Line_Position { TOP, BOTTOM, MIDDLE }; - void lineposition(int, Fl_Line_Position); + FL_EXPORT 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); } - int select(int, int=1); - int selected(int) const ; - void show(int n); - void hide(int n); + FL_EXPORT int select(int, int=1); + FL_EXPORT int selected(int) const ; + FL_EXPORT void show(int n); + FL_EXPORT void hide(int n); void hide() {Fl_Widget::hide();} - int visible(int n) const ; + FL_EXPORT int visible(int n) const ; - int value() const ; + FL_EXPORT int value() const ; void value(int v) {select(v);} - const char* text(int) const ; - void text(int, const char*); - void* data(int) const ; - void data(int, void* 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); - Fl_Browser(int, int, int, int, const char* = 0); + FL_EXPORT Fl_Browser(int, int, int, int, const char* = 0); char format_char() const {return format_char_;} void format_char(char c) {format_char_ = c;} @@ -107,11 +107,11 @@ public: // for back compatability only: void replace(int a, const char* b) {text(a, b);} - void display(int, int=1); + FL_EXPORT void display(int, int=1); }; #endif // -// End of "$Id: Fl_Browser.H,v 1.7 1999/01/30 00:39:26 carl Exp $". +// End of "$Id: Fl_Browser.H,v 1.8 1999/02/16 21:59:35 mike Exp $". // diff --git a/FL/Fl_Browser_.H b/FL/Fl_Browser_.H index f9735cbf1..6eef867a0 100644 --- a/FL/Fl_Browser_.H +++ b/FL/Fl_Browser_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Browser_.H,v 1.5 1999/01/07 19:16:51 mike Exp $" +// "$Id: Fl_Browser_.H,v 1.6 1999/02/16 21:59:35 mike Exp $" // // Common browser header file for the Fast Light Tool Kit (FLTK). // @@ -59,61 +59,61 @@ class Fl_Browser_ : public Fl_Group { static int scrollbar_width_; - void update_top(); + FL_EXPORT void update_top(); protected: // All of the following must be supplied by the subclass: - 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; + 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; // you don't have to provide these but it may help speed it up: - 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 + 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 // These only need to be done by subclass if you want a multi-browser: - virtual void item_select(void *,int=1); - virtual int item_selected(void *) const ; + virtual FL_EXPORT void item_select(void *,int=1); + virtual FL_EXPORT int item_selected(void *) const ; // things the subclass may want to call: - 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(); - int handle(int); - Fl_Browser_(int,int,int,int,const char * = 0); + 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 int handle(int); + FL_EXPORT Fl_Browser_(int,int,int,int,const char * = 0); public: Fl_Scrollbar scrollbar; // Vertical scrollbar Fl_Scrollbar hscrollbar; // Horizontal scrollbar - void resize(int,int,int,int); + FL_EXPORT void resize(int,int,int,int); - int select(void *,int=1,int docallbacks=0); - int select_only(void *,int docallbacks=0); - int deselect(int docallbacks=0); + 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 position() const {return position_;} int hposition() const {return hposition_;} - void position(int); // scroll to here - void hposition(int); // pan to here - void display(void*); // scroll so this item is shown + 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 uchar has_scrollbar() const {return has_scrollbar_;} void has_scrollbar(uchar i) {has_scrollbar_ = i;} @@ -146,5 +146,5 @@ public: #endif // -// End of "$Id: Fl_Browser_.H,v 1.5 1999/01/07 19:16:51 mike Exp $". +// End of "$Id: Fl_Browser_.H,v 1.6 1999/02/16 21:59:35 mike Exp $". // diff --git a/FL/Fl_Button.H b/FL/Fl_Button.H index 2e032cded..3f7ce6bfe 100644 --- a/FL/Fl_Button.H +++ b/FL/Fl_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Button.H,v 1.4 1999/01/07 19:16:51 mike Exp $" +// "$Id: Fl_Button.H,v 1.5 1999/02/16 21:59:35 mike Exp $" // // Button header file for the Fast Light Tool Kit (FLTK). // @@ -35,7 +35,7 @@ #define FL_RADIO_BUTTON (FL_RESERVED_TYPE+2) #define FL_HIDDEN_BUTTON 3 // for Forms compatability -extern int fl_old_shortcut(const char*); +extern FL_EXPORT int fl_old_shortcut(const char*); class Fl_Button : public Fl_Widget { @@ -46,17 +46,17 @@ class Fl_Button : public Fl_Widget { protected: - virtual void draw(); + virtual FL_EXPORT void draw(); public: - virtual int handle(int); - Fl_Button(int,int,int,int,const char * = 0); - int value(int); + virtual FL_EXPORT int handle(int); + FL_EXPORT Fl_Button(int,int,int,int,const char * = 0); + FL_EXPORT int value(int); char value() const {return value_;} int set() {return value(1);} int clear() {return value(0);} - void setonly(); // this should only be called on FL_RADIO_BUTTONs + FL_EXPORT 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_;} @@ -71,5 +71,5 @@ public: #endif // -// End of "$Id: Fl_Button.H,v 1.4 1999/01/07 19:16:51 mike Exp $". +// End of "$Id: Fl_Button.H,v 1.5 1999/02/16 21:59:35 mike Exp $". // diff --git a/FL/Fl_Chart.H b/FL/Fl_Chart.H index 8750f7056..30cf96827 100644 --- a/FL/Fl_Chart.H +++ b/FL/Fl_Chart.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Chart.H,v 1.5 1999/02/01 20:14:58 mike Exp $" +// "$Id: Fl_Chart.H,v 1.6 1999/02/16 21:59:35 mike Exp $" // // Forms chart header file for the Fast Light Tool Kit (FLTK). // @@ -59,18 +59,18 @@ class Fl_Chart : public Fl_Widget { uchar autosize_; uchar textfont_,textsize_,textcolor_; protected: - void draw(); + FL_EXPORT void draw(); public: - Fl_Chart(int,int,int,int,const char * = 0); - void clear(); - void add(double, const char * =0, uchar=0); - void insert(int, double, const char * =0, uchar=0); - void replace(int, double, const char * =0, uchar=0); + FL_EXPORT Fl_Chart(int,int,int,int,const char * = 0); + FL_EXPORT void clear(); + FL_EXPORT void add(double, const char * =0, uchar=0); + FL_EXPORT void insert(int, double, const char * =0, uchar=0); + FL_EXPORT void replace(int, double, const char * =0, uchar=0); void bounds(double *a,double *b) const {*a = min; *b = max;} - void bounds(double a,double b); + FL_EXPORT void bounds(double a,double b); int size() const {return numb;} int maxsize() const {return maxnumb;} - void maxsize(int); + FL_EXPORT void maxsize(int); Fl_Font textfont() const {return (Fl_Font)textfont_;} void textfont(uchar s) {textfont_ = s;} uchar textsize() const {return textsize_;} @@ -84,5 +84,5 @@ public: #endif // -// End of "$Id: Fl_Chart.H,v 1.5 1999/02/01 20:14:58 mike Exp $". +// End of "$Id: Fl_Chart.H,v 1.6 1999/02/16 21:59:35 mike Exp $". // diff --git a/FL/Fl_Check_Button.H b/FL/Fl_Check_Button.H index 85e4eab65..97b41440c 100644 --- a/FL/Fl_Check_Button.H +++ b/FL/Fl_Check_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Check_Button.H,v 1.4 1999/01/07 19:16:52 mike Exp $" +// "$Id: Fl_Check_Button.H,v 1.5 1999/02/16 21:59:35 mike Exp $" // // Check button header file for the Fast Light Tool Kit (FLTK). // @@ -30,11 +30,11 @@ class Fl_Check_Button : public Fl_Light_Button { public: - Fl_Check_Button(int x,int y,int w,int h,const char *l = 0); + FL_EXPORT 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.4 1999/01/07 19:16:52 mike Exp $". +// End of "$Id: Fl_Check_Button.H,v 1.5 1999/02/16 21:59:35 mike Exp $". // diff --git a/FL/Fl_Choice.H b/FL/Fl_Choice.H index 9acd8aa16..80399e0df 100644 --- a/FL/Fl_Choice.H +++ b/FL/Fl_Choice.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Choice.H,v 1.4 1999/01/07 19:16:52 mike Exp $" +// "$Id: Fl_Choice.H,v 1.5 1999/02/16 21:59:36 mike Exp $" // // Choice header file for the Fast Light Tool Kit (FLTK). // @@ -30,16 +30,16 @@ class Fl_Choice : public Fl_Menu_ { protected: - void draw(); + FL_EXPORT void draw(); public: - int handle(int); - Fl_Choice(int,int,int,int,const char * = 0); - int value(int i); - int value() const {return Fl_Menu_::value();} + 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();} }; #endif // -// End of "$Id: Fl_Choice.H,v 1.4 1999/01/07 19:16:52 mike Exp $". +// End of "$Id: Fl_Choice.H,v 1.5 1999/02/16 21:59:36 mike Exp $". // diff --git a/FL/Fl_Clock.H b/FL/Fl_Clock.H index 8a17ee338..cc287fb9f 100644 --- a/FL/Fl_Clock.H +++ b/FL/Fl_Clock.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Clock.H,v 1.5 1999/01/13 15:45:48 mike Exp $" +// "$Id: Fl_Clock.H,v 1.6 1999/02/16 21:59:36 mike Exp $" // // Clock header file for the Fast Light Tool Kit (FLTK). // @@ -41,14 +41,14 @@ class Fl_Clock_Output : public Fl_Widget { int hour_, minute_, second_; ulong value_; - void drawhands(Fl_Color,Fl_Color); // part of draw + FL_EXPORT void drawhands(Fl_Color,Fl_Color); // part of draw protected: - void draw(int, int, int, int); - void draw(); + FL_EXPORT void draw(int, int, int, int); + FL_EXPORT void draw(); public: - Fl_Clock_Output(int x,int y,int w,int h, const char *l = 0); - void value(ulong v); // set to this Unix time - void value(int,int,int); // set hour, minute, second + 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 ulong value() const {return value_;} int hour() const {return hour_;} int minute() const {return minute_;} @@ -58,16 +58,16 @@ public: // a Fl_Clock displays the current time always by using a timeout: class Fl_Clock : public Fl_Clock_Output { - int handle(int); + FL_EXPORT int handle(int); public: - void update(); - Fl_Clock(int x,int y,int w,int h, const char *l = 0); - Fl_Clock(uchar t,int x,int y,int w,int h, const char *l); - ~Fl_Clock(); + 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(); }; #endif // -// End of "$Id: Fl_Clock.H,v 1.5 1999/01/13 15:45:48 mike Exp $". +// End of "$Id: Fl_Clock.H,v 1.6 1999/02/16 21:59:36 mike Exp $". // diff --git a/FL/Fl_Color_Chooser.H b/FL/Fl_Color_Chooser.H index 01230e8f9..779a5b060 100644 --- a/FL/Fl_Color_Chooser.H +++ b/FL/Fl_Color_Chooser.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Color_Chooser.H,v 1.4 1999/01/07 19:16:52 mike Exp $" +// "$Id: Fl_Color_Chooser.H,v 1.5 1999/02/16 21:59:36 mike Exp $" // // Color chooser header file for the Fast Light Tool Kit (FLTK). // @@ -37,8 +37,8 @@ #include <FL/Fl_Value_Input.H> class Flcc_HueBox : public Fl_Widget { - int handle(int); - void draw(); + FL_EXPORT int handle(int); + FL_EXPORT void draw(); int px, py; public: Flcc_HueBox(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) { @@ -46,8 +46,8 @@ public: }; class Flcc_ValueBox : public Fl_Widget { - int handle(int); - void draw(); + FL_EXPORT int handle(int); + FL_EXPORT void draw(); int py; public: Flcc_ValueBox(int X, int Y, int W, int H) : Fl_Widget(X,Y,W,H) { @@ -56,7 +56,7 @@ public: class Flcc_Value_Input : public Fl_Value_Input { public: - int format(char*); + FL_EXPORT int format(char*); Flcc_Value_Input(int X, int Y, int W, int H) : Fl_Value_Input(X,Y,W,H) {} }; @@ -70,9 +70,9 @@ class Fl_Color_Chooser : public Fl_Group { Fl_Box resize_box; double hue_, saturation_, value_; double r_, g_, b_; - void set_valuators(); - static void rgb_cb(Fl_Widget*, void*); - static void mode_cb(Fl_Widget*, void*); + FL_EXPORT void set_valuators(); + static FL_EXPORT void rgb_cb(Fl_Widget*, void*); + static FL_EXPORT void mode_cb(Fl_Widget*, void*); public: int mode() {return choice.value();} double hue() const {return hue_;} @@ -81,18 +81,18 @@ public: double r() const {return r_;} double g() const {return g_;} double b() const {return b_;} - 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 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 fl_color_chooser(const char* name, double& r, double& g, double& b); -int fl_color_chooser(const char* name, uchar& r, uchar& g, uchar& b); +FL_EXPORT int fl_color_chooser(const char* name, double& r, double& g, double& b); +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.4 1999/01/07 19:16:52 mike Exp $". +// End of "$Id: Fl_Color_Chooser.H,v 1.5 1999/02/16 21:59:36 mike Exp $". // diff --git a/FL/Fl_Counter.H b/FL/Fl_Counter.H index 474554896..a2ec8b2bf 100644 --- a/FL/Fl_Counter.H +++ b/FL/Fl_Counter.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Counter.H,v 1.4 1999/01/07 19:16:53 mike Exp $" +// "$Id: Fl_Counter.H,v 1.5 1999/02/16 21:59:36 mike Exp $" // // Counter header file for the Fast Light Tool Kit (FLTK). // @@ -41,19 +41,19 @@ class Fl_Counter : public Fl_Valuator { uchar textfont_, textsize_, textcolor_; double lstep_; uchar mouseobj; - static void repeat_callback(void *); - int calc_mouseobj(); - void increment_cb(); + static FL_EXPORT void repeat_callback(void *); + FL_EXPORT int calc_mouseobj(); + FL_EXPORT void increment_cb(); protected: - void draw(); + FL_EXPORT void draw(); public: - int handle(int); - Fl_Counter(int,int,int,int,const char * = 0); - ~Fl_Counter(); + FL_EXPORT int handle(int); + FL_EXPORT Fl_Counter(int,int,int,int,const char * = 0); + FL_EXPORT ~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);} @@ -69,5 +69,5 @@ public: #endif // -// End of "$Id: Fl_Counter.H,v 1.4 1999/01/07 19:16:53 mike Exp $". +// End of "$Id: Fl_Counter.H,v 1.5 1999/02/16 21:59:36 mike Exp $". // diff --git a/FL/Fl_Dial.H b/FL/Fl_Dial.H index 5ecef7415..c6a5d5622 100644 --- a/FL/Fl_Dial.H +++ b/FL/Fl_Dial.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Dial.H,v 1.4 1999/01/07 19:16:53 mike Exp $" +// "$Id: Fl_Dial.H,v 1.5 1999/02/16 21:59:37 mike Exp $" // // Dial header file for the Fast Light Tool Kit (FLTK). // @@ -46,14 +46,14 @@ class Fl_Dial : public Fl_Valuator { protected: // these allow subclasses to put the dial in a smaller area: - void draw(int, int, int, int); - int handle(int, int, int, int, int); - void draw(); + FL_EXPORT void draw(int, int, int, int); + FL_EXPORT int handle(int, int, int, int, int); + FL_EXPORT void draw(); public: - int handle(int); - Fl_Dial(int x,int y,int w,int h, const char *l = 0); + FL_EXPORT int handle(int); + FL_EXPORT Fl_Dial(int x,int y,int w,int h, const char *l = 0); void angles(short a, short b) {a1=a; a2=b;} void direction(uchar d) {direction_ = d;} uchar direction() const {return direction_;} @@ -63,5 +63,5 @@ public: #endif // -// End of "$Id: Fl_Dial.H,v 1.4 1999/01/07 19:16:53 mike Exp $". +// End of "$Id: Fl_Dial.H,v 1.5 1999/02/16 21:59:37 mike Exp $". // diff --git a/FL/Fl_Double_Window.H b/FL/Fl_Double_Window.H index 3f5e4a8e4..4104e8986 100644 --- a/FL/Fl_Double_Window.H +++ b/FL/Fl_Double_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Double_Window.H,v 1.6 1999/01/07 19:16:53 mike Exp $" +// "$Id: Fl_Double_Window.H,v 1.7 1999/02/16 21:59:37 mike Exp $" // // Double-buffered window header file for the Fast Light Tool Kit (FLTK). // @@ -30,14 +30,14 @@ class Fl_Double_Window : public Fl_Window { protected: - void flush(int eraseoverlay); + FL_EXPORT void flush(int eraseoverlay); public: - void show(); + FL_EXPORT void show(); void show(int a, char **b) {Fl_Window::show(a,b);} - void flush(); - void resize(int,int,int,int); - void hide(); - ~Fl_Double_Window(); + FL_EXPORT void flush(); + FL_EXPORT void resize(int,int,int,int); + FL_EXPORT void hide(); + FL_EXPORT ~Fl_Double_Window(); Fl_Double_Window(int W, int H, const char *l = 0) : Fl_Window(W,H,l) {} Fl_Double_Window(int X, int Y, int W, int H, const char *l = 0) : Fl_Window(X,Y,W,H,l) {} @@ -46,5 +46,5 @@ public: #endif // -// End of "$Id: Fl_Double_Window.H,v 1.6 1999/01/07 19:16:53 mike Exp $". +// End of "$Id: Fl_Double_Window.H,v 1.7 1999/02/16 21:59:37 mike Exp $". // diff --git a/FL/Fl_FormsBitmap.H b/FL/Fl_FormsBitmap.H index 6d767f82b..cded1aba3 100644 --- a/FL/Fl_FormsBitmap.H +++ b/FL/Fl_FormsBitmap.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_FormsBitmap.H,v 1.4 1999/01/07 19:16:54 mike Exp $" +// "$Id: Fl_FormsBitmap.H,v 1.5 1999/02/16 21:59:37 mike Exp $" // // Forms bitmap header file for the Fast Light Tool Kit (FLTK). // @@ -31,10 +31,10 @@ class Fl_FormsBitmap : public Fl_Widget { Fl_Bitmap *b; protected: - void draw(); + FL_EXPORT void draw(); public: - Fl_FormsBitmap(Fl_Boxtype, int, int, int, int, const char * = 0); - void set(int W, int H, const uchar *bits); + FL_EXPORT Fl_FormsBitmap(Fl_Boxtype, int, int, int, int, const char * = 0); + FL_EXPORT 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.4 1999/01/07 19:16:54 mike Exp $". +// End of "$Id: Fl_FormsBitmap.H,v 1.5 1999/02/16 21:59:37 mike Exp $". // diff --git a/FL/Fl_FormsPixmap.H b/FL/Fl_FormsPixmap.H index fc92b1740..030d7cd62 100644 --- a/FL/Fl_FormsPixmap.H +++ b/FL/Fl_FormsPixmap.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_FormsPixmap.H,v 1.4 1999/01/07 19:16:54 mike Exp $" +// "$Id: Fl_FormsPixmap.H,v 1.5 1999/02/16 21:59:37 mike Exp $" // // Forms pixmap header file for the Fast Light Tool Kit (FLTK). // @@ -31,10 +31,10 @@ class Fl_FormsPixmap : public Fl_Widget { Fl_Pixmap *b; protected: - void draw(); + FL_EXPORT void draw(); public: - Fl_FormsPixmap(Fl_Boxtype, int, int, int, int, const char * = 0); - void set(/*const*/char * const * bits); + FL_EXPORT Fl_FormsPixmap(Fl_Boxtype, int, int, int, int, const char * = 0); + FL_EXPORT 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.4 1999/01/07 19:16:54 mike Exp $". +// End of "$Id: Fl_FormsPixmap.H,v 1.5 1999/02/16 21:59:37 mike Exp $". // diff --git a/FL/Fl_Free.H b/FL/Fl_Free.H index ade3e9d23..e28078126 100644 --- a/FL/Fl_Free.H +++ b/FL/Fl_Free.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Free.H,v 1.4 1999/01/07 19:16:54 mike Exp $" +// "$Id: Fl_Free.H,v 1.5 1999/02/16 21:59:37 mike Exp $" // // Forms free header file for the Fast Light Tool Kit (FLTK). // @@ -40,12 +40,12 @@ typedef int (*FL_HANDLEPTR)(Fl_Widget *, int , float, float, char); class Fl_Free : public Fl_Widget { FL_HANDLEPTR hfunc; - static void step(void *); - void draw(); - int handle(int); + static FL_EXPORT void step(void *); + FL_EXPORT void draw(); + FL_EXPORT int handle(int); public: - Fl_Free(uchar t,int x,int y,int w,int h,const char *l,FL_HANDLEPTR hdl); - ~Fl_Free(); + FL_EXPORT Fl_Free(uchar t,int x,int y,int w,int h,const char *l,FL_HANDLEPTR hdl); + FL_EXPORT ~Fl_Free(); }; // old event names for compatability: @@ -59,5 +59,5 @@ public: #endif // -// End of "$Id: Fl_Free.H,v 1.4 1999/01/07 19:16:54 mike Exp $". +// End of "$Id: Fl_Free.H,v 1.5 1999/02/16 21:59:37 mike Exp $". // diff --git a/FL/Fl_Gl_Window.H b/FL/Fl_Gl_Window.H index 90150a9c4..724a48d5a 100644 --- a/FL/Fl_Gl_Window.H +++ b/FL/Fl_Gl_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Gl_Window.H,v 1.6 1999/01/07 19:16:54 mike Exp $" +// "$Id: Fl_Gl_Window.H,v 1.7 1999/02/16 21:59:38 mike Exp $" // // OpenGL header file for the Fast Light Tool Kit (FLTK). // @@ -37,27 +37,27 @@ class Fl_Gl_Window : public Fl_Window { void * context; // actually a GLXContext char valid_; char damage1_; // damage() of back buffer - virtual void draw_overlay(); - void init(); + virtual FL_EXPORT void draw_overlay(); + FL_EXPORT void init(); void *overlay; - void make_overlay(); + FL_EXPORT void make_overlay(); friend class _Fl_Gl_Overlay; - static int can_do(int, const int *); - int mode(int, const int *); + static FL_EXPORT int can_do(int, const int *); + FL_EXPORT int mode(int, const int *); public: - void show(); + FL_EXPORT void show(); void show(int a, char **b) {Fl_Window::show(a,b);} - void flush(); - void hide(); - void resize(int,int,int,int); + FL_EXPORT void flush(); + FL_EXPORT void hide(); + FL_EXPORT void resize(int,int,int,int); char valid() const {return valid_;} void valid(char i) {valid_ = i;} - void invalidate(); + FL_EXPORT void invalidate(); static int can_do(int i) {return can_do(i,0);} static int can_do(const int *i) {return can_do(0, i);} @@ -66,16 +66,16 @@ public: int mode(int a) {return mode(a,0);} int mode(const int *a) {return mode(0, a);} - int can_do_overlay(); - void redraw_overlay(); - void hide_overlay(); + FL_EXPORT int can_do_overlay(); + FL_EXPORT void redraw_overlay(); + FL_EXPORT void hide_overlay(); - void make_current(); - void make_overlay_current(); - void swap_buffers(); - void ortho(); + FL_EXPORT void make_current(); + FL_EXPORT void make_overlay_current(); + FL_EXPORT void swap_buffers(); + FL_EXPORT void ortho(); - ~Fl_Gl_Window(); + FL_EXPORT ~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();} @@ -84,5 +84,5 @@ public: #endif // -// End of "$Id: Fl_Gl_Window.H,v 1.6 1999/01/07 19:16:54 mike Exp $". +// End of "$Id: Fl_Gl_Window.H,v 1.7 1999/02/16 21:59:38 mike Exp $". // diff --git a/FL/Fl_Group.H b/FL/Fl_Group.H index cc434d351..ccb0b0b10 100644 --- a/FL/Fl_Group.H +++ b/FL/Fl_Group.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Group.H,v 1.5 1999/01/26 21:37:13 mike Exp $" +// "$Id: Fl_Group.H,v 1.6 1999/02/16 21:59:38 mike Exp $" // // Group header file for the Fast Light Tool Kit (FLTK). // @@ -38,17 +38,17 @@ class Fl_Group : public Fl_Widget { int children_; short *sizes_; // remembered initial sizes of children - int navigation(int); - static Fl_Group *current_; + FL_EXPORT int navigation(int); + static FL_EXPORT Fl_Group *current_; protected: - void draw(); - int handle(int); - void draw_child(Fl_Widget&) const; - void update_child(Fl_Widget&) const; - void draw_outside_label(const Fl_Widget&) const ; - short* sizes(); + FL_EXPORT void draw(); + FL_EXPORT int handle(int); + FL_EXPORT void draw_child(Fl_Widget&) const; + FL_EXPORT void update_child(Fl_Widget&) const; + FL_EXPORT void draw_outside_label(const Fl_Widget&) const ; + FL_EXPORT short* sizes(); public: @@ -59,31 +59,31 @@ public: int children() const {return children_;} Fl_Widget* child(int n) const {return array()[n];} - int find(const Fl_Widget*) const; + FL_EXPORT int find(const Fl_Widget*) const; int find(const Fl_Widget& o) const {return find(&o);} - Fl_Widget* const* array() const; + FL_EXPORT Fl_Widget* const* array() const; - void resize(int,int,int,int); - Fl_Group(int,int,int,int, const char * = 0); - virtual ~Fl_Group(); - void add(Fl_Widget&); + FL_EXPORT void resize(int,int,int,int); + FL_EXPORT Fl_Group(int,int,int,int, const char * = 0); + FL_EXPORT virtual ~Fl_Group(); + FL_EXPORT void add(Fl_Widget&); void add(Fl_Widget* o) {add(*o);} - void insert(Fl_Widget&, int i); + FL_EXPORT void insert(Fl_Widget&, int i); void insert(Fl_Widget& o, Fl_Widget* before) {insert(o,find(before));} - void remove(Fl_Widget&); + FL_EXPORT void remove(Fl_Widget&); void remove(Fl_Widget* o) {remove(*o);} - void clear(); + FL_EXPORT void clear(); void resizable(Fl_Widget& o) {resizable_ = &o;} void resizable(Fl_Widget* o) {resizable_ = o;} Fl_Widget* resizable() const {return resizable_;} void add_resizable(Fl_Widget& o) {resizable_ = &o; add(o);} - void init_sizes(); + FL_EXPORT void init_sizes(); // back compatability function: void focus(Fl_Widget* o) {o->take_focus();} Fl_Widget* & _ddfdesign_kludge() {return resizable_;} - void forms_end(); + FL_EXPORT void forms_end(); }; // dummy class used to end child groups in constructors for complex @@ -96,5 +96,5 @@ public: #endif // -// End of "$Id: Fl_Group.H,v 1.5 1999/01/26 21:37:13 mike Exp $". +// End of "$Id: Fl_Group.H,v 1.6 1999/02/16 21:59:38 mike Exp $". // diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index c76b66a45..2b0a50356 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Image.H,v 1.4 1999/01/07 19:16:56 mike Exp $" +// "$Id: Fl_Image.H,v 1.5 1999/02/16 21:59:38 mike Exp $" // // Image header file for the Fast Light Tool Kit (FLTK). // @@ -33,17 +33,17 @@ struct Fl_Image { const uchar *array; int w, h, d, ld; ulong id; // for internal use - Fl_Image(const uchar *bits, int W, int H, int D=3, int LD=0) : + FL_EXPORT Fl_Image(const uchar *bits, int W, int H, int D=3, int LD=0) : array(bits), w(W), h(H), d(D), ld(LD), id(0) {} - ~Fl_Image(); - void label(Fl_Widget*); - void label(Fl_Menu_Item*); - void draw(int X, int Y, int W, int H, int cx=0, int cy=0); - void draw(int X, int Y) {draw(X, Y, w, h, 0, 0);} + FL_EXPORT ~Fl_Image(); + FL_EXPORT void label(Fl_Widget*); + FL_EXPORT void label(Fl_Menu_Item*); + FL_EXPORT void draw(int X, int Y, int W, int H, int cx=0, int cy=0); + FL_EXPORT void draw(int X, int Y) {draw(X, Y, w, h, 0, 0);} }; #endif // -// End of "$Id: Fl_Image.H,v 1.4 1999/01/07 19:16:56 mike Exp $". +// End of "$Id: Fl_Image.H,v 1.5 1999/02/16 21:59:38 mike Exp $". // diff --git a/FL/Fl_Input.H b/FL/Fl_Input.H index 07a899e11..282c2506c 100644 --- a/FL/Fl_Input.H +++ b/FL/Fl_Input.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input.H,v 1.4 1999/01/07 19:16:56 mike Exp $" +// "$Id: Fl_Input.H,v 1.5 1999/02/16 21:59:38 mike Exp $" // // Input header file for the Fast Light Tool Kit (FLTK). // @@ -29,18 +29,18 @@ #include "Fl_Input_.H" class 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); + 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); public: - void draw(); - int handle(int); - Fl_Input(int,int,int,int,const char * = 0); + FL_EXPORT void draw(); + FL_EXPORT int handle(int); + FL_EXPORT Fl_Input(int,int,int,int,const char * = 0); }; #endif // -// End of "$Id: Fl_Input.H,v 1.4 1999/01/07 19:16:56 mike Exp $". +// End of "$Id: Fl_Input.H,v 1.5 1999/02/16 21:59:38 mike Exp $". // diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H index 2e1b6fb48..1e7a2b599 100644 --- a/FL/Fl_Input_.H +++ b/FL/Fl_Input_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input_.H,v 1.5 1999/01/07 19:16:56 mike Exp $" +// "$Id: Fl_Input_.H,v 1.6 1999/02/16 21:59:38 mike Exp $" // // Input base class header file for the Fast Light Tool Kit (FLTK). // @@ -56,37 +56,37 @@ class Fl_Input_ : public Fl_Widget { uchar cursor_color_; uchar erase_cursor_only; - 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 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); - void setfont() const; + FL_EXPORT void setfont() const; protected: - int wordboundary(int i) const; - int lineboundary(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(); + FL_EXPORT int wordboundary(int i) const; + FL_EXPORT int lineboundary(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 xscroll() const {return xscroll_;} int yscroll() const {return yscroll_;} public: - void resize(int, int, int, int); + FL_EXPORT void resize(int, int, int, int); - Fl_Input_(int, int, int, int, const char* = 0); - ~Fl_Input_(); + FL_EXPORT Fl_Input_(int, int, int, int, const char* = 0); + FL_EXPORT ~Fl_Input_(); - int value(const char*); - int value(const char*, int); - int static_value(const char*); - int static_value(const char*, int); + 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); const char* value() const {return value_;} char index(int i) const {return value_[i];} int size() const {return size_;} @@ -95,17 +95,17 @@ public: int position() const {return position_;} int mark() const {return mark_;} - int position(int p, int m); + FL_EXPORT int position(int p, int m); int position(int p) {return position(p, p);} int mark(int m) {return position(position(), m);} - int replace(int, int, const char*, int=0); + FL_EXPORT 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);} - int copy(); - int undo(); - int copy_cuts(); + FL_EXPORT int copy(); + FL_EXPORT int undo(); + FL_EXPORT int copy_cuts(); Fl_Font textfont() const {return (Fl_Font)textfont_;} void textfont(uchar s) {textfont_ = s;} @@ -120,5 +120,5 @@ public: #endif // -// End of "$Id: Fl_Input_.H,v 1.5 1999/01/07 19:16:56 mike Exp $". +// End of "$Id: Fl_Input_.H,v 1.6 1999/02/16 21:59:38 mike Exp $". // diff --git a/FL/Fl_Light_Button.H b/FL/Fl_Light_Button.H index b9dd25fc3..15c9db028 100644 --- a/FL/Fl_Light_Button.H +++ b/FL/Fl_Light_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Light_Button.H,v 1.4 1999/01/07 19:16:56 mike Exp $" +// "$Id: Fl_Light_Button.H,v 1.5 1999/02/16 21:59:39 mike Exp $" // // Lighted button header file for the Fast Light Tool Kit (FLTK). // @@ -30,14 +30,14 @@ class Fl_Light_Button : public Fl_Button { protected: - virtual void draw(); + virtual FL_EXPORT void draw(); public: - virtual int handle(int); - Fl_Light_Button(int x,int y,int w,int h,const char *l = 0); + virtual FL_EXPORT int handle(int); + FL_EXPORT 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.4 1999/01/07 19:16:56 mike Exp $". +// End of "$Id: Fl_Light_Button.H,v 1.5 1999/02/16 21:59:39 mike Exp $". // diff --git a/FL/Fl_Menu_.H b/FL/Fl_Menu_.H index b5c21acf2..ec85ac62a 100644 --- a/FL/Fl_Menu_.H +++ b/FL/Fl_Menu_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_.H,v 1.6 1999/02/03 08:43:30 bill Exp $" +// "$Id: Fl_Menu_.H,v 1.7 1999/02/16 21:59:39 mike Exp $" // // Menu base class header file for the Fast Light Tool Kit (FLTK). // @@ -38,7 +38,7 @@ class Fl_Menu_ : public Fl_Widget { protected: - const Fl_Menu_Item* picked(const Fl_Menu_Item*); + FL_EXPORT const Fl_Menu_Item* picked(const Fl_Menu_Item*); uchar down_box_; uchar textfont_; uchar textsize_; @@ -47,30 +47,30 @@ protected: public: - Fl_Menu_(int,int,int,int,const char * =0); - ~Fl_Menu_(); + FL_EXPORT Fl_Menu_(int,int,int,int,const char * =0); + FL_EXPORT ~Fl_Menu_(); const Fl_Menu_Item* test_shortcut() {return picked(menu()->test_shortcut());} - void global(); + FL_EXPORT void global(); const Fl_Menu_Item *menu() const {return menu_;} - 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); + 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); 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);} - int size() const ; - void clear(); - int add(const char *); - void replace(int,const char *); - void remove(int); + 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); void shortcut(int i, int s) {menu_[i].shortcut(s);} void mode(int i,int x) {menu_[i].flags = x;} int mode(int i) const {return menu_[i].flags;} const Fl_Menu_Item *mvalue() const {return value_;} int value() const {return value_-menu_;} - int value(const Fl_Menu_Item*); + FL_EXPORT 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.6 1999/02/03 08:43:30 bill Exp $". +// End of "$Id: Fl_Menu_.H,v 1.7 1999/02/16 21:59:39 mike Exp $". // diff --git a/FL/Fl_Menu_Bar.H b/FL/Fl_Menu_Bar.H index 3d46d24a8..389a4d4db 100644 --- a/FL/Fl_Menu_Bar.H +++ b/FL/Fl_Menu_Bar.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Bar.H,v 1.4 1999/01/07 19:16:57 mike Exp $" +// "$Id: Fl_Menu_Bar.H,v 1.5 1999/02/16 21:59:39 mike Exp $" // // Menu bar header file for the Fast Light Tool Kit (FLTK). // @@ -30,8 +30,8 @@ class Fl_Menu_Bar : public Fl_Menu_ { protected: - int handle(int); - void draw(); + FL_EXPORT int handle(int); + FL_EXPORT void draw(); public: 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.4 1999/01/07 19:16:57 mike Exp $". +// End of "$Id: Fl_Menu_Bar.H,v 1.5 1999/02/16 21:59:39 mike Exp $". // diff --git a/FL/Fl_Menu_Button.H b/FL/Fl_Menu_Button.H index fa0da0af6..4604ed816 100644 --- a/FL/Fl_Menu_Button.H +++ b/FL/Fl_Menu_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Button.H,v 1.4 1999/01/07 19:16:57 mike Exp $" +// "$Id: Fl_Menu_Button.H,v 1.5 1999/02/16 21:59:40 mike Exp $" // // Menu button header file for the Fast Light Tool Kit (FLTK). // @@ -30,17 +30,17 @@ class Fl_Menu_Button : public Fl_Menu_ { protected: - void draw(); + FL_EXPORT void draw(); public: // values for type: enum {POPUP1 = 1, POPUP2, POPUP12, POPUP3, POPUP13, POPUP23, POPUP123}; - int handle(int); - const Fl_Menu_Item* popup(); - Fl_Menu_Button(int,int,int,int,const char * =0); + FL_EXPORT int handle(int); + FL_EXPORT const Fl_Menu_Item* popup(); + FL_EXPORT Fl_Menu_Button(int,int,int,int,const char * =0); }; #endif // -// End of "$Id: Fl_Menu_Button.H,v 1.4 1999/01/07 19:16:57 mike Exp $". +// End of "$Id: Fl_Menu_Button.H,v 1.5 1999/02/16 21:59:40 mike Exp $". // diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H index 45733792d..1b27f5b57 100644 --- a/FL/Fl_Menu_Item.H +++ b/FL/Fl_Menu_Item.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Item.H,v 1.4 1999/01/07 19:16:58 mike Exp $" +// "$Id: Fl_Menu_Item.H,v 1.5 1999/02/16 21:59:40 mike Exp $" // // Menu item header file for the Fast Light Tool Kit (FLTK). // @@ -43,7 +43,7 @@ enum { // values for flags: FL_MENU_HORIZONTAL = 0x100 }; -extern int fl_old_shortcut(const char*); +extern FL_EXPORT int fl_old_shortcut(const char*); class Fl_Menu_; @@ -59,7 +59,7 @@ struct Fl_Menu_Item { uchar labelcolor_; // advance N items, skipping submenus: - const Fl_Menu_Item *next(int=1) const; + FL_EXPORT 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));} @@ -92,7 +92,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;} - void setonly(); + FL_EXPORT void setonly(); int visible() const {return !(flags&FL_MENU_INVISIBLE);} void show() {flags &= ~FL_MENU_INVISIBLE;} void hide() {flags |= FL_MENU_INVISIBLE;} @@ -102,23 +102,23 @@ struct Fl_Menu_Item { int activevisible() const {return !(flags&0x11);} // used by menubar: - 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; + 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; // popup menus without using an Fl_Menu_ widget: - const Fl_Menu_Item* popup( + FL_EXPORT const Fl_Menu_Item* popup( int X, int Y, const char *title = 0, const Fl_Menu_Item* picked=0, const Fl_Menu_* = 0) const; - const Fl_Menu_Item* pulldown( + FL_EXPORT 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; - const Fl_Menu_Item* test_shortcut() const; - const Fl_Menu_Item* find_shortcut(int *ip=0) const; + FL_EXPORT const Fl_Menu_Item* test_shortcut() const; + FL_EXPORT 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);} @@ -128,11 +128,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;} - int add(const char*, int shortcut, Fl_Callback*, void* =0, int = 0); + FL_EXPORT 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);} - int size() const ; + FL_EXPORT int size() const ; }; typedef Fl_Menu_Item Fl_Menu; // back compatability @@ -153,5 +153,5 @@ enum { // back-compatability enum: #endif // -// End of "$Id: Fl_Menu_Item.H,v 1.4 1999/01/07 19:16:58 mike Exp $". +// End of "$Id: Fl_Menu_Item.H,v 1.5 1999/02/16 21:59:40 mike Exp $". // diff --git a/FL/Fl_Menu_Window.H b/FL/Fl_Menu_Window.H index e6ecf7221..53c14abca 100644 --- a/FL/Fl_Menu_Window.H +++ b/FL/Fl_Menu_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Window.H,v 1.4 1999/01/07 19:16:58 mike Exp $" +// "$Id: Fl_Menu_Window.H,v 1.5 1999/02/16 21:59:40 mike Exp $" // // Menu window header file for the Fast Light Tool Kit (FLTK). // @@ -31,14 +31,14 @@ class Fl_Menu_Window : public Fl_Single_Window { enum {NO_OVERLAY = 128}; public: - void show(); - void erase(); - void flush(); - void hide(); + FL_EXPORT void show(); + FL_EXPORT void erase(); + FL_EXPORT void flush(); + FL_EXPORT void hide(); int overlay() {return !(flags()&NO_OVERLAY);} void set_overlay() {clear_flag(NO_OVERLAY);} void clear_overlay() {set_flag(NO_OVERLAY);} - ~Fl_Menu_Window(); + FL_EXPORT ~Fl_Menu_Window(); Fl_Menu_Window(int W, int H, const char *l = 0) : Fl_Single_Window(W,H,l) {} 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.4 1999/01/07 19:16:58 mike Exp $". +// End of "$Id: Fl_Menu_Window.H,v 1.5 1999/02/16 21:59:40 mike Exp $". // diff --git a/FL/Fl_Multi_Label.H b/FL/Fl_Multi_Label.H index 42c4fe338..c26aec584 100644 --- a/FL/Fl_Multi_Label.H +++ b/FL/Fl_Multi_Label.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Multi_Label.H,v 1.4 1999/01/07 19:16:58 mike Exp $" +// "$Id: Fl_Multi_Label.H,v 1.5 1999/02/16 21:59:40 mike Exp $" // // Multi-label header file for the Fast Light Tool Kit (FLTK). // @@ -34,12 +34,12 @@ struct Fl_Multi_Label { const char* labelb; uchar typea; uchar typeb; - void label(Fl_Widget*); - void label(Fl_Menu_Item*); + FL_EXPORT void label(Fl_Widget*); + FL_EXPORT void label(Fl_Menu_Item*); }; #endif // -// End of "$Id: Fl_Multi_Label.H,v 1.4 1999/01/07 19:16:58 mike Exp $". +// End of "$Id: Fl_Multi_Label.H,v 1.5 1999/02/16 21:59:40 mike Exp $". // diff --git a/FL/Fl_Output.H b/FL/Fl_Output.H index 99b2ae41b..771889677 100644 --- a/FL/Fl_Output.H +++ b/FL/Fl_Output.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Output.H,v 1.4 1999/01/07 19:16:59 mike Exp $" +// "$Id: Fl_Output.H,v 1.5 1999/02/16 21:59:41 mike Exp $" // // Output header file for the Fast Light Tool Kit (FLTK). // @@ -30,9 +30,9 @@ class Fl_Output : public Fl_Input_ { protected: - void draw(); + FL_EXPORT void draw(); public: - int handle(int); + FL_EXPORT int handle(int); Fl_Output(int x, int y, int w, int h, const char *l = 0) : Fl_Input_(x, y, w, h, l) {} }; @@ -40,5 +40,5 @@ public: #endif // -// End of "$Id: Fl_Output.H,v 1.4 1999/01/07 19:16:59 mike Exp $". +// End of "$Id: Fl_Output.H,v 1.5 1999/02/16 21:59:41 mike Exp $". // diff --git a/FL/Fl_Overlay_Window.H b/FL/Fl_Overlay_Window.H index 34ad1aed0..0406088e0 100644 --- a/FL/Fl_Overlay_Window.H +++ b/FL/Fl_Overlay_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Overlay_Window.H,v 1.4 1999/01/07 19:16:59 mike Exp $" +// "$Id: Fl_Overlay_Window.H,v 1.5 1999/02/16 21:59:41 mike Exp $" // // Overlay window header file for the Fast Light Tool Kit (FLTK). // @@ -30,16 +30,16 @@ class Fl_Overlay_Window : public Fl_Double_Window { friend class _Fl_Overlay; - virtual void draw_overlay() = 0; + virtual FL_EXPORT void draw_overlay() = 0; Fl_Window *overlay_; public: - void show(); - void flush(); - void hide(); - void resize(int,int,int,int); - ~Fl_Overlay_Window(); - int can_do_overlay(); - void redraw_overlay(); + 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(); Fl_Overlay_Window(int W, int H, const char *l=0) : Fl_Double_Window(W,H,l) {overlay_ = 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.4 1999/01/07 19:16:59 mike Exp $". +// End of "$Id: Fl_Overlay_Window.H,v 1.5 1999/02/16 21:59:41 mike Exp $". // diff --git a/FL/Fl_Pack.H b/FL/Fl_Pack.H index adbd39f4a..906a4c2e8 100644 --- a/FL/Fl_Pack.H +++ b/FL/Fl_Pack.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Pack.H,v 1.4 1999/01/07 19:16:59 mike Exp $" +// "$Id: Fl_Pack.H,v 1.5 1999/02/16 21:59:41 mike Exp $" // // Pack header file for the Fast Light Tool Kit (FLTK). // @@ -35,8 +35,8 @@ public: VERTICAL = 0, HORIZONTAL = 1 }; - void draw(); - Fl_Pack(int x,int y,int w ,int h,const char *l = 0); + FL_EXPORT void draw(); + FL_EXPORT 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.4 1999/01/07 19:16:59 mike Exp $". +// End of "$Id: Fl_Pack.H,v 1.5 1999/02/16 21:59:41 mike Exp $". // diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index f0d4078e9..8c4dbb145 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Pixmap.H,v 1.5 1999/01/07 19:17:00 mike Exp $" +// "$Id: Fl_Pixmap.H,v 1.6 1999/02/16 21:59:41 mike Exp $" // // Pixmap header file for the Fast Light Tool Kit (FLTK). // @@ -36,15 +36,15 @@ struct Fl_Pixmap { ulong mask; // for internal use (mask bitmap) Fl_Pixmap(/*const*/char * const * d) : data(d), w(-1), h(0), id(0),mask(0) {} Fl_Pixmap(/*const*/uchar* const * d) : data((char**)d), w(-1), h(0), id(0),mask(0) {} - ~Fl_Pixmap(); - void label(Fl_Widget*); - void label(Fl_Menu_Item*); - void draw(int X, int Y, int W, int H, int cx=0, int cy=0); + FL_EXPORT ~Fl_Pixmap(); + FL_EXPORT void label(Fl_Widget*); + FL_EXPORT void label(Fl_Menu_Item*); + FL_EXPORT void draw(int X, int Y, int W, int H, int cx=0, int cy=0); void draw(int X, int Y) {draw(X, Y, w, h, 0, 0);} }; #endif // -// End of "$Id: Fl_Pixmap.H,v 1.5 1999/01/07 19:17:00 mike Exp $". +// End of "$Id: Fl_Pixmap.H,v 1.6 1999/02/16 21:59:41 mike Exp $". // diff --git a/FL/Fl_Positioner.H b/FL/Fl_Positioner.H index b1938a920..f229deaea 100644 --- a/FL/Fl_Positioner.H +++ b/FL/Fl_Positioner.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Positioner.H,v 1.4 1999/01/07 19:17:00 mike Exp $" +// "$Id: Fl_Positioner.H,v 1.5 1999/02/16 21:59:42 mike Exp $" // // Positioner header file for the Fast Light Tool Kit (FLTK). // @@ -40,25 +40,25 @@ class Fl_Positioner : public Fl_Widget { protected: // these allow subclasses to put the dial in a smaller area: - void draw(int, int, int, int); - int handle(int, int, int, int, int); - void draw(); + FL_EXPORT void draw(int, int, int, int); + FL_EXPORT int handle(int, int, int, int, int); + FL_EXPORT void draw(); public: - int handle(int); - Fl_Positioner(int x,int y,int w,int h, const char *l=0); + FL_EXPORT int handle(int); + FL_EXPORT Fl_Positioner(int x,int y,int w,int h, const char *l=0); double xvalue() const {return xvalue_;} double yvalue() const {return yvalue_;} - int xvalue(double); - int yvalue(double); - int value(double,double); - void xbounds(double, double); + FL_EXPORT int xvalue(double); + FL_EXPORT int yvalue(double); + FL_EXPORT int value(double,double); + FL_EXPORT 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);} - void ybounds(double, double); + FL_EXPORT 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.4 1999/01/07 19:17:00 mike Exp $". +// End of "$Id: Fl_Positioner.H,v 1.5 1999/02/16 21:59:42 mike Exp $". // diff --git a/FL/Fl_Repeat_Button.H b/FL/Fl_Repeat_Button.H index b2a7b5a6d..ccbc98b32 100644 --- a/FL/Fl_Repeat_Button.H +++ b/FL/Fl_Repeat_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Repeat_Button.H,v 1.4 1999/01/07 19:17:01 mike Exp $" +// "$Id: Fl_Repeat_Button.H,v 1.5 1999/02/16 21:59:42 mike Exp $" // // Repeat button header file for the Fast Light Tool Kit (FLTK). // @@ -28,9 +28,9 @@ #include "Fl_Button.H" class Fl_Repeat_Button : public Fl_Button { - static void repeat_callback(void *); + static FL_EXPORT void repeat_callback(void *); public: - int handle(int); + FL_EXPORT 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) {} }; @@ -38,5 +38,5 @@ public: #endif // -// End of "$Id: Fl_Repeat_Button.H,v 1.4 1999/01/07 19:17:01 mike Exp $". +// End of "$Id: Fl_Repeat_Button.H,v 1.5 1999/02/16 21:59:42 mike Exp $". // diff --git a/FL/Fl_Return_Button.H b/FL/Fl_Return_Button.H index f68bc9e59..de34f1180 100644 --- a/FL/Fl_Return_Button.H +++ b/FL/Fl_Return_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Return_Button.H,v 1.4 1999/01/07 19:17:01 mike Exp $" +// "$Id: Fl_Return_Button.H,v 1.5 1999/02/16 21:59:43 mike Exp $" // // Return button header file for the Fast Light Tool Kit (FLTK). // @@ -29,9 +29,9 @@ class Fl_Return_Button : public Fl_Button { protected: - void draw(); + FL_EXPORT void draw(); public: - int handle(int); + FL_EXPORT 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.4 1999/01/07 19:17:01 mike Exp $". +// End of "$Id: Fl_Return_Button.H,v 1.5 1999/02/16 21:59:43 mike Exp $". // diff --git a/FL/Fl_Roller.H b/FL/Fl_Roller.H index 094edb817..a0484bdec 100644 --- a/FL/Fl_Roller.H +++ b/FL/Fl_Roller.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Roller.H,v 1.4 1999/01/07 19:17:01 mike Exp $" +// "$Id: Fl_Roller.H,v 1.5 1999/02/16 21:59:43 mike Exp $" // // Roller header file for the Fast Light Tool Kit (FLTK). // @@ -31,14 +31,14 @@ #endif class Fl_Roller : public Fl_Valuator { - void draw(); + FL_EXPORT void draw(); public: - int handle(int); - Fl_Roller(int X,int Y,int W,int H,const char* L=0); + FL_EXPORT int handle(int); + FL_EXPORT Fl_Roller(int X,int Y,int W,int H,const char* L=0); }; #endif // -// End of "$Id: Fl_Roller.H,v 1.4 1999/01/07 19:17:01 mike Exp $". +// End of "$Id: Fl_Roller.H,v 1.5 1999/02/16 21:59:43 mike Exp $". // diff --git a/FL/Fl_Round_Button.H b/FL/Fl_Round_Button.H index 430dd80f4..5e923f219 100644 --- a/FL/Fl_Round_Button.H +++ b/FL/Fl_Round_Button.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Round_Button.H,v 1.4 1999/01/07 19:17:01 mike Exp $" +// "$Id: Fl_Round_Button.H,v 1.5 1999/02/16 21:59:43 mike Exp $" // // Round button header file for the Fast Light Tool Kit (FLTK). // @@ -30,11 +30,11 @@ class Fl_Round_Button : public Fl_Light_Button { public: - Fl_Round_Button(int x,int y,int w,int h,const char *l = 0); + FL_EXPORT 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.4 1999/01/07 19:17:01 mike Exp $". +// End of "$Id: Fl_Round_Button.H,v 1.5 1999/02/16 21:59:43 mike Exp $". // diff --git a/FL/Fl_Scroll.H b/FL/Fl_Scroll.H index 3bcdacff9..d7d122fe4 100644 --- a/FL/Fl_Scroll.H +++ b/FL/Fl_Scroll.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Scroll.H,v 1.4 1999/01/07 19:17:02 mike Exp $" +// "$Id: Fl_Scroll.H,v 1.5 1999/02/16 21:59:44 mike Exp $" // // Scroll header file for the Fast Light Tool Kit (FLTK). // @@ -34,25 +34,25 @@ class Fl_Scroll : public Fl_Group { int xposition_, yposition_; int width_, height_; int oldx, oldy; - 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&); + 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&); protected: - void draw(); + FL_EXPORT void draw(); public: Fl_Scrollbar scrollbar; Fl_Scrollbar hscrollbar; - void resize(int,int,int,int); - int handle(int); + FL_EXPORT void resize(int,int,int,int); + FL_EXPORT int handle(int); - Fl_Scroll(int X,int Y,int W,int H,const char*l=0); + FL_EXPORT 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_;} - void position(int, int); + FL_EXPORT void position(int, int); }; #endif // -// End of "$Id: Fl_Scroll.H,v 1.4 1999/01/07 19:17:02 mike Exp $". +// End of "$Id: Fl_Scroll.H,v 1.5 1999/02/16 21:59:44 mike Exp $". // diff --git a/FL/Fl_Scrollbar.H b/FL/Fl_Scrollbar.H index f6a62eaeb..4b92c4825 100644 --- a/FL/Fl_Scrollbar.H +++ b/FL/Fl_Scrollbar.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Scrollbar.H,v 1.4 1999/01/07 19:17:02 mike Exp $" +// "$Id: Fl_Scrollbar.H,v 1.5 1999/02/16 21:59:44 mike Exp $" // // Scroll bar header file for the Fast Light Tool Kit (FLTK). // @@ -32,14 +32,14 @@ class Fl_Scrollbar : public Fl_Slider { int linesize_; int pushed_; - void draw(); - int handle(int); - static void timeout_cb(void*); - void increment_cb(); + FL_EXPORT void draw(); + FL_EXPORT int handle(int); + static FL_EXPORT void timeout_cb(void*); + FL_EXPORT void increment_cb(); public: - Fl_Scrollbar(int x,int y,int w,int h, const char *l = 0); + FL_EXPORT Fl_Scrollbar(int x,int y,int w,int h, const char *l = 0); int value() {return int(Fl_Slider::value());} int value(int position, int size, int top, int total) { @@ -53,5 +53,5 @@ public: #endif // -// End of "$Id: Fl_Scrollbar.H,v 1.4 1999/01/07 19:17:02 mike Exp $". +// End of "$Id: Fl_Scrollbar.H,v 1.5 1999/02/16 21:59:44 mike Exp $". // diff --git a/FL/Fl_Single_Window.H b/FL/Fl_Single_Window.H index 17be9a98f..1a68f1dc0 100644 --- a/FL/Fl_Single_Window.H +++ b/FL/Fl_Single_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Single_Window.H,v 1.4 1999/01/07 19:17:03 mike Exp $" +// "$Id: Fl_Single_Window.H,v 1.5 1999/02/16 21:59:44 mike Exp $" // // Single-buffered window header file for the Fast Light Tool Kit (FLTK). // @@ -30,9 +30,9 @@ class Fl_Single_Window : public Fl_Window { public: - void show(); + FL_EXPORT void show(); void show(int a, char **b) {Fl_Window::show(a,b);} - void flush(); + FL_EXPORT 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.4 1999/01/07 19:17:03 mike Exp $". +// End of "$Id: Fl_Single_Window.H,v 1.5 1999/02/16 21:59:44 mike Exp $". // diff --git a/FL/Fl_Slider.H b/FL/Fl_Slider.H index c62e372ad..3516ba6d3 100644 --- a/FL/Fl_Slider.H +++ b/FL/Fl_Slider.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Slider.H,v 1.4 1999/01/07 19:17:03 mike Exp $" +// "$Id: Fl_Slider.H,v 1.5 1999/02/16 21:59:44 mike Exp $" // // Slider header file for the Fast Light Tool Kit (FLTK). // @@ -42,26 +42,26 @@ class Fl_Slider : public Fl_Valuator { float slider_size_; uchar slider_; - void _Fl_Slider(); - void draw_bg(int, int, int, int); + FL_EXPORT void _Fl_Slider(); + FL_EXPORT void draw_bg(int, int, int, int); protected: // these allow subclasses to put the slider in a smaller area: - void draw(int, int, int, int); - int handle(int, int, int, int, int); + FL_EXPORT void draw(int, int, int, int); + FL_EXPORT int handle(int, int, int, int, int); public: - void draw(); - int handle(int); - Fl_Slider(int x,int y,int w,int h, const char *l = 0); - Fl_Slider(uchar t,int x,int y,int w,int h, const char *l); + FL_EXPORT void draw(); + FL_EXPORT int handle(int); + FL_EXPORT Fl_Slider(int x,int y,int w,int h, const char *l = 0); + FL_EXPORT Fl_Slider(uchar t,int x,int y,int w,int h, const char *l); - int scrollvalue(int windowtop,int windowsize,int first,int totalsize); - void bounds(double a, double b); + FL_EXPORT int scrollvalue(int windowtop,int windowsize,int first,int totalsize); + FL_EXPORT void bounds(double a, double b); float slider_size() const {return slider_size_;} - void slider_size(double v); + FL_EXPORT void slider_size(double v); Fl_Boxtype slider() const {return (Fl_Boxtype)slider_;} void slider(Fl_Boxtype c) {slider_ = c;} }; @@ -69,5 +69,5 @@ public: #endif // -// End of "$Id: Fl_Slider.H,v 1.4 1999/01/07 19:17:03 mike Exp $". +// End of "$Id: Fl_Slider.H,v 1.5 1999/02/16 21:59:44 mike Exp $". // diff --git a/FL/Fl_Tabs.H b/FL/Fl_Tabs.H index e1a18eb1a..635be19f3 100644 --- a/FL/Fl_Tabs.H +++ b/FL/Fl_Tabs.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tabs.H,v 1.4 1999/01/07 19:17:03 mike Exp $" +// "$Id: Fl_Tabs.H,v 1.5 1999/02/16 21:59:45 mike Exp $" // // Tab header file for the Fast Light Tool Kit (FLTK). // @@ -31,22 +31,22 @@ class Fl_Tabs : public Fl_Group { Fl_Widget *value_; Fl_Widget *push_; - void draw(); - 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); + FL_EXPORT void draw(); + 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); public: - int handle(int); - Fl_Widget *value(); - int value(Fl_Widget *); + FL_EXPORT int handle(int); + FL_EXPORT Fl_Widget *value(); + FL_EXPORT int value(Fl_Widget *); Fl_Widget *push() const {return push_;} - int push(Fl_Widget *); - Fl_Tabs(int,int,int,int,const char * = 0); - Fl_Widget *which(int event_x, int event_y); + 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); }; #endif // -// End of "$Id: Fl_Tabs.H,v 1.4 1999/01/07 19:17:03 mike Exp $". +// End of "$Id: Fl_Tabs.H,v 1.5 1999/02/16 21:59:45 mike Exp $". // diff --git a/FL/Fl_Tile.H b/FL/Fl_Tile.H index d32c4f343..f390561e3 100644 --- a/FL/Fl_Tile.H +++ b/FL/Fl_Tile.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tile.H,v 1.5 1999/01/13 15:37:59 mike Exp $" +// "$Id: Fl_Tile.H,v 1.6 1999/02/16 21:59:45 mike Exp $" // // Tile header file for the Fast Light Tool Kit (FLTK). // @@ -30,14 +30,14 @@ class Fl_Tile : public Fl_Group { public: - int handle(int); + FL_EXPORT int handle(int); Fl_Tile(int X,int Y,int W,int H,const char*l=0) : Fl_Group(X,Y,W,H,l) {} - void resize(int, int, int, int); - void position(int, int, int, int); + FL_EXPORT void resize(int, int, int, int); + FL_EXPORT void position(int, int, int, int); }; #endif // -// End of "$Id: Fl_Tile.H,v 1.5 1999/01/13 15:37:59 mike Exp $". +// End of "$Id: Fl_Tile.H,v 1.6 1999/02/16 21:59:45 mike Exp $". // diff --git a/FL/Fl_Timer.H b/FL/Fl_Timer.H index 190403dcc..572500bb2 100644 --- a/FL/Fl_Timer.H +++ b/FL/Fl_Timer.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Timer.H,v 1.4 1999/01/07 19:17:03 mike Exp $" +// "$Id: Fl_Timer.H,v 1.5 1999/02/16 21:59:45 mike Exp $" // // Timer header file for the Fast Light Tool Kit (FLTK). // @@ -36,28 +36,28 @@ #define FL_HIDDEN_TIMER 2 class Fl_Timer : public Fl_Widget { - static void stepcb(void *); - void step(); + static FL_EXPORT void stepcb(void *); + FL_EXPORT void step(); char on, direction_; double delay, total; long lastsec,lastusec; protected: - void draw(); + FL_EXPORT void draw(); public: - int handle(int); - Fl_Timer(uchar t,int x,int y,int w,int h, const char *l); - ~Fl_Timer(); - void value(double); + 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); 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;} - void suspended(char d); + FL_EXPORT void suspended(char d); }; #endif // -// End of "$Id: Fl_Timer.H,v 1.4 1999/01/07 19:17:03 mike Exp $". +// End of "$Id: Fl_Timer.H,v 1.5 1999/02/16 21:59:45 mike Exp $". // diff --git a/FL/Fl_Valuator.H b/FL/Fl_Valuator.H index 9811f2d17..5597056bf 100644 --- a/FL/Fl_Valuator.H +++ b/FL/Fl_Valuator.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Valuator.H,v 1.4 1999/01/07 19:17:04 mike Exp $" +// "$Id: Fl_Valuator.H,v 1.5 1999/02/16 21:59:45 mike Exp $" // // Valuator header file for the Fast Light Tool Kit (FLTK). // @@ -44,14 +44,14 @@ class Fl_Valuator : public Fl_Widget { protected: int horizontal() const {return type()&1;} - Fl_Valuator(int X, int Y, int W, int H, const char* L); + FL_EXPORT Fl_Valuator(int X, int Y, int W, int H, const char* L); double previous_value() const {return previous_value_;} void handle_push() {previous_value_ = value_;} - double softclamp(double); - void handle_drag(double newvalue); - void handle_release(); // use drag() value - virtual void value_damage(); // cause damage() due to value() changing + FL_EXPORT double softclamp(double); + FL_EXPORT void handle_drag(double newvalue); + FL_EXPORT void handle_release(); // use drag() value + virtual FL_EXPORT void value_damage(); // cause damage() due to value() changing public: @@ -63,21 +63,21 @@ public: void range(double a, double b) {min = a; max = b;} void step(int a) {A = a; B = 1;} void step(double a, int b) {A = a; B = b;} - void step(double s); + FL_EXPORT void step(double s); double step() const {return A/B;} - void precision(int); + FL_EXPORT void precision(int); double value() const {return value_;} - int value(double); + FL_EXPORT int value(double); virtual int format(char*); - double round(double); // round to nearest multiple of step - double clamp(double); // keep in range - double increment(double, int); // add n*step to value + FL_EXPORT double round(double); // round to nearest multiple of step + FL_EXPORT double clamp(double); // keep in range + FL_EXPORT double increment(double, int); // add n*step to value }; #endif // -// End of "$Id: Fl_Valuator.H,v 1.4 1999/01/07 19:17:04 mike Exp $". +// End of "$Id: Fl_Valuator.H,v 1.5 1999/02/16 21:59:45 mike Exp $". // diff --git a/FL/Fl_Value_Input.H b/FL/Fl_Value_Input.H index bc4ad5a9c..68df2bcdc 100644 --- a/FL/Fl_Value_Input.H +++ b/FL/Fl_Value_Input.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Value_Input.H,v 1.4 1999/01/07 19:17:04 mike Exp $" +// "$Id: Fl_Value_Input.H,v 1.5 1999/02/16 21:59:46 mike Exp $" // // Value input header file for the Fast Light Tool Kit (FLTK). // @@ -34,13 +34,13 @@ public: Fl_Input input; private: char soft_; - static void input_cb(Fl_Widget*,void*); - virtual void value_damage(); // cause damage() due to value() changing + static FL_EXPORT void input_cb(Fl_Widget*,void*); + virtual FL_EXPORT void value_damage(); // cause damage() due to value() changing public: - 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); + 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); void soft(char x) {soft_ = x;} char soft() const {return soft_;} @@ -59,5 +59,5 @@ public: #endif // -// End of "$Id: Fl_Value_Input.H,v 1.4 1999/01/07 19:17:04 mike Exp $". +// End of "$Id: Fl_Value_Input.H,v 1.5 1999/02/16 21:59:46 mike Exp $". // diff --git a/FL/Fl_Value_Output.H b/FL/Fl_Value_Output.H index 2beda7176..19892d1e7 100644 --- a/FL/Fl_Value_Output.H +++ b/FL/Fl_Value_Output.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Value_Output.H,v 1.4 1999/01/07 19:17:04 mike Exp $" +// "$Id: Fl_Value_Output.H,v 1.5 1999/02/16 21:59:46 mike Exp $" // // Value output header file for the Fast Light Tool Kit (FLTK). // @@ -33,9 +33,9 @@ class Fl_Value_Output : public Fl_Valuator { uchar textfont_, textsize_, textcolor_, soft_; public: - int handle(int); - void draw(); - Fl_Value_Output(int x,int y,int w,int h,const char *l=0); + 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); void soft(uchar x) {soft_ = x;} uchar soft() const {return soft_;} @@ -51,5 +51,5 @@ public: #endif // -// End of "$Id: Fl_Value_Output.H,v 1.4 1999/01/07 19:17:04 mike Exp $". +// End of "$Id: Fl_Value_Output.H,v 1.5 1999/02/16 21:59:46 mike Exp $". // diff --git a/FL/Fl_Value_Slider.H b/FL/Fl_Value_Slider.H index 36b1922a9..774c61aea 100644 --- a/FL/Fl_Value_Slider.H +++ b/FL/Fl_Value_Slider.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Value_Slider.H,v 1.4 1999/01/07 19:17:05 mike Exp $" +// "$Id: Fl_Value_Slider.H,v 1.5 1999/02/16 21:59:46 mike Exp $" // // Value slider header file for the Fast Light Tool Kit (FLTK). // @@ -31,9 +31,9 @@ class Fl_Value_Slider : public Fl_Slider { uchar textfont_, textsize_, textcolor_; public: - void draw(); - int handle(int); - Fl_Value_Slider(int x,int y,int w,int h, const char *l = 0); + 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); Fl_Font textfont() const {return (Fl_Font)textfont_;} void textfont(uchar s) {textfont_ = s;} uchar textsize() const {return textsize_;} @@ -45,5 +45,5 @@ public: #endif // -// End of "$Id: Fl_Value_Slider.H,v 1.4 1999/01/07 19:17:05 mike Exp $". +// End of "$Id: Fl_Value_Slider.H,v 1.5 1999/02/16 21:59:46 mike Exp $". // diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index f7dd44225..deebeb6f6 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Widget.H,v 1.5 1999/01/07 19:17:05 mike Exp $" +// "$Id: Fl_Widget.H,v 1.6 1999/02/16 21:59:46 mike Exp $" // // Widget header file for the Fast Light Tool Kit (FLTK). // @@ -41,8 +41,8 @@ struct Fl_Label { uchar font; uchar size; uchar color; - void draw(int,int,int,int, Fl_Align) const ; - void measure(int&, int&) const ; + FL_EXPORT void draw(int,int,int,int, Fl_Align) const ; + FL_EXPORT void measure(int&, int&) const ; }; class Fl_Widget { @@ -64,11 +64,11 @@ class Fl_Widget { // "de-implement" the copy constructors: Fl_Widget & operator=(const Fl_Widget &); - Fl_Widget(const Fl_Widget &); + FL_EXPORT Fl_Widget(const Fl_Widget &); protected: - Fl_Widget(int,int,int,int,const char* =0); + FL_EXPORT Fl_Widget(int,int,int,int,const char* =0); void x(int v) {x_ = v;} void y(int v) {y_ = v;} @@ -80,106 +80,106 @@ protected: void clear_flag(int c) {flags_ &= ~c;} enum {INACTIVE=1, INVISIBLE=2, OUTPUT=4, SHORTCUT_LABEL=64, CHANGED=128}; - void draw_box() const; - void draw_box(Fl_Boxtype, Fl_Color) const; - void draw_box(Fl_Boxtype, int,int,int,int, Fl_Color) const; - void draw_label() const; - void draw_label(int, int, int, int) const; + FL_EXPORT void draw_box() const; + FL_EXPORT void draw_box(Fl_Boxtype, Fl_Color) const; + FL_EXPORT void draw_box(Fl_Boxtype, int,int,int,int, Fl_Color) const; + FL_EXPORT void draw_label() const; + FL_EXPORT void draw_label(int, int, int, int) const; public: - virtual ~Fl_Widget(); - - virtual void draw() = 0; - virtual int handle(int); - Fl_Widget* parent() const {return parent_;} - void parent(Fl_Widget* w) {parent_ = w;} // for hacks only - - uchar type() const {return type_;} - void type(uchar t) {type_ = t;} - - int x() const {return x_;} - int y() const {return y_;} - int w() const {return w_;} - int h() const {return h_;} - virtual void resize(int,int,int,int); - int damage_resize(int,int,int,int); - void position(int X,int Y) {resize(X,Y,w_,h_);} - void size(int W,int H) {resize(x_,y_,W,H);} - - Fl_Align align() const {return (Fl_Align)align_;} - void align(uchar a) {align_ = a;} - Fl_Boxtype box() const {return (Fl_Boxtype)box_;} - void box(Fl_Boxtype a) {box_ = a;} - Fl_Color color() const {return (Fl_Color)color_;} - void color(uchar a) {color_ = a;} - Fl_Color selection_color() const {return (Fl_Color)color2_;} - void selection_color(uchar a) {color2_ = a;} - void color(uchar a, uchar b) {color_=a; color2_=b;} - const char* label() const {return label_.value;} - void label(const char* a) {label_.value=a;} - void label(Fl_Labeltype a,const char* b) {label_.type = a; label_.value = b;} - Fl_Labeltype labeltype() const {return (Fl_Labeltype)label_.type;} - void labeltype(Fl_Labeltype a) {label_.type = a;} - Fl_Color labelcolor() const {return (Fl_Color)label_.color;} - void labelcolor(uchar a) {label_.color=a;} - Fl_Font labelfont() const {return (Fl_Font)label_.font;} - void labelfont(uchar a) {label_.font=a;} - uchar labelsize() const {return label_.size;} - void labelsize(uchar a) {label_.size=a;} - Fl_Callback* callback() const {return callback_;} - void callback(Fl_Callback* c, void* p) {callback_=c; user_data_=p;} - void callback(Fl_Callback* c) {callback_=c;} - void callback(Fl_Callback0*c) {callback_=(Fl_Callback*)c;} - void callback(Fl_Callback1*c, long p=0) {callback_=(Fl_Callback*)c; user_data_=(void*)p;} - void* user_data() const {return user_data_;} - void user_data(void* v) {user_data_ = v;} - long argument() const {return (long)user_data_;} - void argument(long v) {user_data_ = (void*)v;} - Fl_When when() const {return (Fl_When)when_;} - void when(uchar i) {when_ = i;} - - int visible() const {return !(flags_&INVISIBLE);} - int visible_r() const; - void show(); - void hide(); - void set_visible() {flags_ &= ~INVISIBLE;} - void clear_visible() {flags_ |= INVISIBLE;} - int active() const {return !(flags_&INACTIVE);} - int active_r() const; - void activate(); - void deactivate(); - int output() const {return (flags_&OUTPUT);} - void set_output() {flags_ |= OUTPUT;} - void clear_output() {flags_ &= ~OUTPUT;} - int takesevents() const {return !(flags_&(INACTIVE|INVISIBLE|OUTPUT));} - int changed() const {return flags_&CHANGED;} - void set_changed() {flags_ |= CHANGED;} - void clear_changed() {flags_ &= ~CHANGED;} - int take_focus(); - - static void default_callback(Fl_Widget*, void*); - void do_callback() {callback_(this,user_data_);} - void do_callback(Fl_Widget* o,void* arg=0) {callback_(o,arg);} - void do_callback(Fl_Widget* o,long arg) {callback_(o,(void*)arg);} - int test_shortcut(); - static int test_shortcut(const char*); - int contains(const Fl_Widget*) const ; - int inside(const Fl_Widget* o) const {return o ? o->contains(this) : 0;} - - void redraw(); - uchar damage() const {return damage_;} - void clear_damage(uchar c = 0) {damage_ = c;} - void damage(uchar c); - void damage(uchar c,int,int,int,int); - void draw_label(int, int, int, int, Fl_Align) const; - void measure_label(int& x, int& y) {label_.measure(x,y);} - - Fl_Window* window() const ; + virtual FL_EXPORT ~Fl_Widget(); + + virtual FL_EXPORT void draw() = 0; + virtual FL_EXPORT int handle(int); + FL_EXPORT Fl_Widget* parent() const {return parent_;} + FL_EXPORT void parent(Fl_Widget* w) {parent_ = w;} // for hacks only + + FL_EXPORT uchar type() const {return type_;} + FL_EXPORT void type(uchar t) {type_ = t;} + + FL_EXPORT int x() const {return x_;} + FL_EXPORT int y() const {return y_;} + FL_EXPORT int w() const {return w_;} + FL_EXPORT int h() const {return h_;} + virtual FL_EXPORT void resize(int,int,int,int); + FL_EXPORT int damage_resize(int,int,int,int); + FL_EXPORT void position(int X,int Y) {resize(X,Y,w_,h_);} + FL_EXPORT void size(int W,int H) {resize(x_,y_,W,H);} + + FL_EXPORT Fl_Align align() const {return (Fl_Align)align_;} + FL_EXPORT void align(uchar a) {align_ = a;} + FL_EXPORT Fl_Boxtype box() const {return (Fl_Boxtype)box_;} + FL_EXPORT void box(Fl_Boxtype a) {box_ = a;} + FL_EXPORT Fl_Color color() const {return (Fl_Color)color_;} + FL_EXPORT void color(uchar a) {color_ = a;} + FL_EXPORT Fl_Color selection_color() const {return (Fl_Color)color2_;} + FL_EXPORT void selection_color(uchar a) {color2_ = a;} + FL_EXPORT void color(uchar a, uchar b) {color_=a; color2_=b;} + FL_EXPORT const char* label() const {return label_.value;} + FL_EXPORT void label(const char* a) {label_.value=a;} + FL_EXPORT void label(Fl_Labeltype a,const char* b) {label_.type = a; label_.value = b;} + FL_EXPORT Fl_Labeltype labeltype() const {return (Fl_Labeltype)label_.type;} + FL_EXPORT void labeltype(Fl_Labeltype a) {label_.type = a;} + FL_EXPORT Fl_Color labelcolor() const {return (Fl_Color)label_.color;} + FL_EXPORT void labelcolor(uchar a) {label_.color=a;} + FL_EXPORT Fl_Font labelfont() const {return (Fl_Font)label_.font;} + FL_EXPORT void labelfont(uchar a) {label_.font=a;} + FL_EXPORT uchar labelsize() const {return label_.size;} + FL_EXPORT void labelsize(uchar a) {label_.size=a;} + FL_EXPORT Fl_Callback* callback() const {return callback_;} + FL_EXPORT void callback(Fl_Callback* c, void* p) {callback_=c; user_data_=p;} + FL_EXPORT void callback(Fl_Callback* c) {callback_=c;} + FL_EXPORT void callback(Fl_Callback0*c) {callback_=(Fl_Callback*)c;} + FL_EXPORT void callback(Fl_Callback1*c, long p=0) {callback_=(Fl_Callback*)c; user_data_=(void*)p;} + FL_EXPORT void* user_data() const {return user_data_;} + FL_EXPORT void user_data(void* v) {user_data_ = v;} + FL_EXPORT long argument() const {return (long)user_data_;} + FL_EXPORT void argument(long v) {user_data_ = (void*)v;} + FL_EXPORT Fl_When when() const {return (Fl_When)when_;} + FL_EXPORT void when(uchar i) {when_ = i;} + + FL_EXPORT int visible() const {return !(flags_&INVISIBLE);} + FL_EXPORT int visible_r() const; + FL_EXPORT void show(); + FL_EXPORT void hide(); + FL_EXPORT void set_visible() {flags_ &= ~INVISIBLE;} + FL_EXPORT void clear_visible() {flags_ |= INVISIBLE;} + FL_EXPORT int active() const {return !(flags_&INACTIVE);} + FL_EXPORT int active_r() const; + FL_EXPORT void activate(); + FL_EXPORT void deactivate(); + FL_EXPORT int output() const {return (flags_&OUTPUT);} + FL_EXPORT void set_output() {flags_ |= OUTPUT;} + FL_EXPORT void clear_output() {flags_ &= ~OUTPUT;} + FL_EXPORT int takesevents() const {return !(flags_&(INACTIVE|INVISIBLE|OUTPUT));} + FL_EXPORT int changed() const {return flags_&CHANGED;} + FL_EXPORT void set_changed() {flags_ |= CHANGED;} + FL_EXPORT void clear_changed() {flags_ &= ~CHANGED;} + FL_EXPORT int take_focus(); + + static FL_EXPORT void default_callback(Fl_Widget*, void*); + FL_EXPORT void do_callback() {callback_(this,user_data_);} + FL_EXPORT void do_callback(Fl_Widget* o,void* arg=0) {callback_(o,arg);} + FL_EXPORT void do_callback(Fl_Widget* o,long arg) {callback_(o,(void*)arg);} + FL_EXPORT int test_shortcut(); + static FL_EXPORT int test_shortcut(const char*); + FL_EXPORT int contains(const Fl_Widget*) const ; + FL_EXPORT int inside(const Fl_Widget* o) const {return o ? o->contains(this) : 0;} + + FL_EXPORT void redraw(); + FL_EXPORT uchar damage() const {return damage_;} + FL_EXPORT void clear_damage(uchar c = 0) {damage_ = c;} + FL_EXPORT void damage(uchar c); + FL_EXPORT void damage(uchar c,int,int,int,int); + FL_EXPORT void draw_label(int, int, int, int, Fl_Align) const; + FL_EXPORT void measure_label(int& x, int& y) {label_.measure(x,y);} + + FL_EXPORT Fl_Window* window() const ; // back compatability only: - Fl_Color color2() const {return (Fl_Color)color2_;} - void color2(uchar a) {color2_ = a;} + FL_EXPORT Fl_Color color2() const {return (Fl_Color)color2_;} + FL_EXPORT void color2(uchar a) {color2_ = a;} }; // reserved type numbers (necessary for my cheapo RTTI) start here. @@ -190,5 +190,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H,v 1.5 1999/01/07 19:17:05 mike Exp $". +// End of "$Id: Fl_Widget.H,v 1.6 1999/02/16 21:59:46 mike Exp $". // diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index c152ccaca..0b6ff2c7a 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Window.H,v 1.10 1999/01/07 19:17:05 mike Exp $" +// "$Id: Fl_Window.H,v 1.11 1999/02/16 21:59:47 mike Exp $" // // Window header file for the Fast Light Tool Kit (FLTK). // @@ -40,7 +40,7 @@ class Fl_Window : public Fl_Group { // size_range stuff: short minw, minh, maxw, maxh; uchar dw, dh, aspect, size_range_set; - void size_range_(); + FL_EXPORT void size_range_(); // values for flags(): enum { FL_MODAL = 64, @@ -48,24 +48,24 @@ class Fl_Window : public Fl_Group { FL_FORCE_POSITION = 16, FL_NON_MODAL = 32 }; - static Fl_Window *current_; - void _Fl_Window(); // constructor innards + static FL_EXPORT Fl_Window *current_; + FL_EXPORT void _Fl_Window(); // constructor innards protected: - virtual void draw(); - virtual void flush(); + virtual FL_EXPORT void draw(); + virtual FL_EXPORT void flush(); public: - Fl_Window(int,int,int,int, const char* = 0); - Fl_Window(int,int, const char* = 0); - virtual ~Fl_Window(); + FL_EXPORT Fl_Window(int,int,int,int, const char* = 0); + FL_EXPORT Fl_Window(int,int, const char* = 0); + virtual FL_EXPORT ~Fl_Window(); - virtual int handle(int); + virtual FL_EXPORT int handle(int); virtual void resize(int,int,int,int); - void border(int b); + FL_EXPORT void border(int b); void clear_border() {set_flag(FL_NOBORDER);} int border() const {return !(flags() & FL_NOBORDER);} void set_modal() {set_flag(FL_MODAL);} @@ -73,8 +73,8 @@ public: void set_non_modal() {set_flag(FL_NON_MODAL);} uchar non_modal() const {return flags() & (FL_NON_MODAL|FL_MODAL);} - void hotspot(int x, int y, int offscreen = 0); - void hotspot(const Fl_Widget*, int offscreen = 0); + FL_EXPORT void hotspot(int x, int y, int offscreen = 0); + FL_EXPORT void hotspot(const Fl_Widget*, int offscreen = 0); void hotspot(const Fl_Widget& p, int offscreen = 0) {hotspot(&p,offscreen);} void free_position() {clear_flag(FL_FORCE_POSITION);} void size_range(int a, int b, int c=0, int d=0, int e=0, int f=0, int g=0) { @@ -82,36 +82,36 @@ public: const char* label() const {return Fl_Widget::label();} const char* iconlabel() const {return iconlabel_;} - void label(const char*); - void iconlabel(const char*); - void label(const char* label, const char* iconlabel); + FL_EXPORT void label(const char*); + FL_EXPORT void iconlabel(const char*); + FL_EXPORT void label(const char* label, const char* iconlabel); const char* xclass() const {return xclass_;} void xclass(const char* c) {xclass_ = c;} const void* icon() const {return icon_;} void icon(const void * i) {icon_ = i;} int shown() {return i != 0;} - virtual void show(); - virtual void hide(); - void show(int, char**); - void fullscreen(); - void fullscreen_off(int,int,int,int); - void iconize(); + virtual FL_EXPORT void show(); + virtual FL_EXPORT void hide(); + FL_EXPORT void show(int, char**); + FL_EXPORT void fullscreen(); + FL_EXPORT void fullscreen_off(int,int,int,int); + FL_EXPORT void iconize(); - int x_root() const ; - int y_root() const ; + FL_EXPORT int x_root() const ; + FL_EXPORT int y_root() const ; static Fl_Window *current() {return current_;} - void make_current(); + FL_EXPORT void make_current(); // for back-compatability only: - void cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); - static void default_callback(Fl_Window*, void* v); + FL_EXPORT void cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); + static FL_EXPORT void default_callback(Fl_Window*, void* v); }; #endif // -// End of "$Id: Fl_Window.H,v 1.10 1999/01/07 19:17:05 mike Exp $". +// End of "$Id: Fl_Window.H,v 1.11 1999/02/16 21:59:47 mike Exp $". // diff --git a/FL/filename.H b/FL/filename.H index 97a87aa69..bfde28f9c 100644 --- a/FL/filename.H +++ b/FL/filename.H @@ -1,5 +1,5 @@ // -// "$Id: filename.H,v 1.5 1999/01/07 19:17:05 mike Exp $" +// "$Id: filename.H,v 1.6 1999/02/16 21:59:47 mike Exp $" // // Filename header file for the Fast Light Tool Kit (FLTK). // @@ -23,17 +23,35 @@ // Please report all bugs and problems to "fltk-bugs@easysw.com". // -#ifndef FL_PATH_MAX +#ifndef FL_FILENAME_H +#define FL_FILENAME_H + +// +// The following is only used when building DLLs under WIN32 or OS/2... +// + +#if defined(WIN32) || defined(__EMX__) +# ifdef FL_DLL +# define FL_EXPORT __declspec(dllexport) +# define FL_IMPORT __declspec(dllimport) +# else +# define FL_EXPORT __declspec(dllimport) +# define FL_IMPORT __declspec(dllexport) +# endif /* FL_DLL */ +#else +# define FL_EXPORT +# define FL_IMPORT +#endif /* WIN32 || __EMX__ */ #define FL_PATH_MAX 256 // all buffers are this length -const char *filename_name(const char *); // return pointer to name -const char *filename_ext(const char *); // return pointer to .ext -char *filename_setext(char *,const char *ext); // clobber .ext -int filename_expand(char *, const char *from); // do $x and ~x -int filename_absolute(char *, const char *from); // prepend getcwd() -int filename_match(const char *, const char *pattern); // glob match -int filename_isdir(const char*); +FL_EXPORT const char *filename_name(const char *); // return pointer to name +FL_EXPORT const char *filename_ext(const char *); // return pointer to .ext +FL_EXPORT char *filename_setext(char *,const char *ext); // clobber .ext +FL_EXPORT int filename_expand(char *, const char *from); // do $x and ~x +FL_EXPORT int filename_absolute(char *, const char *from); // prepend getcwd() +FL_EXPORT int filename_match(const char *, const char *pattern); // glob match +FL_EXPORT int filename_isdir(const char*); // Portable "scandir" function. Ugly but apparently necessary... @@ -56,10 +74,10 @@ struct dirent {char d_name[1];}; #endif -int filename_list(const char *d, struct dirent ***list); +FL_EXPORT int filename_list(const char *d, struct dirent ***list); #endif // -// End of "$Id: filename.H,v 1.5 1999/01/07 19:17:05 mike Exp $". +// End of "$Id: filename.H,v 1.6 1999/02/16 21:59:47 mike Exp $". // diff --git a/FL/fl_ask.H b/FL/fl_ask.H index f882f6cfb..3136b3dce 100644 --- a/FL/fl_ask.H +++ b/FL/fl_ask.H @@ -1,5 +1,5 @@ // -// "$Id: fl_ask.H,v 1.5 1999/01/07 19:17:06 mike Exp $" +// "$Id: fl_ask.H,v 1.6 1999/02/16 21:59:47 mike Exp $" // // Standard dialog header file for the Fast Light Tool Kit (FLTK). // @@ -28,27 +28,27 @@ class Fl_Widget; -void fl_message(const char *,...); -void fl_alert(const char *,...); -int fl_ask(const char *,...); -int fl_choice(const char *q,const char *b0,const char *b1,const char *b2,...); -const char *fl_input(const char *label, const char *deflt = 0, ...); -const char *fl_password(const char *label, const char *deflt = 0, ...); +FL_EXPORT void fl_message(const char *,...); +FL_EXPORT void fl_alert(const char *,...); +FL_EXPORT int fl_ask(const char *,...); +FL_EXPORT int fl_choice(const char *q,const char *b0,const char *b1,const char *b2,...); +FL_EXPORT const char *fl_input(const char *label, const char *deflt = 0, ...); +FL_EXPORT const char *fl_password(const char *label, const char *deflt = 0, ...); -Fl_Widget *fl_message_icon(); -extern unsigned char fl_message_font_; -extern unsigned char fl_message_size_; +FL_EXPORT Fl_Widget *fl_message_icon(); +extern FL_EXPORT unsigned char fl_message_font_; +extern FL_EXPORT unsigned char fl_message_size_; inline void fl_message_font(unsigned char f,unsigned char s) { fl_message_font_ = f; fl_message_size_ = s;} -// pointers you can use to change fltk to a foreign language: -extern const char* fl_no; -extern const char* fl_yes; -extern const char* fl_ok; -extern const char* fl_cancel; +// pointers you can use to change FLTK to a foreign language: +extern FL_EXPORT const char* fl_no; +extern FL_EXPORT const char* fl_yes; +extern FL_EXPORT const char* fl_ok; +extern FL_EXPORT const char* fl_cancel; #endif // -// End of "$Id: fl_ask.H,v 1.5 1999/01/07 19:17:06 mike Exp $". +// End of "$Id: fl_ask.H,v 1.6 1999/02/16 21:59:47 mike Exp $". // diff --git a/FL/fl_draw.H b/FL/fl_draw.H index db7d706d0..efe0e34c5 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -1,5 +1,5 @@ // -// "$Id: fl_draw.H,v 1.7 1999/02/03 08:43:30 bill Exp $" +// "$Id: fl_draw.H,v 1.8 1999/02/16 21:59:47 mike Exp $" // // Portable drawing function header file for the Fast Light Tool Kit (FLTK). // @@ -29,18 +29,19 @@ #include "Enumerations.H" // for the color names // Colors: -void fl_color(Fl_Color); // select indexed color +FL_EXPORT void fl_color(Fl_Color); // select indexed color inline void fl_color(int c) {fl_color((Fl_Color)c);} // for back compatability -void fl_color(uchar, uchar, uchar); // select actual color -extern Fl_Color fl_color_; inline Fl_Color fl_color() {return fl_color_;} +FL_EXPORT void fl_color(uchar, uchar, uchar); // select actual color +extern FL_EXPORT Fl_Color fl_color_; +inline Fl_Color fl_color() {return fl_color_;} // clip: -void fl_clip(int x, int y, int w, int h); +FL_EXPORT void fl_clip(int x, int y, int w, int h); #define fl_push_clip fl_clip -void fl_push_no_clip(); -void fl_pop_clip(); -int fl_not_clipped(int x, int y, int w, int h); -int fl_clip_box(int, int, int, int, int& x, int& y, int& w, int& h); +FL_EXPORT void fl_push_no_clip(); +FL_EXPORT void fl_pop_clip(); +FL_EXPORT int fl_not_clipped(int x, int y, int w, int h); +FL_EXPORT int fl_clip_box(int, int, int, int, int& x, int& y, int& w, int& h); // line style: // Enumerations chosen so zero is the default, unfortunatly this does @@ -58,123 +59,125 @@ enum Fl_LineStyle { FL_JOIN_ROUND = 0x2000, FL_JOIN_BEVEL = 0x3000, }; -void fl_line_style(int style, int width = 0, char* dashes = 0); +FL_EXPORT void fl_line_style(int style, int width = 0, char* dashes = 0); // points: -void fl_point(int x, int y); +FL_EXPORT void fl_point(int x, int y); // rectangles tweaked to exactly fill the pixel rectangle: -void fl_rect(int x, int y, int w, int h); -void fl_rectf(int x, int y, int w, int h); +FL_EXPORT void fl_rect(int x, int y, int w, int h); +FL_EXPORT void fl_rectf(int x, int y, int w, int h); // line segments: -void fl_line(int,int, int,int); -void fl_line(int,int, int,int, int,int); +FL_EXPORT void fl_line(int,int, int,int); +FL_EXPORT void fl_line(int,int, int,int, int,int); // closed line segments: -void fl_loop(int,int, int,int, int,int); -void fl_loop(int,int, int,int, int,int, int,int); +FL_EXPORT void fl_loop(int,int, int,int, int,int); +FL_EXPORT void fl_loop(int,int, int,int, int,int, int,int); // filled polygons -void fl_polygon(int,int, int,int, int,int); -void fl_polygon(int,int, int,int, int,int, int,int); +FL_EXPORT void fl_polygon(int,int, int,int, int,int); +FL_EXPORT void fl_polygon(int,int, int,int, int,int, int,int); // draw rectilinear lines, horizontal segment first: -void fl_xyline(int x, int y, int x1); -void fl_xyline(int x, int y, int x1, int y2); -void fl_xyline(int x, int y, int x1, int y2, int x3); +FL_EXPORT void fl_xyline(int x, int y, int x1); +FL_EXPORT void fl_xyline(int x, int y, int x1, int y2); +FL_EXPORT void fl_xyline(int x, int y, int x1, int y2, int x3); // draw rectilinear lines, vertical segment first: -void fl_yxline(int x, int y, int y1); -void fl_yxline(int x, int y, int y1, int x2); -void fl_yxline(int x, int y, int y1, int x2, int y3); +FL_EXPORT void fl_yxline(int x, int y, int y1); +FL_EXPORT void fl_yxline(int x, int y, int y1, int x2); +FL_EXPORT void fl_yxline(int x, int y, int y1, int x2, int y3); // circular lines and pie slices (code in fl_arci.C): -void fl_arc(int x, int y, int w, int h, double a1, double a2); -void fl_pie(int x, int y, int w, int h, double a1, double a2); -void fl_chord(int x, int y, int w, int h, double a1, double a2); // nyi +FL_EXPORT void fl_arc(int x, int y, int w, int h, double a1, double a2); +FL_EXPORT void fl_pie(int x, int y, int w, int h, double a1, double a2); +FL_EXPORT void fl_chord(int x, int y, int w, int h, double a1, double a2); // nyi // scalable drawing code (code in fl_vertex.C and fl_arc.C): -void fl_push_matrix(); -void fl_pop_matrix(); -void fl_scale(double x, double y); -void fl_scale(double x); -void fl_translate(double x, double y); -void fl_rotate(double d); -void fl_mult_matrix(double a, double b, double c, double d, double x,double y); -void fl_begin_points(); -void fl_begin_line(); -void fl_begin_loop(); -void fl_begin_polygon(); -void fl_vertex(double x, double y); -void fl_curve(double, double, double, double, double, double, double, double); -void fl_arc(double x, double y, double r, double start, double a); -void fl_circle(double x, double y, double r); -void fl_end_points(); -void fl_end_line(); -void fl_end_loop(); -void fl_end_polygon(); -void fl_begin_complex_polygon(); -void fl_gap(); -void fl_end_complex_polygon(); +FL_EXPORT void fl_push_matrix(); +FL_EXPORT void fl_pop_matrix(); +FL_EXPORT void fl_scale(double x, double y); +FL_EXPORT void fl_scale(double x); +FL_EXPORT void fl_translate(double x, double y); +FL_EXPORT void fl_rotate(double d); +FL_EXPORT void fl_mult_matrix(double a, double b, double c, double d, double x,double y); +FL_EXPORT void fl_begin_points(); +FL_EXPORT void fl_begin_line(); +FL_EXPORT void fl_begin_loop(); +FL_EXPORT void fl_begin_polygon(); +FL_EXPORT void fl_vertex(double x, double y); +FL_EXPORT void fl_curve(double, double, double, double, double, double, double, double); +FL_EXPORT void fl_arc(double x, double y, double r, double start, double a); +FL_EXPORT void fl_circle(double x, double y, double r); +FL_EXPORT void fl_end_points(); +FL_EXPORT void fl_end_line(); +FL_EXPORT void fl_end_loop(); +FL_EXPORT void fl_end_polygon(); +FL_EXPORT void fl_begin_complex_polygon(); +FL_EXPORT void fl_gap(); +FL_EXPORT void fl_end_complex_polygon(); // get and use transformed positions: -double fl_transform_x(double x, double y); -double fl_transform_y(double x, double y); -double fl_transform_dx(double x, double y); -double fl_transform_dy(double x, double y); -void fl_transformed_vertex(double x, double y); +FL_EXPORT double fl_transform_x(double x, double y); +FL_EXPORT double fl_transform_y(double x, double y); +FL_EXPORT double fl_transform_dx(double x, double y); +FL_EXPORT double fl_transform_dy(double x, double y); +FL_EXPORT void fl_transformed_vertex(double x, double y); // current font: -void fl_font(int face, int size); -extern int fl_font_; inline int fl_font() {return fl_font_;} -extern int fl_size_; inline int fl_size() {return fl_size_;} +FL_EXPORT void fl_font(int face, int size); +extern FL_EXPORT int fl_font_; +inline int fl_font() {return fl_font_;} +extern FL_EXPORT int fl_size_; +inline int fl_size() {return fl_size_;} // information you can get about the current font: -int fl_height(); // using "size" should work ok -int fl_descent(); -double fl_width(const char*); -double fl_width(const char*, int n); -double fl_width(uchar); +FL_EXPORT int fl_height(); // using "size" should work ok +FL_EXPORT int fl_descent(); +FL_EXPORT double fl_width(const char*); +FL_EXPORT double fl_width(const char*, int n); +FL_EXPORT double fl_width(uchar); // draw using current font: -void fl_draw(const char*, int x, int y); -void fl_draw(const char*, int n, int x, int y); -void fl_measure(const char*, int& x, int& y); -void fl_draw(const char*, int,int,int,int, Fl_Align); -void fl_draw(const char*, int,int,int,int, Fl_Align, - void (*callthis)(const char *, int n, int x, int y)); +FL_EXPORT void fl_draw(const char*, int x, int y); +FL_EXPORT void fl_draw(const char*, int n, int x, int y); +FL_EXPORT void fl_measure(const char*, int& x, int& y); +FL_EXPORT void fl_draw(const char*, int,int,int,int, Fl_Align); +FL_EXPORT void fl_draw(const char*, int,int,int,int, Fl_Align, + void (*callthis)(const char *, int n, int x, int y)); // boxtypes: -void fl_frame(const char* s, int x, int y, int w, int h); -void fl_frame2(const char* s, int x, int y, int w, int h); -void fl_draw_box(Fl_Boxtype, int x, int y, int w, int h, Fl_Color); +FL_EXPORT void fl_frame(const char* s, int x, int y, int w, int h); +FL_EXPORT void fl_frame2(const char* s, int x, int y, int w, int h); +FL_EXPORT void fl_draw_box(Fl_Boxtype, int x, int y, int w, int h, Fl_Color); // images: -void fl_draw_image(const uchar*, int,int,int,int, int delta=3, int ldelta=0); -void fl_draw_image_mono(const uchar*, int,int,int,int, int delta=1, int ld=0); -typedef void (*Fl_Draw_Image_Cb)(void*,int,int,int,uchar*); -void fl_draw_image(Fl_Draw_Image_Cb, void*, int,int,int,int, int delta=3); -void fl_draw_image_mono(Fl_Draw_Image_Cb, void*, int,int,int,int, int delta=1); -void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b); +FL_EXPORT void fl_draw_image(const uchar*, int,int,int,int, int delta=3, int ldelta=0); +FL_EXPORT void fl_draw_image_mono(const uchar*, int,int,int,int, int delta=1, int ld=0); +FL_EXPORT typedef void (*Fl_Draw_Image_Cb)(void*,int,int,int,uchar*); +FL_EXPORT void fl_draw_image(Fl_Draw_Image_Cb, void*, int,int,int,int, int delta=3); +FL_EXPORT void fl_draw_image_mono(Fl_Draw_Image_Cb, void*, int,int,int,int, int delta=1); +FL_EXPORT void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b); // pixmaps: -int fl_draw_pixmap(/*const*/ char* const* data, int x,int y,Fl_Color=FL_GRAY); -int fl_measure_pixmap(/*const*/ char* const* data, int &w, int &h); +FL_EXPORT int fl_draw_pixmap(/*const*/ char* const* data, int x,int y,Fl_Color=FL_GRAY); +FL_EXPORT int fl_measure_pixmap(/*const*/ char* const* data, int &w, int &h); // other: -extern void fl_scroll(int X, int Y, int W, int H, int dx, int dy, - void (*draw_area)(void*, int,int,int,int), void* data); -const char* fl_shortcut_label(int); -void fl_overlay_rect(int,int,int,int); -void fl_overlay_clear(); -void fl_cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); +extern FL_EXPORT void fl_scroll(int X, int Y, int W, int H, int dx, int dy, + void (*draw_area)(void*, int,int,int,int), void* data); +FL_EXPORT const char* fl_shortcut_label(int); +FL_EXPORT void fl_overlay_rect(int,int,int,int); +FL_EXPORT void fl_overlay_clear(); +FL_EXPORT void fl_cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); // XForms symbols: -int fl_draw_symbol(const char* label,int x,int y,int w,int h, Fl_Color); -int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int scalable); +FL_EXPORT int fl_draw_symbol(const char* label,int x,int y,int w,int h, Fl_Color); +FL_EXPORT int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int scalable); #endif // -// End of "$Id: fl_draw.H,v 1.7 1999/02/03 08:43:30 bill Exp $". +// End of "$Id: fl_draw.H,v 1.8 1999/02/16 21:59:47 mike Exp $". // diff --git a/FL/fl_file_chooser.H b/FL/fl_file_chooser.H index 431eabcab..dae6156ac 100644 --- a/FL/fl_file_chooser.H +++ b/FL/fl_file_chooser.H @@ -1,5 +1,5 @@ // -// "$Id: fl_file_chooser.H,v 1.4 1999/01/07 19:17:06 mike Exp $" +// "$Id: fl_file_chooser.H,v 1.5 1999/02/16 21:59:48 mike Exp $" // // File chooser header file for the Fast Light Tool Kit (FLTK). // @@ -26,11 +26,13 @@ #ifndef fl_file_chooser_H #define fl_file_chooser_H -char *fl_file_chooser(const char *message,const char *pat,const char *fname); -void fl_file_chooser_callback(void (*cb)(const char *)); +#include "Enumerations.H" + +FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname); +FL_EXPORT void fl_file_chooser_callback(void (*cb)(const char *)); #endif // -// End of "$Id: fl_file_chooser.H,v 1.4 1999/01/07 19:17:06 mike Exp $". +// End of "$Id: fl_file_chooser.H,v 1.5 1999/02/16 21:59:48 mike Exp $". // diff --git a/FL/fl_show_colormap.H b/FL/fl_show_colormap.H index f23191df6..39a5f10e8 100644 --- a/FL/fl_show_colormap.H +++ b/FL/fl_show_colormap.H @@ -1,5 +1,5 @@ // -// "$Id: fl_show_colormap.H,v 1.4 1999/01/07 19:17:06 mike Exp $" +// "$Id: fl_show_colormap.H,v 1.5 1999/02/16 21:59:48 mike Exp $" // // Colormap picker header file for the Fast Light Tool Kit (FLTK). // @@ -26,10 +26,10 @@ #ifndef fl_show_colormap_H #define fl_show_colormap_H -Fl_Color fl_show_colormap(Fl_Color oldcol); +FL_EXPORT Fl_Color fl_show_colormap(Fl_Color oldcol); #endif // -// End of "$Id: fl_show_colormap.H,v 1.4 1999/01/07 19:17:06 mike Exp $". +// End of "$Id: fl_show_colormap.H,v 1.5 1999/02/16 21:59:48 mike Exp $". // diff --git a/FL/forms.H b/FL/forms.H index b63352354..635d75fb5 100644 --- a/FL/forms.H +++ b/FL/forms.H @@ -1,5 +1,5 @@ // -// "$Id: forms.H,v 1.5 1999/01/07 19:17:07 mike Exp $" +// "$Id: forms.H,v 1.6 1999/02/16 21:59:48 mike Exp $" // // Forms emulation header file for the Fast Light Tool Kit (FLTK). // @@ -166,7 +166,7 @@ typedef int FL_COLOR; // fltk interaction: #define FL_CMD_OPT void -extern void fl_initialize(int*, char*[], const char*, FL_CMD_OPT*, int); +extern FL_EXPORT void fl_initialize(int*, char*[], const char*, FL_CMD_OPT*, int); inline void fl_finish() {} typedef void (*FL_IO_CALLBACK) (int, void*); @@ -183,8 +183,8 @@ inline void fl_remove_timeout(int) {} // type of callback is different! inline void fl_set_idle_callback(void (*cb)()) {Fl::set_idle(cb);} -Fl_Widget* fl_do_forms(void); -Fl_Widget* fl_check_forms(); +FL_EXPORT Fl_Widget* fl_do_forms(void); +FL_EXPORT Fl_Widget* fl_check_forms(); inline Fl_Widget* fl_do_only_forms(void) {return fl_do_forms();} inline Fl_Widget* fl_check_only_forms(void) {return fl_check_forms();} @@ -268,7 +268,7 @@ inline Fl_Window* fl_bgn_form(Fl_Boxtype b,int w,int h) { g->box(b); return g; } -void fl_end_form(); +FL_EXPORT void fl_end_form(); inline void fl_addto_form(Fl_Window* f) {f->begin();} inline Fl_Group* fl_bgn_group() {return new Fl_Group(0,0,0,0,0);} inline void fl_end_group() {Fl_Group::current()->forms_end();} @@ -284,7 +284,7 @@ inline void fl_set_form_geometry(Fl_Window* f,int x,int y,int w,int h) { #define fl_set_initial_placement fl_set_form_geometry inline void fl_adjust_form_size(Fl_Window*) {} -void fl_show_form(Fl_Window* f,int p,int b,const char* n); +FL_EXPORT void fl_show_form(Fl_Window* f,int p,int b,const char* n); enum { // "p" argument values: FL_PLACE_FREE = 0, // make resizable FL_PLACE_MOUSE = 1, // mouse centered on form @@ -309,7 +309,7 @@ enum { // "b" arguement values: }; inline void fl_set_form_hotspot(Fl_Window* w,int x,int y) {w->hotspot(x,y);} inline void fl_set_form_hotobject(Fl_Window* w, Fl_Widget* o) {w->hotspot(o);} -extern char fl_flip; // in forms.C +extern FL_EXPORT char fl_flip; // in forms.C inline void fl_flip_yorigin() {fl_flip = 1;} #define fl_prepare_form_window fl_show_form @@ -320,7 +320,7 @@ inline void fl_raise_form(Fl_Window* f) {f->show();} inline void fl_hide_form(Fl_Window* f) {f->hide();} inline void fl_pop_form(Fl_Window* f) {f->show();} -extern char fl_modal_next; // in forms.C +extern FL_EXPORT char fl_modal_next; // in forms.C inline void fl_activate_all_forms() {} inline void fl_deactivate_all_forms() {fl_modal_next = 1;} inline void fl_deactivate_form(Fl_Window*w) {w->deactivate();} @@ -334,7 +334,7 @@ inline void fl_set_form_callback(Fl_Window* f,Forms_FormCB c) {f->callback(c);} #define fl_set_form_call_back fl_set_form_callback inline void fl_init() {} -void fl_set_graphics_mode(int,int); +FL_EXPORT void fl_set_graphics_mode(int,int); inline int fl_form_is_visible(Fl_Window* f) {return f->visible();} @@ -482,7 +482,7 @@ inline int fl_isdisplayed_browser_line(Fl_Widget* o, int n) { #define FL_PUSH_BUTTON FL_TOGGLE_BUTTON #define FL_MENU_BUTTON 9 -Fl_Button* fl_add_button(uchar t,int x,int y,int w,int h,const char* l); +FL_EXPORT Fl_Button* fl_add_button(uchar t,int x,int y,int w,int h,const char* l); inline int fl_get_button(Fl_Widget* b) {return ((Fl_Button*)b)->value();} inline void fl_set_button(Fl_Widget* b, int v) {((Fl_Button*)b)->value(v);} inline int fl_get_button_numb(Fl_Widget*) {return Fl::event_button();} @@ -649,12 +649,12 @@ fl_add_free(int t,double x,double y,double w,double h,const char* l, #include "fl_show_colormap.H" inline int fl_show_question(const char* c, int = 0) {return fl_ask(c);} -void fl_show_message(const char *,const char *,const char *); -void fl_show_alert(const char *,const char *,const char *,int=0); -int fl_show_question(const char *,const char *,const char *); +FL_EXPORT void fl_show_message(const char *,const char *,const char *); +FL_EXPORT void fl_show_alert(const char *,const char *,const char *,int=0); +FL_EXPORT int fl_show_question(const char *,const char *,const char *); inline const char *fl_show_input(const char *l,const char*d=0) {return fl_input(l,d);} -/*const*/ char *fl_show_simple_input(const char *label, const char *deflt = 0); -int fl_show_choice( +FL_EXPORT /*const*/ char *fl_show_simple_input(const char *label, const char *deflt = 0); +FL_EXPORT int fl_show_choice( const char *m1, const char *m2, const char *m3, @@ -675,11 +675,11 @@ inline int fl_show_choices(const char* c,int n,const char* b1,const char* b2, inline int do_matching(char* a, const char* b) {return filename_match(a,b);} // Forms-compatable file chooser (implementation in fselect.C): -char* fl_show_file_selector(const char* message,const char* dir, +FL_EXPORT char* fl_show_file_selector(const char* message,const char* dir, const char* pat,const char* fname); -char* fl_get_directory(); -char* fl_get_pattern(); -char* fl_get_filename(); +FL_EXPORT char* fl_get_directory(); +FL_EXPORT char* fl_get_pattern(); +FL_EXPORT char* fl_get_filename(); #include "Fl_Input.H" forms_constructor(Fl_Input, fl_add_input) @@ -841,5 +841,5 @@ inline void fl_draw() {Fl::flush();} #endif /* define __FORMS_H__ */ // -// End of "$Id: forms.H,v 1.5 1999/01/07 19:17:07 mike Exp $". +// End of "$Id: forms.H,v 1.6 1999/02/16 21:59:48 mike Exp $". // @@ -1,5 +1,5 @@ // -// "$Id: gl.h,v 1.5 1999/01/07 19:17:07 mike Exp $" +// "$Id: gl.h,v 1.6 1999/02/16 21:59:48 mike Exp $" // // OpenGL header file for the Fast Light Tool Kit (FLTK). // @@ -39,35 +39,35 @@ #endif #include <GL/gl.h> -void gl_start(); -void gl_finish(); +FL_EXPORT void gl_start(); +FL_EXPORT void gl_finish(); -void gl_color(Fl_Color); +FL_EXPORT void gl_color(Fl_Color); inline void gl_color(int c) {gl_color((Fl_Color)c);} // back compatability -void gl_rect(int x,int y,int w,int h); +FL_EXPORT void gl_rect(int x,int y,int w,int h); inline void gl_rectf(int x,int y,int w,int h) {glRecti(x,y,x+w,y+h);} -void gl_font(int fontid, int size); -int gl_height(); -int gl_descent(); -double gl_width(const char *); -double gl_width(const char *, int n); -double gl_width(uchar); +FL_EXPORT void gl_font(int fontid, int size); +FL_EXPORT int gl_height(); +FL_EXPORT int gl_descent(); +FL_EXPORT double gl_width(const char *); +FL_EXPORT double gl_width(const char *, int n); +FL_EXPORT double gl_width(uchar); -void gl_draw(const char*); -void gl_draw(const char*, int n); -void gl_draw(const char*, int x, int y); -void gl_draw(const char*, float x, float y); -void gl_draw(const char*, int n, int x, int y); -void gl_draw(const char*, int n, float x, float y); -void gl_draw(const char*, int x, int y, int w, int h, Fl_Align); -void gl_measure(const char*, int& x, int& y); +FL_EXPORT void gl_draw(const char*); +FL_EXPORT void gl_draw(const char*, int n); +FL_EXPORT void gl_draw(const char*, int x, int y); +FL_EXPORT void gl_draw(const char*, float x, float y); +FL_EXPORT void gl_draw(const char*, int n, int x, int y); +FL_EXPORT void gl_draw(const char*, int n, float x, float y); +FL_EXPORT void gl_draw(const char*, int x, int y, int w, int h, Fl_Align); +FL_EXPORT void gl_measure(const char*, int& x, int& y); -void gl_draw_image(const uchar *, int x,int y,int w,int h, int d=3, int ld=0); +FL_EXPORT void gl_draw_image(const uchar *, int x,int y,int w,int h, int d=3, int ld=0); #endif // -// End of "$Id: gl.h,v 1.5 1999/01/07 19:17:07 mike Exp $". +// End of "$Id: gl.h,v 1.6 1999/02/16 21:59:48 mike Exp $". // @@ -1,5 +1,5 @@ // -// "$Id: glut.H,v 1.5 1999/01/07 19:17:08 mike Exp $" +// "$Id: glut.H,v 1.6 1999/02/16 21:59:49 mike Exp $" // // GLUT emulation header file for the Fast Light Tool Kit (FLTK). // @@ -55,16 +55,16 @@ #include "Fl_Gl_Window.H" class Fl_Glut_Window : public Fl_Gl_Window { - void _init(); + FL_EXPORT void _init(); int mouse_down; protected: - void draw(); - void draw_overlay(); - int handle(int); + FL_EXPORT void draw(); + FL_EXPORT void draw_overlay(); + FL_EXPORT int handle(int); public: // so the inline functions work int number; int menu[3]; - void make_current(); + FL_EXPORT void make_current(); void (*display)(); void (*overlaydisplay)(); void (*reshape)(int w, int h); @@ -75,26 +75,26 @@ public: // so the inline functions work void (*entry)(int); void (*visibility)(int); void (*special)(int, int x, int y); - 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(); + 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(); }; -extern Fl_Glut_Window *glut_window; // the current window -extern int glut_menu; // the current menu +extern FL_EXPORT Fl_Glut_Window *glut_window; // the current window +extern FL_EXPORT int glut_menu; // the current menu // function pointers that are not per-window: -extern void (*glut_idle_function)(); -extern void (*glut_menustate_function)(int); -extern void (*glut_menustatus_function)(int,int,int); +extern FL_EXPORT void (*glut_idle_function)(); +extern FL_EXPORT void (*glut_menustate_function)(int); +extern FL_EXPORT void (*glut_menustatus_function)(int,int,int); //////////////////////////////////////////////////////////////// //#define GLUT_API_VERSION This does not match any version of Glut exactly... -void glutInit(int *argcp, char **argv); // creates first window +FL_EXPORT void glutInit(int *argcp, char **argv); // creates first window -void glutInitDisplayMode(unsigned int mode); +FL_EXPORT void glutInitDisplayMode(unsigned int mode); // the FL_ symbols have the same value as the GLUT ones: #define GLUT_RGB FL_RGB #define GLUT_RGBA FL_RGB @@ -109,25 +109,25 @@ void glutInitDisplayMode(unsigned int mode); // #define GLUT_STEREO 256 // #define GLUT_LUMINANCE 512 -void glutInitWindowPosition(int x, int y); +FL_EXPORT void glutInitWindowPosition(int x, int y); -void glutInitWindowSize(int w, int h); +FL_EXPORT void glutInitWindowSize(int w, int h); -void glutMainLoop(); +FL_EXPORT void glutMainLoop(); -int glutCreateWindow(char *title); +FL_EXPORT int glutCreateWindow(char *title); -int glutCreateSubWindow(int win, int x, int y, int width, int height); +FL_EXPORT int glutCreateSubWindow(int win, int x, int y, int width, int height); -void glutDestroyWindow(int win); +FL_EXPORT void glutDestroyWindow(int win); inline void glutPostRedisplay() {glut_window->redraw();} -void glutSwapBuffers(); +FL_EXPORT void glutSwapBuffers(); inline int glutGetWindow() {return glut_window->number;} -void glutSetWindow(int win); +FL_EXPORT void glutSetWindow(int win); inline void glutSetWindowTitle(char *t) {glut_window->label(t);} @@ -191,23 +191,23 @@ inline void glutShowOverlay() {glut_window->redraw_overlay();} inline void glutHideOverlay() {glut_window->hide_overlay();} -int glutCreateMenu(void (*)(int)); +FL_EXPORT int glutCreateMenu(void (*)(int)); -void glutDestroyMenu(int menu); +FL_EXPORT void glutDestroyMenu(int menu); inline int glutGetMenu() {return glut_menu;} inline void glutSetMenu(int m) {glut_menu = m;} -void glutAddMenuEntry(char *label, int value); +FL_EXPORT void glutAddMenuEntry(char *label, int value); -void glutAddSubMenu(char *label, int submenu); +FL_EXPORT void glutAddSubMenu(char *label, int submenu); -void glutChangeToMenuEntry(int item, char *label, int value); +FL_EXPORT void glutChangeToMenuEntry(int item, char *label, int value); -void glutChangeToSubMenu(int item, char *label, int submenu); +FL_EXPORT void glutChangeToSubMenu(int item, char *label, int submenu); -void glutRemoveMenuItem(int item); +FL_EXPORT void glutRemoveMenuItem(int item); inline void glutAttachMenu(int b) {glut_window->menu[b] = glut_menu;} @@ -417,8 +417,8 @@ extern struct Glut_Bitmap_Font {uchar font; int size;} #define GLUT_BITMAP_HELVETICA_12 (&glutBitmapHelvetica12) #define GLUT_BITMAP_HELVETICA_18 (&glutBitmapHelvetica18) -void glutBitmapCharacter(void *font, int character); -int glutBitmapWidth(void *font, int character); +FL_EXPORT void glutBitmapCharacter(void *font, int character); +FL_EXPORT int glutBitmapWidth(void *font, int character); //////////////////////////////////////////////////////////////// // Glut drawing functions. These are NOT emulated but you can @@ -467,5 +467,5 @@ extern void glutSolidIcosahedron(); #endif /* __glut_h__ */ // -// End of "$Id: glut.H,v 1.5 1999/01/07 19:17:08 mike Exp $". +// End of "$Id: glut.H,v 1.6 1999/02/16 21:59:49 mike Exp $". // diff --git a/FL/win32.H b/FL/win32.H index 023abffed..45c825d1f 100644 --- a/FL/win32.H +++ b/FL/win32.H @@ -1,5 +1,5 @@ // -// "$Id: win32.H,v 1.13 1999/01/07 19:17:08 mike Exp $" +// "$Id: win32.H,v 1.14 1999/02/16 21:59:49 mike Exp $" // // WIN32 header file for the Fast Light Tool Kit (FLTK). // @@ -43,7 +43,7 @@ typedef HWND Window; typedef POINT XPoint; struct XRectangle {int x, y, width, height;}; typedef HRGN Region; -void fl_clip_region(Region); +FL_EXPORT void fl_clip_region(Region); inline Region XRectangleRegion(int x, int y, int w, int h) { return CreateRectRgn(x,y,x+w,y+h); } @@ -72,31 +72,31 @@ public: int wait_for_expose; HDC private_dc; // used for OpenGL HCURSOR cursor; - 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); - 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*); + 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, + 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*); }; -extern HCURSOR fl_default_cursor; +extern FL_EXPORT HCURSOR fl_default_cursor; inline Window fl_xid(const Fl_Window*w) {return Fl_X::i(w)->xid;} -Fl_Window* fl_find(Window xid); -extern char fl_override_redirect; // hack into Fl_Window::make_xid() -extern int fl_background_pixel; // hack into Fl_Window::make_xid() +FL_EXPORT Fl_Window* fl_find(Window xid); +extern FL_EXPORT char fl_override_redirect; // hack into Fl_Window::make_xid() +extern FL_EXPORT int fl_background_pixel; // hack into Fl_Window::make_xid() // most recent fl_color() or fl_rgbcolor() points at one of these: -extern struct Fl_XMap { +extern FL_EXPORT struct Fl_XMap { COLORREF rgb; // this should be the type the RGB() macro returns HPEN pen; // pen, 0 if none created yet int brush; // ref to solid brush, 0 if none created yet } *fl_current_xmap; inline COLORREF fl_RGB() {return fl_current_xmap->rgb;} inline HPEN fl_pen() {return fl_current_xmap->pen;} -HBRUSH fl_brush(); // allocates a brush if necessary +FL_EXPORT HBRUSH fl_brush(); // allocates a brush if necessary extern HINSTANCE fl_display; extern Window fl_window; @@ -117,9 +117,9 @@ extern HDC fl_makeDC(HBITMAP); #define fl_end_offscreen() \ fl_pop_clip(); DeleteDC(fl_gc); fl_window=_sw; fl_gc = _sgc -void fl_copy_offscreen(int x,int y,int w,int h,HBITMAP pixmap,int srcx,int srcy); +FL_EXPORT void fl_copy_offscreen(int x,int y,int w,int h,HBITMAP pixmap,int srcx,int srcy); #define fl_delete_offscreen(bitmap) DeleteObject(bitmap); // -// End of "$Id: win32.H,v 1.13 1999/01/07 19:17:08 mike Exp $". +// End of "$Id: win32.H,v 1.14 1999/02/16 21:59:49 mike Exp $". // @@ -1,5 +1,5 @@ // -// "$Id: x.H,v 1.9 1999/01/07 19:17:08 mike Exp $" +// "$Id: x.H,v 1.10 1999/02/16 21:59:49 mike Exp $" // // X11 header file for the Fast Light Tool Kit (FLTK). // @@ -44,30 +44,30 @@ #include <X11/Xatom.h> #include "Fl_Window.H" -void fl_open_display(); -void fl_close_display(); +FL_EXPORT void fl_open_display(); +FL_EXPORT void fl_close_display(); // constant info about the X server connection: -extern Display *fl_display; -extern int fl_screen; -extern XVisualInfo *fl_visual; -extern Colormap fl_colormap; +extern FL_EXPORT Display *fl_display; +extern FL_EXPORT int fl_screen; +extern FL_EXPORT XVisualInfo *fl_visual; +extern FL_EXPORT Colormap fl_colormap; // drawing functions: -extern GC fl_gc; -extern Window fl_window; -extern XFontStruct* fl_xfont; -ulong fl_xpixel(Fl_Color i); -ulong fl_xpixel(uchar r, uchar g, uchar b); -void fl_clip_region(Region); -Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.cxx +extern FL_EXPORT GC fl_gc; +extern FL_EXPORT Window fl_window; +extern FL_EXPORT XFontStruct* fl_xfont; +FL_EXPORT ulong fl_xpixel(Fl_Color i); +FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b); +FL_EXPORT void fl_clip_region(Region); +FL_EXPORT Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.cxx // feed events into fltk: -int fl_handle(const XEvent&); +FL_EXPORT int fl_handle(const XEvent&); // you can use these in Fl::add_handler() to look at events: -extern const XEvent* fl_xevent; -extern ulong fl_event_time; +extern FL_EXPORT const XEvent* fl_xevent; +extern FL_EXPORT ulong fl_event_time; // off-screen pixmaps: create, destroy, draw into, copy to window: #define Fl_Offscreen ulong @@ -95,28 +95,28 @@ public: Fl_X *next; char wait_for_expose; char backbuffer_bad; // used for XDBE - static Fl_X* first; - static Fl_X* i(const Fl_Window* w) {return w->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); + static FL_EXPORT Fl_X* first; + static FL_EXPORT Fl_X* i(const Fl_Window* w) {return w->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); // kludges to get around protection: - void flush() {w->flush();} - static void x(Fl_Window* w, int X) {w->x(X);} - static void y(Fl_Window* w, int Y) {w->y(Y);} + FL_EXPORT void flush() {w->flush();} + static FL_EXPORT void x(Fl_Window* w, int X) {w->x(X);} + static FL_EXPORT void y(Fl_Window* w, int Y) {w->y(Y);} }; // convert xid <-> Fl_Window: inline Window fl_xid(const Fl_Window*w) {return Fl_X::i(w)->xid;} -Fl_Window* fl_find(Window xid); +FL_EXPORT Fl_Window* fl_find(Window xid); -extern char fl_override_redirect; // hack into Fl_X::make_xid() -extern int fl_background_pixel; // hack into Fl_X::make_xid() +extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid() +extern FL_EXPORT int fl_background_pixel; // hack into Fl_X::make_xid() #endif #endif // -// End of "$Id: x.H,v 1.9 1999/01/07 19:17:08 mike Exp $". +// End of "$Id: x.H,v 1.10 1999/02/16 21:59:49 mike Exp $". // |