diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | FL/Fl.H | 306 | ||||
| -rw-r--r-- | FL/Fl_Group.H | 40 | ||||
| -rw-r--r-- | FL/Fl_Help_Dialog.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Help_View.H | 6 | ||||
| -rw-r--r-- | FL/Fl_Wizard.H | 8 | ||||
| -rw-r--r-- | src/flstring.h | 13 |
7 files changed, 190 insertions, 187 deletions
@@ -1,5 +1,7 @@ CHANGES IN FLTK 1.1.0 + - Cleaned up the WIN32 export definitions for some of + the widget classes. - Fixed a filename completion bug when changing directories. - Fl_File_Chooser::value() would return directories with @@ -1,5 +1,5 @@ // -// "$Id: Fl.H,v 1.8.2.11.2.16 2002/07/08 15:14:37 easysw Exp $" +// "$Id: Fl.H,v 1.8.2.11.2.17 2002/07/14 19:08:25 easysw Exp $" // // Main header file for the Fast Light Tool Kit (FLTK). // @@ -41,33 +41,33 @@ typedef void (Fl_Box_Draw_F)(int,int,int,int, Fl_Color); typedef void (*Fl_Timeout_Handler)(void*); -class Fl { +class FL_EXPORT Fl { Fl() {}; // no constructor! public: // should be private! - static FL_EXPORT int e_number; - static FL_EXPORT int e_x,e_y,e_x_root,e_y_root; - static FL_EXPORT int e_dx, e_dy; - 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 FL_EXPORT int compose_state; - static FL_EXPORT int visible_focus_; - static FL_EXPORT int dnd_text_ops_; + static int e_number; + static int e_x,e_y,e_x_root,e_y_root; + static int e_dx, e_dy; + 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 int compose_state; + static int visible_focus_; + static int dnd_text_ops_; static void damage(int x) {damage_ = x;} - static FL_EXPORT void (*idle)(); + static void (*idle)(); static const char* scheme_; static Fl_Image* scheme_bg_; @@ -75,23 +75,23 @@ public: // should be private! public: // API version number - static FL_EXPORT double version(); + static double version(); // argument parsers: - 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**); + 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**); // things called by initialization: - 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); + 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); // schemes: static int scheme(const char*); @@ -99,141 +99,141 @@ public: static int reload_scheme(); // execution: - 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, Fl_Timeout_Handler,void* = 0); - static FL_EXPORT void repeat_timeout(double t, Fl_Timeout_Handler,void* = 0); - static FL_EXPORT int has_timeout(Fl_Timeout_Handler, void* = 0); - static FL_EXPORT void remove_timeout(Fl_Timeout_Handler, void* = 0); - static FL_EXPORT void add_check(Fl_Timeout_Handler, void* = 0); - static FL_EXPORT int has_check(Fl_Timeout_Handler, void* = 0); - static FL_EXPORT void remove_check(Fl_Timeout_Handler, 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, int when); - static FL_EXPORT void remove_fd(int); - static FL_EXPORT void add_idle(void (*cb)(void*), void* = 0); - static FL_EXPORT int has_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 void first_window(Fl_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*); + 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, Fl_Timeout_Handler,void* = 0); + static void repeat_timeout(double t, Fl_Timeout_Handler,void* = 0); + static int has_timeout(Fl_Timeout_Handler, void* = 0); + static void remove_timeout(Fl_Timeout_Handler, void* = 0); + static void add_check(Fl_Timeout_Handler, void* = 0); + static int has_check(Fl_Timeout_Handler, void* = 0); + static void remove_check(Fl_Timeout_Handler, 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, int when); + static void remove_fd(int); + static void add_idle(void (*cb)(void*), void* = 0); + static int has_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 void first_window(Fl_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*); // event information: - static FL_EXPORT int event() {return e_number;} - 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 int event_dx() {return e_dx;} - static FL_EXPORT int event_dy() {return e_dy;} - 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 compose(int &del); - static FL_EXPORT void compose_reset() {compose_state = 0;} - 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); + static int event() {return e_number;} + 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 int event_dx() {return e_dx;} + static int event_dy() {return e_dy;} + 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 compose(int &del); + static void compose_reset() {compose_state = 0;} + static int event_inside(int,int,int,int); + static int event_inside(const Fl_Widget*); + static int test_shortcut(int); // event destinations: - 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)); - static FL_EXPORT void remove_handler(int (*h)(int)); + 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 void remove_handler(int (*h)(int)); // cut/paste: - static FL_EXPORT void copy(const char* stuff, int len, int clipboard = 0); - static FL_EXPORT void paste(Fl_Widget &receiver, int clipboard /*=0*/); - static FL_EXPORT int dnd(); + static void copy(const char* stuff, int len, int clipboard = 0); + static void paste(Fl_Widget &receiver, int clipboard /*=0*/); + static int dnd(); // These are for back-compatability only: - 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*, int len); - static FL_EXPORT void paste(Fl_Widget &receiver); + static Fl_Widget* selection_owner() {return selection_owner_;} + static void selection_owner(Fl_Widget*); + static void selection(Fl_Widget &owner, const char*, int len); + static void paste(Fl_Widget &receiver); // screen size: #if defined(WIN32) || defined(__APPLE__) - static FL_EXPORT int x(); - static FL_EXPORT int y(); + static int x(); + static int y(); #else - static FL_EXPORT int x() {return 0;} - static FL_EXPORT int y() {return 0;} + static int x() {return 0;} + static int y() {return 0;} #endif /* WIN32 || __APPLE__ */ - static FL_EXPORT int w(); - static FL_EXPORT int h(); + static int w(); + static int h(); // color map: - 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); + 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); // fonts: - 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); + 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); // labeltypes: - 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 void set_labeltype(Fl_Labeltype,Fl_Label_Draw_F*,Fl_Label_Measure_F*); + static void set_labeltype(Fl_Labeltype, Fl_Labeltype from); // boxtypes: - 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); - static FL_EXPORT int draw_box_active(); + 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 int draw_box_active(); // back compatability: - 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);} + 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);} // Visible focus methods... static void visible_focus(int v) { visible_focus_ = v; } @@ -244,14 +244,14 @@ public: static int dnd_text_ops() { return dnd_text_ops_; } // Multithreading support: - static FL_EXPORT void lock(); - static FL_EXPORT void unlock(); - static FL_EXPORT void awake(void* message = 0); - static FL_EXPORT void* thread_message(); + static void lock(); + static void unlock(); + static void awake(void* message = 0); + static void* thread_message(); }; #endif // !Fl_H // -// End of "$Id: Fl.H,v 1.8.2.11.2.16 2002/07/08 15:14:37 easysw Exp $". +// End of "$Id: Fl.H,v 1.8.2.11.2.17 2002/07/14 19:08:25 easysw Exp $". // diff --git a/FL/Fl_Group.H b/FL/Fl_Group.H index e5e2a1b34..5e2a42b72 100644 --- a/FL/Fl_Group.H +++ b/FL/Fl_Group.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Group.H,v 1.6.2.4.2.4 2002/07/14 17:03:30 easysw Exp $" +// "$Id: Fl_Group.H,v 1.6.2.4.2.5 2002/07/14 19:08:25 easysw Exp $" // // Group header file for the Fast Light Tool Kit (FLTK). // @@ -30,7 +30,7 @@ #include "Fl_Widget.H" #endif -class Fl_Group : public Fl_Widget { +class FL_EXPORT Fl_Group : public Fl_Widget { Fl_Widget** array_; Fl_Widget* savedfocus_; @@ -39,7 +39,7 @@ class Fl_Group : public Fl_Widget { short *sizes_; // remembered initial sizes of children int navigation(int); - FL_EXPORT static Fl_Group *current_; + static Fl_Group *current_; protected: @@ -51,39 +51,39 @@ protected: public: - FL_EXPORT int handle(int); - FL_EXPORT void begin(); - FL_EXPORT void end(); - FL_EXPORT static Fl_Group *current(); - FL_EXPORT static void current(Fl_Group *g); + int handle(int); + void begin(); + void end(); + static Fl_Group *current(); + static void current(Fl_Group *g); int children() const {return children_;} Fl_Widget* child(int n) const {return array()[n];} - FL_EXPORT int find(const Fl_Widget*) const; + int find(const Fl_Widget*) const; int find(const Fl_Widget& o) const {return find(&o);} - FL_EXPORT Fl_Widget* const* array() const; + Fl_Widget* const* array() const; - 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 resize(int,int,int,int); + Fl_Group(int,int,int,int, const char * = 0); + virtual ~Fl_Group(); + void add(Fl_Widget&); void add(Fl_Widget* o) {add(*o);} - FL_EXPORT void insert(Fl_Widget&, int i); + void insert(Fl_Widget&, int i); void insert(Fl_Widget& o, Fl_Widget* before) {insert(o,find(before));} - FL_EXPORT void remove(Fl_Widget&); + void remove(Fl_Widget&); void remove(Fl_Widget* o) {remove(*o);} - FL_EXPORT void clear(); + 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);} - FL_EXPORT void init_sizes(); + void init_sizes(); // back compatability function: void focus(Fl_Widget* o) {o->take_focus();} Fl_Widget* & _ddfdesign_kludge() {return resizable_;} - FL_EXPORT void forms_end(); + 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.6.2.4.2.4 2002/07/14 17:03:30 easysw Exp $". +// End of "$Id: Fl_Group.H,v 1.6.2.4.2.5 2002/07/14 19:08:25 easysw Exp $". // diff --git a/FL/Fl_Help_Dialog.H b/FL/Fl_Help_Dialog.H index 47de4334f..aed8cfc01 100644 --- a/FL/Fl_Help_Dialog.H +++ b/FL/Fl_Help_Dialog.H @@ -7,7 +7,7 @@ #include <FL/Fl_Help_View.H> #include <FL/Fl_Button.H> -class Fl_Help_Dialog { +class FL_EXPORT Fl_Help_Dialog { int index_; int max_; int line_[100]; diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H index 7f8af78e2..a6828b726 100644 --- a/FL/Fl_Help_View.H +++ b/FL/Fl_Help_View.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Help_View.H,v 1.1.2.9 2002/03/05 11:26:41 easysw Exp $" +// "$Id: Fl_Help_View.H,v 1.1.2.10 2002/07/14 19:08:25 easysw Exp $" // // Help Viewer widget definitions. // @@ -92,7 +92,7 @@ struct Fl_Help_Target // Fl_Help_View class... // -class Fl_Help_View : public Fl_Group //// Help viewer widget +class FL_EXPORT Fl_Help_View : public Fl_Group //// Help viewer widget { enum { RIGHT = -1, CENTER, LEFT }; // Alignments @@ -187,5 +187,5 @@ class Fl_Help_View : public Fl_Group //// Help viewer widget #endif // !Fl_Help_View_H // -// End of "$Id: Fl_Help_View.H,v 1.1.2.9 2002/03/05 11:26:41 easysw Exp $". +// End of "$Id: Fl_Help_View.H,v 1.1.2.10 2002/07/14 19:08:25 easysw Exp $". // diff --git a/FL/Fl_Wizard.H b/FL/Fl_Wizard.H index 8d37bc172..5d151e2cf 100644 --- a/FL/Fl_Wizard.H +++ b/FL/Fl_Wizard.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Wizard.H,v 1.1.2.2 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Wizard.H,v 1.1.2.3 2002/07/14 19:08:25 easysw Exp $" // // Fl_Wizard widget definitions. // @@ -37,11 +37,11 @@ // Fl_Wizard class... // -class Fl_Wizard : public Fl_Group +class FL_EXPORT Fl_Wizard : public Fl_Group { Fl_Widget *value_; - void draw(); + FL_EXPORT void draw(); public: @@ -56,5 +56,5 @@ class Fl_Wizard : public Fl_Group #endif // !_Fl_Wizard_H_ // -// End of "$Id: Fl_Wizard.H,v 1.1.2.2 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Wizard.H,v 1.1.2.3 2002/07/14 19:08:25 easysw Exp $". // diff --git a/src/flstring.h b/src/flstring.h index c872a341d..df1615c3d 100644 --- a/src/flstring.h +++ b/src/flstring.h @@ -1,5 +1,5 @@ /* - * "$Id: flstring.h,v 1.1.2.7 2002/05/19 17:44:56 easysw Exp $" + * "$Id: flstring.h,v 1.1.2.8 2002/07/14 19:08:25 easysw Exp $" * * Common string header file for the Fast Light Tool Kit (FLTK). * @@ -26,6 +26,7 @@ #ifndef flstring_h # define flstring_h +# include <FL/Fl_Export.H> # include <config.h> # include <stdarg.h> # include <string.h> @@ -57,12 +58,12 @@ extern "C" { # endif /* __cplusplus */ # if !HAVE_SNPRINTF -extern int fl_snprintf(char *, size_t, const char *, ...); +FL_EXPORT extern int fl_snprintf(char *, size_t, const char *, ...); # define snprintf fl_snprintf # endif /* !HAVE_SNPRINTF */ # if !HAVE_VSNPRINTF -extern int fl_vsnprintf(char *, size_t, const char *, va_list ap); +FL_EXPORT extern int fl_vsnprintf(char *, size_t, const char *, va_list ap); # define vsnprintf fl_vsnprintf # endif /* !HAVE_VSNPRINTF */ @@ -72,12 +73,12 @@ extern int fl_vsnprintf(char *, size_t, const char *, va_list ap); */ # if !HAVE_STRLCAT -extern size_t fl_strlcat(char *, const char *, size_t); +FL_EXPORT extern size_t fl_strlcat(char *, const char *, size_t); # define strlcat fl_strlcat # endif /* !HAVE_STRLCAT */ # if !HAVE_STRLCPY -extern size_t fl_strlcpy(char *, const char *, size_t); +FL_EXPORT extern size_t fl_strlcpy(char *, const char *, size_t); # define strlcpy fl_strlcpy # endif /* !HAVE_STRLCPY */ @@ -87,5 +88,5 @@ extern size_t fl_strlcpy(char *, const char *, size_t); #endif /* !flstring_h */ /* - * End of "$Id: flstring.h,v 1.1.2.7 2002/05/19 17:44:56 easysw Exp $". + * End of "$Id: flstring.h,v 1.1.2.8 2002/07/14 19:08:25 easysw Exp $". */ |
