From 9ab0bb195e8f79568c2a52fa4ebd287b1686ccaa Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 6 Aug 2001 23:51:39 +0000 Subject: [PATCH] WIN32 updates to make the DLL project work again... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1563 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Group.H | 8 +- FL/Fl_HelpView.H | 7 +- FL/Fl_Text_Display.H | 110 ++++++++++++------------- FL/Fl_Text_Editor.H | 68 ++++++++-------- FL/Fl_Widget.H | 68 ++++++++-------- src/Fl_Pixmap.cxx | 6 +- src/Fl_Text_Display.cxx | 8 +- visualc/fltk.lib.dsp | 12 +++ visualc/fltkdll.dsp | 172 +++++++++++++++++++++++++++++++++++++++- 9 files changed, 320 insertions(+), 139 deletions(-) diff --git a/FL/Fl_Group.H b/FL/Fl_Group.H index 10e0dd167..8ce31914b 100644 --- a/FL/Fl_Group.H +++ b/FL/Fl_Group.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Group.H,v 1.6.2.4 2001/01/22 15:13:37 easysw Exp $" +// "$Id: Fl_Group.H,v 1.6.2.4.2.1 2001/08/06 23:51:39 easysw Exp $" // // Group header file for the Fast Light Tool Kit (FLTK). // @@ -38,8 +38,8 @@ class Fl_Group : public Fl_Widget { int children_; short *sizes_; // remembered initial sizes of children - FL_EXPORT int navigation(int); - static FL_EXPORT Fl_Group *current_; + int navigation(int); + FL_EXPORT static Fl_Group *current_; protected: @@ -96,5 +96,5 @@ public: #endif // -// End of "$Id: Fl_Group.H,v 1.6.2.4 2001/01/22 15:13:37 easysw Exp $". +// End of "$Id: Fl_Group.H,v 1.6.2.4.2.1 2001/08/06 23:51:39 easysw Exp $". // diff --git a/FL/Fl_HelpView.H b/FL/Fl_HelpView.H index 6ed53a4a2..2cf6b7349 100644 --- a/FL/Fl_HelpView.H +++ b/FL/Fl_HelpView.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_HelpView.H,v 1.1.2.1 2001/08/02 19:43:49 easysw Exp $" +// "$Id: Fl_HelpView.H,v 1.1.2.2 2001/08/06 23:51:39 easysw Exp $" // // Help Viewer widget definitions. // @@ -92,8 +92,7 @@ struct Fl_HelpTarget // Fl_HelpImage structure... // -struct Fl_Pixmap; -struct Fl_Image; +class Fl_Image; struct Fl_HelpImage { @@ -208,5 +207,5 @@ class Fl_HelpView : public Fl_Group //// Help viewer widget #endif // !_Fl_HelpView_H_ // -// End of "$Id: Fl_HelpView.H,v 1.1.2.1 2001/08/02 19:43:49 easysw Exp $". +// End of "$Id: Fl_HelpView.H,v 1.1.2.2 2001/08/06 23:51:39 easysw Exp $". // diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H index 41d180ba9..bd6654d9e 100644 --- a/FL/Fl_Text_Display.H +++ b/FL/Fl_Text_Display.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Display.H,v 1.4.2.1 2001/08/04 12:21:33 easysw Exp $" +// "$Id: Fl_Text_Display.H,v 1.4.2.2 2001/08/06 23:51:39 easysw Exp $" // // Header file for Fl_Text_Display class. // @@ -33,7 +33,7 @@ #include "Fl_Scrollbar.H" #include "Fl_Text_Buffer.H" -class FL_EXPORT Fl_Text_Display: public Fl_Group { +class Fl_Text_Display: public Fl_Group { public: enum { NORMAL_CURSOR, CARET_CURSOR, DIM_CURSOR, @@ -60,30 +60,30 @@ class FL_EXPORT Fl_Text_Display: public Fl_Group { int size; }; - Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0); - ~Fl_Text_Display(); + FL_EXPORT Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0); + FL_EXPORT ~Fl_Text_Display(); - virtual int handle(int e); - void buffer(Fl_Text_Buffer* buf); + FL_EXPORT virtual int handle(int e); + FL_EXPORT void buffer(Fl_Text_Buffer* buf); void buffer(Fl_Text_Buffer& buf) { buffer(&buf); } Fl_Text_Buffer* buffer() { return mBuffer; } - void redisplay_range(int start, int end); - void scroll(int topLineNum, int horizOffset); - void insert(const char* text); - void overstrike(const char* text); - void insert_position(int newPos); + FL_EXPORT void redisplay_range(int start, int end); + FL_EXPORT void scroll(int topLineNum, int horizOffset); + FL_EXPORT void insert(const char* text); + FL_EXPORT void overstrike(const char* text); + FL_EXPORT void insert_position(int newPos); int insert_position() { return mCursorPos; } - int in_selection(int x, int y); - void show_insert_position(); - int move_right(); - int move_left(); - int move_up(); - int move_down(); - void next_word(void); - void previous_word(void); - void show_cursor(int b = 1); + FL_EXPORT int in_selection(int x, int y); + FL_EXPORT void show_insert_position(); + FL_EXPORT int move_right(); + FL_EXPORT int move_left(); + FL_EXPORT int move_up(); + FL_EXPORT int move_down(); + FL_EXPORT void next_word(void); + FL_EXPORT void previous_word(void); + FL_EXPORT void show_cursor(int b = 1); void hide_cursor() { show_cursor(0); } - void cursor_style(int style); + FL_EXPORT void cursor_style(int style); int scrollbar_width() { return scrollbar_width_; } Fl_Align scrollbar_align() { return scrollbar_align_; } void scrollbar_width(int w) { scrollbar_width_ = w; } @@ -92,13 +92,13 @@ class FL_EXPORT Fl_Text_Display: public Fl_Group { int word_end(int pos) { return buffer()->word_end(pos); } - void highlight_data(Fl_Text_Buffer *styleBuffer, + FL_EXPORT void highlight_data(Fl_Text_Buffer *styleBuffer, Style_Table_Entry *styleTable, int nStyles, char unfinishedStyle, Unfinished_Style_Cb unfinishedHighlightCB, void *cbArg); - int position_style(int lineStartPos, int lineLen, int lineIndex, + FL_EXPORT int position_style(int lineStartPos, int lineLen, int lineIndex, int dispIndex); Fl_Font textfont() const {return (Fl_Font)textfont_;} @@ -107,62 +107,62 @@ class FL_EXPORT Fl_Text_Display: public Fl_Group { void textsize(uchar s) {textsize_ = s;} Fl_Color textcolor() const {return (Fl_Color)textcolor_;} void textcolor(uchar n) {textcolor_ = n;} - + protected: // Most (all?) of this stuff should only be called from resize() or // draw(). // Anything with "vline" indicates thats it deals with currently // visible lines. - virtual void resize(int X, int Y, int W, int H); + FL_EXPORT virtual void resize(int X, int Y, int W, int H); - virtual void draw(); - void draw_text(int X, int Y, int W, int H); - void draw_range(int start, int end); - void draw_cursor(int, int); + FL_EXPORT virtual void draw(); + FL_EXPORT void draw_text(int X, int Y, int W, int H); + FL_EXPORT void draw_range(int start, int end); + FL_EXPORT void draw_cursor(int, int); - void draw_string(int style, int x, int y, int toX, const char *string, + FL_EXPORT void draw_string(int style, int x, int y, int toX, const char *string, int nChars); - void draw_vline(int visLineNum, int leftClip, int rightClip, + FL_EXPORT void draw_vline(int visLineNum, int leftClip, int rightClip, int leftCharIndex, int rightCharIndex); - void clear_rect(int style, int x, int y, int width, int height); - void display_insert(); + FL_EXPORT void clear_rect(int style, int x, int y, int width, int height); + FL_EXPORT void display_insert(); - void offset_line_starts(int newTopLineNum); + FL_EXPORT void offset_line_starts(int newTopLineNum); - void calc_line_starts(int startLine, int endLine); + FL_EXPORT void calc_line_starts(int startLine, int endLine); - void update_line_starts(int pos, int charsInserted, int charsDeleted, + FL_EXPORT void update_line_starts(int pos, int charsInserted, int charsDeleted, int linesInserted, int linesDeleted, int *scrolled); - void calc_last_char(); + FL_EXPORT void calc_last_char(); - int position_to_line( int pos, int* lineNum ); - int string_width(const char* string, int length, int style); + FL_EXPORT int position_to_line( int pos, int* lineNum ); + FL_EXPORT int string_width(const char* string, int length, int style); - static void buffer_modified_cb(int pos, int nInserted, int nDeleted, + FL_EXPORT static void buffer_modified_cb(int pos, int nInserted, int nDeleted, int nRestyled, const char* deletedText, void* cbArg); - static void h_scrollbar_cb(Fl_Scrollbar* w, Fl_Text_Display* d); - static void v_scrollbar_cb( Fl_Scrollbar* w, Fl_Text_Display* d); - void update_v_scrollbar(); - void update_h_scrollbar(); - int measure_vline(int visLineNum); - int longest_vline(); - int empty_vlines(); - int vline_length(int visLineNum); - int xy_to_position(int x, int y, int PosType = CHARACTER_POS); + FL_EXPORT static void h_scrollbar_cb(Fl_Scrollbar* w, Fl_Text_Display* d); + FL_EXPORT static void v_scrollbar_cb( Fl_Scrollbar* w, Fl_Text_Display* d); + FL_EXPORT void update_v_scrollbar(); + FL_EXPORT void update_h_scrollbar(); + FL_EXPORT int measure_vline(int visLineNum); + FL_EXPORT int longest_vline(); + FL_EXPORT int empty_vlines(); + FL_EXPORT int vline_length(int visLineNum); + FL_EXPORT int xy_to_position(int x, int y, int PosType = CHARACTER_POS); - void xy_to_rowcol(int x, int y, int* row, int* column, + FL_EXPORT void xy_to_rowcol(int x, int y, int* row, int* column, int PosType = CHARACTER_POS); - int position_to_xy(int pos, int* x, int* y); - int position_to_linecol(int pos, int* lineNum, int* column); - void scroll_(int topLineNum, int horizOffset); + FL_EXPORT int position_to_xy(int pos, int* x, int* y); + FL_EXPORT int position_to_linecol(int pos, int* lineNum, int* column); + FL_EXPORT void scroll_(int topLineNum, int horizOffset); - void extend_range_for_styles(int* start, int* end); + FL_EXPORT void extend_range_for_styles(int* start, int* end); int damage_range1_start, damage_range1_end; @@ -225,5 +225,5 @@ class FL_EXPORT Fl_Text_Display: public Fl_Group { #endif // -// End of "$Id: Fl_Text_Display.H,v 1.4.2.1 2001/08/04 12:21:33 easysw Exp $". +// End of "$Id: Fl_Text_Display.H,v 1.4.2.2 2001/08/06 23:51:39 easysw Exp $". // diff --git a/FL/Fl_Text_Editor.H b/FL/Fl_Text_Editor.H index 9a6533949..6ad00d7bd 100644 --- a/FL/Fl_Text_Editor.H +++ b/FL/Fl_Text_Editor.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Editor.H,v 1.1.2.1 2001/08/04 12:21:33 easysw Exp $" +// "$Id: Fl_Text_Editor.H,v 1.1.2.2 2001/08/06 23:51:39 easysw Exp $" // // Header file for Fl_Text_Editor class. // @@ -33,7 +33,7 @@ // key will match in any state #define FL_TEXT_EDITOR_ANY_STATE (-1L) -class FL_EXPORT Fl_Text_Editor : public Fl_Text_Display { +class Fl_Text_Editor : public Fl_Text_Display { public: typedef int (*Key_Func)(int key, Fl_Text_Editor* editor); @@ -44,62 +44,62 @@ class FL_EXPORT Fl_Text_Editor : public Fl_Text_Display { Key_Binding* next; }; - Fl_Text_Editor(int X, int Y, int W, int H, const char* l = 0); + FL_EXPORT Fl_Text_Editor(int X, int Y, int W, int H, const char* l = 0); ~Fl_Text_Editor() { remove_all_key_bindings(); } - virtual int handle(int e); + FL_EXPORT virtual int handle(int e); void insert_mode(int b) { insert_mode_ = b; } int insert_mode() { return insert_mode_; } - void add_key_binding(int key, int state, Key_Func f, Key_Binding** list); + FL_EXPORT void add_key_binding(int key, int state, Key_Func f, Key_Binding** list); void add_key_binding(int key, int state, Key_Func f) { add_key_binding(key, state, f, &key_bindings); } - void remove_key_binding(int key, int state, Key_Binding** list); + FL_EXPORT void remove_key_binding(int key, int state, Key_Binding** list); void remove_key_binding(int key, int state) { remove_key_binding(key, state, &key_bindings); } - void remove_all_key_bindings(Key_Binding** list); + FL_EXPORT void remove_all_key_bindings(Key_Binding** list); void remove_all_key_bindings() { remove_all_key_bindings(&key_bindings); } - void add_default_key_bindings(Key_Binding** list); - Key_Func bound_key_function(int key, int state, Key_Binding* list); + FL_EXPORT void add_default_key_bindings(Key_Binding** list); + FL_EXPORT Key_Func bound_key_function(int key, int state, Key_Binding* list); Key_Func bound_key_function(int key, int state) { return bound_key_function(key, state, key_bindings); } void default_key_function(Key_Func f) { default_key_function_ = f; } // functions for the built in default bindings - static int kf_default(int c, Fl_Text_Editor* e); - static int kf_ignore(int c, Fl_Text_Editor* e); - static int kf_backspace(int c, Fl_Text_Editor* e); - static int kf_enter(int c, Fl_Text_Editor* e); - static int kf_move(int c, Fl_Text_Editor* e); - static int kf_shift_move(int c, Fl_Text_Editor* e); - static int kf_ctrl_move(int c, Fl_Text_Editor* e); - static int kf_c_s_move(int c, Fl_Text_Editor* e); - static int kf_home(int, Fl_Text_Editor* e); - static int kf_end(int c, Fl_Text_Editor* e); - static int kf_left(int c, Fl_Text_Editor* e); - static int kf_up(int c, Fl_Text_Editor* e); - static int kf_right(int c, Fl_Text_Editor* e); - static int kf_down(int c, Fl_Text_Editor* e); - static int kf_page_up(int c, Fl_Text_Editor* e); - static int kf_page_down(int c, Fl_Text_Editor* e); - static int kf_insert(int c, Fl_Text_Editor* e); - static int kf_delete(int c, Fl_Text_Editor* e); - static int kf_copy(int c, Fl_Text_Editor* e); - static int kf_cut(int c, Fl_Text_Editor* e); - static int kf_paste(int c, Fl_Text_Editor* e); - static int kf_select_all(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_default(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_ignore(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_backspace(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_enter(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_move(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_shift_move(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_ctrl_move(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_c_s_move(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_home(int, Fl_Text_Editor* e); + FL_EXPORT static int kf_end(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_left(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_up(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_right(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_down(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_page_up(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_page_down(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_insert(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_delete(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_copy(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_cut(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_paste(int c, Fl_Text_Editor* e); + FL_EXPORT static int kf_select_all(int c, Fl_Text_Editor* e); protected: - int handle_key(); + FL_EXPORT int handle_key(); int insert_mode_; Key_Binding* key_bindings; - static Key_Binding* global_key_bindings; + FL_EXPORT static Key_Binding* global_key_bindings; Key_Func default_key_function_; }; #endif // -// End of "$Id: Fl_Text_Editor.H,v 1.1.2.1 2001/08/04 12:21:33 easysw Exp $". +// End of "$Id: Fl_Text_Editor.H,v 1.1.2.2 2001/08/06 23:51:39 easysw Exp $". // diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index 3f5804188..b9de751ce 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Widget.H,v 1.6.2.4.2.5 2001/08/05 23:58:54 easysw Exp $" +// "$Id: Fl_Widget.H,v 1.6.2.4.2.6 2001/08/06 23:51:39 easysw Exp $" // // Widget header file for the Fast Light Tool Kit (FLTK). // @@ -49,7 +49,7 @@ struct Fl_Label { FL_EXPORT void measure(int&, int&) const ; }; -class FL_EXPORT Fl_Widget { +class Fl_Widget { friend class Fl_Group; Fl_Widget* parent_; @@ -69,12 +69,12 @@ class FL_EXPORT Fl_Widget { const char *tooltip_; // "de-implement" the copy constructors: - Fl_Widget & operator=(const Fl_Widget &); - Fl_Widget(const Fl_Widget &); + FL_EXPORT Fl_Widget & operator=(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;} @@ -86,20 +86,20 @@ 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_focus() {draw_focus(box(),x(),y(),w(),h());} - void draw_focus(Fl_Boxtype, int,int,int,int) 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_focus() {draw_focus(box(),x(),y(),w(),h());} + FL_EXPORT void draw_focus(Fl_Boxtype, int,int,int,int) const; + FL_EXPORT void draw_label() const; + FL_EXPORT void draw_label(int, int, int, int) const; public: - virtual ~Fl_Widget(); + FL_EXPORT virtual ~Fl_Widget(); - virtual void draw() = 0; - virtual int handle(int); + FL_EXPORT virtual void draw() = 0; + FL_EXPORT virtual int handle(int); Fl_Widget* parent() const {return parent_;} void parent(Fl_Widget* w) {parent_ = w;} // for hacks only @@ -110,8 +110,8 @@ public: 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); + FL_EXPORT virtual void resize(int,int,int,int); + FL_EXPORT 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);} @@ -156,15 +156,15 @@ public: void when(uchar i) {when_ = i;} int visible() const {return !(flags_&INVISIBLE);} - int visible_r() const; - void show(); - void hide(); + FL_EXPORT int visible_r() const; + FL_EXPORT void show(); + FL_EXPORT 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(); + FL_EXPORT int active_r() const; + FL_EXPORT void activate(); + FL_EXPORT void deactivate(); int output() const {return (flags_&OUTPUT);} void set_output() {flags_ |= OUTPUT;} void clear_output() {flags_ &= ~OUTPUT;} @@ -172,26 +172,26 @@ public: int changed() const {return flags_&CHANGED;} void set_changed() {flags_ |= CHANGED;} void clear_changed() {flags_ &= ~CHANGED;} - int take_focus(); + FL_EXPORT int take_focus(); - static void default_callback(Fl_Widget*, void*); + FL_EXPORT 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 ; + FL_EXPORT int test_shortcut(); + FL_EXPORT static int test_shortcut(const char*); + FL_EXPORT int contains(const Fl_Widget*) const ; int inside(const Fl_Widget* o) const {return o ? o->contains(this) : 0;} - void redraw(); + FL_EXPORT 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; + 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; void measure_label(int& x, int& y) {label_.measure(x,y);} - Fl_Window* window() const ; + FL_EXPORT Fl_Window* window() const ; // back compatability only: Fl_Color color2() const {return (Fl_Color)color2_;} @@ -206,5 +206,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.5 2001/08/05 23:58:54 easysw Exp $". +// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.6 2001/08/06 23:51:39 easysw Exp $". // diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index df0e029a6..77146622a 100644 --- a/src/Fl_Pixmap.cxx +++ b/src/Fl_Pixmap.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.1 2001/08/05 23:58:54 easysw Exp $" +// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.2 2001/08/06 23:51:39 easysw Exp $" // // Pixmap drawing code for the Fast Light Tool Kit (FLTK). // @@ -91,7 +91,7 @@ void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) { int Bpr = (bpp*w()+7)/8; //: bytes per row int pad = Bpr&1, w1 = (w()+7)/8, shr = ((w()-1)&7)+1; if (bpp==4) shr = (shr+1)/2; - uchar *newarray = new uchar[(Bpr+pad)*h], *dst = newarray, *src = bitmap; + uchar *newarray = new uchar[(Bpr+pad)*h()], *dst = newarray, *src = bitmap; for (int i=0; i0; j--) { @@ -178,5 +178,5 @@ void Fl_Pixmap::label(Fl_Menu_Item* m) { } // -// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.1 2001/08/05 23:58:54 easysw Exp $". +// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.2 2001/08/06 23:51:39 easysw Exp $". // diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 2ad16824a..fb9242be5 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Display.cxx,v 1.12.2.1 2001/08/04 12:21:33 easysw Exp $" +// "$Id: Fl_Text_Display.cxx,v 1.12.2.2 2001/08/06 23:51:39 easysw Exp $" // // Copyright Mark Edel. Permission to distribute under the LGPL for // the FLTK library granted by Mark Edel. @@ -205,8 +205,8 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) { mMaxsize = max(mMaxsize, fl_height(mStyleTable[i].font, mStyleTable[i].size)); // did we have scrollbars initially? - bool hscrollbarvisible = mHScrollBar->visible(); - bool vscrollbarvisible = mVScrollBar->visible(); + int hscrollbarvisible = mHScrollBar->visible(); + int vscrollbarvisible = mVScrollBar->visible(); // try without scrollbars first mVScrollBar->clear_visible(); @@ -1948,5 +1948,5 @@ int Fl_Text_Display::handle(int event) { // -// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.1 2001/08/04 12:21:33 easysw Exp $". +// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.2 2001/08/06 23:51:39 easysw Exp $". // diff --git a/visualc/fltk.lib.dsp b/visualc/fltk.lib.dsp index c655d9878..28e5f313a 100644 --- a/visualc/fltk.lib.dsp +++ b/visualc/fltk.lib.dsp @@ -467,6 +467,18 @@ SOURCE=..\src\Fl_Tabs.cxx # End Source File # Begin Source File +SOURCE=..\src\Fl_Text_Buffer.cxx +# End Source File +# Begin Source File + +SOURCE=..\src\Fl_Text_Display.cxx +# End Source File +# Begin Source File + +SOURCE=..\src\Fl_Text_Editor.cxx +# End Source File +# Begin Source File + SOURCE=..\src\Fl_Tile.cxx # End Source File # Begin Source File diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp index 61fda1eae..c35ec6cfb 100644 --- a/visualc/fltkdll.dsp +++ b/visualc/fltkdll.dsp @@ -94,6 +94,7 @@ LINK32=link.exe SOURCE=..\src\filename_absolute.cxx DEP_CPP_FILEN=\ "..\fl\filename.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -101,6 +102,7 @@ DEP_CPP_FILEN=\ SOURCE=..\src\filename_expand.cxx DEP_CPP_FILENA=\ "..\fl\filename.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -108,6 +110,7 @@ DEP_CPP_FILENA=\ SOURCE=..\src\filename_ext.cxx DEP_CPP_FILENAM=\ "..\fl\filename.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -115,6 +118,7 @@ DEP_CPP_FILENAM=\ SOURCE=..\src\filename_isdir.cxx DEP_CPP_FILENAME=\ "..\fl\filename.h"\ + "..\fl\fl_export.h"\ ".\config.h"\ # End Source File @@ -123,6 +127,7 @@ DEP_CPP_FILENAME=\ SOURCE=..\src\filename_list.cxx DEP_CPP_FILENAME_=\ "..\fl\filename.h"\ + "..\fl\fl_export.h"\ ".\config.h"\ # End Source File @@ -131,6 +136,7 @@ DEP_CPP_FILENAME_=\ SOURCE=..\src\filename_match.cxx DEP_CPP_FILENAME_M=\ "..\fl\filename.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -138,6 +144,7 @@ DEP_CPP_FILENAME_M=\ SOURCE=..\src\filename_setext.cxx DEP_CPP_FILENAME_S=\ "..\fl\filename.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -147,6 +154,7 @@ DEP_CPP_FL_CX=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_tooltip.h"\ "..\fl\fl_widget.h"\ @@ -161,6 +169,7 @@ SOURCE=..\src\Fl_abort.cxx DEP_CPP_FL_AB=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ ".\config.h"\ # End Source File @@ -170,6 +179,7 @@ SOURCE=..\src\Fl_add_idle.cxx DEP_CPP_FL_AD=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -181,6 +191,8 @@ DEP_CPP_FL_ADJ=\ "..\fl\fl_adjuster.h"\ "..\fl\fl_bitmap.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ + "..\fl\fl_image.h"\ "..\fl\fl_valuator.h"\ "..\fl\fl_widget.h"\ "..\src\fastarrow.h"\ @@ -194,6 +206,7 @@ SOURCE=..\src\fl_arc.cxx DEP_CPP_FL_AR=\ "..\fl\enumerations.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\FL\math.h"\ # End Source File @@ -203,6 +216,7 @@ SOURCE=..\src\fl_arci.cxx DEP_CPP_FL_ARC=\ "..\fl\enumerations.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -219,6 +233,7 @@ DEP_CPP_FL_ARG=\ "..\fl\filename.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -235,6 +250,7 @@ DEP_CPP_FL_AS=\ "..\fl\fl_ask.h"\ "..\fl\fl_box.h"\ "..\fl\fl_button.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_input.h"\ "..\fl\fl_input_.h"\ @@ -255,7 +271,9 @@ DEP_CPP_FL_BI=\ "..\fl\fl.h"\ "..\fl\fl_bitmap.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ + "..\fl\fl_image.h"\ "..\fl\fl_menu_item.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -269,6 +287,7 @@ SOURCE=..\src\Fl_Box.cxx DEP_CPP_FL_BO=\ "..\fl\enumerations.h"\ "..\fl\fl_box.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_widget.h"\ # End Source File @@ -279,6 +298,7 @@ DEP_CPP_FL_BOX=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_widget.h"\ ".\config.h"\ @@ -292,6 +312,7 @@ DEP_CPP_FL_BR=\ "..\fl\fl_browser.h"\ "..\fl\fl_browser_.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_scrollbar.h"\ "..\fl\fl_slider.h"\ @@ -307,6 +328,7 @@ DEP_CPP_FL_BRO=\ "..\fl\fl.h"\ "..\fl\fl_browser_.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_scrollbar.h"\ "..\fl\fl_slider.h"\ @@ -322,6 +344,7 @@ DEP_CPP_FL_BROW=\ "..\fl\fl.h"\ "..\fl\fl_browser.h"\ "..\fl\fl_browser_.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_scrollbar.h"\ "..\fl\fl_slider.h"\ @@ -336,6 +359,7 @@ DEP_CPP_FL_BU=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_button.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ @@ -348,6 +372,7 @@ DEP_CPP_FL_CH=\ "..\fl\fl.h"\ "..\fl\fl_chart.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_widget.h"\ "..\FL\math.h"\ @@ -360,6 +385,7 @@ DEP_CPP_FL_CHE=\ "..\fl\fl.h"\ "..\fl\fl_button.h"\ "..\fl\fl_check_button.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_light_button.h"\ "..\fl\fl_widget.h"\ @@ -372,6 +398,7 @@ DEP_CPP_FL_CHO=\ "..\fl\fl.h"\ "..\fl\fl_choice.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_menu_.h"\ "..\fl\fl_menu_item.h"\ "..\fl\fl_widget.h"\ @@ -385,6 +412,7 @@ DEP_CPP_FL_CL=\ "..\fl\fl.h"\ "..\fl\fl_clock.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_widget.h"\ # End Source File @@ -395,6 +423,7 @@ DEP_CPP_FL_CO=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -417,6 +446,7 @@ DEP_CPP_FL_COL=\ "..\fl\fl_choice.h"\ "..\fl\fl_color_chooser.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_input.h"\ "..\fl\fl_input_.h"\ @@ -436,6 +466,7 @@ SOURCE=..\src\Fl_compose.cxx DEP_CPP_FL_COM=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -446,6 +477,7 @@ DEP_CPP_FL_COU=\ "..\fl\fl.h"\ "..\fl\fl_counter.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_valuator.h"\ "..\fl\fl_widget.h"\ @@ -457,6 +489,7 @@ DEP_CPP_FL_CU=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -470,6 +503,7 @@ SOURCE=..\src\fl_curve.cxx DEP_CPP_FL_CUR=\ "..\fl\enumerations.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -478,6 +512,7 @@ SOURCE=..\src\Fl_cutpaste.cxx DEP_CPP_FL_CUT=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -494,6 +529,7 @@ DEP_CPP_FL_DI=\ "..\fl\fl.h"\ "..\fl\fl_dial.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_valuator.h"\ "..\fl\fl_widget.h"\ "..\FL\math.h"\ @@ -506,6 +542,7 @@ DEP_CPP_FL_DIA=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -514,6 +551,7 @@ SOURCE=..\src\Fl_display.cxx DEP_CPP_FL_DIS=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -524,6 +562,7 @@ DEP_CPP_FL_DO=\ "..\fl\fl.h"\ "..\fl\fl_double_window.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -538,6 +577,8 @@ SOURCE=..\src\fl_draw.cxx DEP_CPP_FL_DR=\ "..\fl\enumerations.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ + "..\fl\fl_image.h"\ # End Source File # Begin Source File @@ -547,6 +588,7 @@ DEP_CPP_FL_DRA=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -564,6 +606,7 @@ DEP_CPP_FL_DRAW=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -579,6 +622,7 @@ DEP_CPP_FL_EN=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_widget.h"\ # End Source File @@ -593,6 +637,7 @@ DEP_CPP_FL_FI=\ "..\fl\fl_browser_.h"\ "..\fl\fl_button.h"\ "..\fl\fl_choice.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_file_chooser.h"\ "..\fl\fl_filebrowser.h"\ "..\fl\fl_filechooser.h"\ @@ -621,6 +666,7 @@ DEP_CPP_FL_FIL=\ "..\fl\fl_browser.h"\ "..\fl\fl_browser_.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_filebrowser.h"\ "..\fl\fl_fileicon.h"\ "..\fl\fl_group.h"\ @@ -628,6 +674,7 @@ DEP_CPP_FL_FIL=\ "..\fl\fl_slider.h"\ "..\fl\fl_valuator.h"\ "..\fl\fl_widget.h"\ + ".\config.h"\ # End Source File # Begin Source File @@ -642,10 +689,12 @@ DEP_CPP_FL_FILE=\ "..\fl\fl_browser_.h"\ "..\fl\fl_button.h"\ "..\fl\fl_choice.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_filebrowser.h"\ "..\fl\fl_filechooser.h"\ "..\fl\fl_fileicon.h"\ "..\fl\fl_group.h"\ + "..\fl\fl_image.h"\ "..\fl\fl_input.h"\ "..\fl\fl_input_.h"\ "..\fl\fl_menu_.h"\ @@ -670,6 +719,7 @@ DEP_CPP_FL_FILEC=\ "..\fl\fl_browser_.h"\ "..\fl\fl_button.h"\ "..\fl\fl_choice.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_filebrowser.h"\ "..\fl\fl_filechooser.h"\ "..\fl\fl_fileicon.h"\ @@ -696,6 +746,7 @@ DEP_CPP_FL_FILEI=\ "..\fl\filename.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_fileicon.h"\ "..\fl\fl_widget.h"\ ".\config.h"\ @@ -708,6 +759,7 @@ DEP_CPP_FL_FO=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -724,6 +776,7 @@ SOURCE=..\src\Fl_get_key.cxx DEP_CPP_FL_GE=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -738,6 +791,7 @@ SOURCE=..\src\Fl_get_system_colors.cxx DEP_CPP_FL_GET=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -752,6 +806,7 @@ SOURCE=..\src\Fl_grab.cxx DEP_CPP_FL_GR=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -767,6 +822,7 @@ DEP_CPP_FL_GRO=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_tooltip.h"\ "..\fl\fl_widget.h"\ @@ -781,6 +837,7 @@ DEP_CPP_FL_HE=\ "..\fl\fl.h"\ "..\fl\fl_button.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_helpdialog.h"\ "..\fl\fl_helpview.h"\ @@ -798,6 +855,7 @@ DEP_CPP_FL_HEL=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_helpview.h"\ "..\fl\fl_image.h"\ @@ -816,6 +874,7 @@ DEP_CPP_FL_IM=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_image.h"\ "..\fl\fl_menu_item.h"\ @@ -832,6 +891,7 @@ DEP_CPP_FL_IN=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_input.h"\ "..\fl\fl_input_.h"\ "..\fl\fl_widget.h"\ @@ -844,6 +904,7 @@ DEP_CPP_FL_INP=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_input_.h"\ "..\fl\fl_widget.h"\ @@ -855,6 +916,7 @@ DEP_CPP_FL_LA=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_input_.h"\ "..\fl\fl_widget.h"\ @@ -868,6 +930,7 @@ DEP_CPP_FL_LI=\ "..\fl\fl.h"\ "..\fl\fl_button.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_light_button.h"\ "..\fl\fl_widget.h"\ @@ -878,6 +941,7 @@ SOURCE=..\src\fl_line_style.cxx DEP_CPP_FL_LIN=\ "..\fl\enumerations.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -892,6 +956,7 @@ DEP_CPP_FL_ME=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_menu_.h"\ "..\fl\fl_menu_item.h"\ @@ -907,6 +972,7 @@ SOURCE=..\src\Fl_Menu_.cxx DEP_CPP_FL_MEN=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_menu_.h"\ "..\fl\fl_menu_item.h"\ "..\fl\fl_widget.h"\ @@ -917,6 +983,7 @@ DEP_CPP_FL_MEN=\ SOURCE=..\src\Fl_Menu_add.cxx DEP_CPP_FL_MENU=\ "..\fl\enumerations.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_menu_.h"\ "..\fl\fl_menu_item.h"\ "..\fl\fl_widget.h"\ @@ -928,6 +995,7 @@ SOURCE=..\src\Fl_Menu_Bar.cxx DEP_CPP_FL_MENU_=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_menu_.h"\ "..\fl\fl_menu_bar.h"\ "..\fl\fl_menu_item.h"\ @@ -941,6 +1009,7 @@ DEP_CPP_FL_MENU_B=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_menu_.h"\ "..\fl\fl_menu_button.h"\ "..\fl\fl_menu_item.h"\ @@ -953,6 +1022,7 @@ SOURCE=..\src\Fl_Menu_global.cxx DEP_CPP_FL_MENU_G=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_menu_.h"\ "..\fl\fl_menu_item.h"\ "..\fl\fl_widget.h"\ @@ -965,6 +1035,7 @@ DEP_CPP_FL_MENU_W=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_menu_window.h"\ "..\fl\fl_single_window.h"\ @@ -981,6 +1052,7 @@ SOURCE=..\src\Fl_Multi_Label.cxx DEP_CPP_FL_MU=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_menu_item.h"\ "..\fl\fl_multi_label.h"\ "..\fl\fl_widget.h"\ @@ -993,6 +1065,7 @@ DEP_CPP_FL_OU=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_input_.h"\ "..\fl\fl_output.h"\ "..\fl\fl_widget.h"\ @@ -1005,6 +1078,7 @@ DEP_CPP_FL_OV=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -1013,6 +1087,7 @@ SOURCE=..\src\fl_overlay.cxx DEP_CPP_FL_OVE=\ "..\fl\enumerations.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1026,6 +1101,7 @@ SOURCE=..\src\fl_overlay_visual.cxx DEP_CPP_FL_OVER=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1042,6 +1118,7 @@ DEP_CPP_FL_OVERL=\ "..\fl\fl.h"\ "..\fl\fl_double_window.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_overlay_window.h"\ "..\fl\fl_widget.h"\ @@ -1057,6 +1134,7 @@ SOURCE=..\src\Fl_own_colormap.cxx DEP_CPP_FL_OW=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1072,6 +1150,7 @@ DEP_CPP_FL_PA=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_pack.h"\ "..\fl\fl_widget.h"\ @@ -1084,7 +1163,9 @@ DEP_CPP_FL_PI=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ + "..\fl\fl_image.h"\ "..\fl\fl_menu_item.h"\ "..\fl\fl_pixmap.h"\ "..\fl\fl_widget.h"\ @@ -1100,6 +1181,7 @@ DEP_CPP_FL_PO=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_positioner.h"\ "..\fl\fl_widget.h"\ @@ -1110,6 +1192,7 @@ SOURCE=..\src\fl_rect.cxx DEP_CPP_FL_RE=\ "..\fl\enumerations.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1124,6 +1207,7 @@ DEP_CPP_FL_REP=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_button.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_repeat_button.h"\ "..\fl\fl_widget.h"\ @@ -1136,6 +1220,7 @@ DEP_CPP_FL_RET=\ "..\fl\fl.h"\ "..\fl\fl_button.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_return_button.h"\ "..\fl\fl_widget.h"\ @@ -1147,6 +1232,7 @@ DEP_CPP_FL_RO=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_roller.h"\ "..\fl\fl_valuator.h"\ "..\fl\fl_widget.h"\ @@ -1159,6 +1245,7 @@ DEP_CPP_FL_ROU=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -1168,6 +1255,7 @@ DEP_CPP_FL_ROUN=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_button.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_light_button.h"\ "..\fl\fl_round_button.h"\ "..\fl\fl_widget.h"\ @@ -1180,6 +1268,7 @@ DEP_CPP_FL_ROUND=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -1189,6 +1278,7 @@ DEP_CPP_FL_SC=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_scroll.h"\ "..\fl\fl_scrollbar.h"\ @@ -1202,6 +1292,7 @@ DEP_CPP_FL_SC=\ SOURCE=..\src\fl_scroll_area.cxx DEP_CPP_FL_SCR=\ "..\fl\enumerations.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1216,6 +1307,7 @@ DEP_CPP_FL_SCRO=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_scrollbar.h"\ "..\fl\fl_slider.h"\ "..\fl\fl_valuator.h"\ @@ -1228,6 +1320,7 @@ SOURCE=..\src\fl_set_font.cxx DEP_CPP_FL_SE=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1243,6 +1336,7 @@ SOURCE=..\src\fl_set_fonts.cxx DEP_CPP_FL_SET=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1259,6 +1353,7 @@ DEP_CPP_FL_SH=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -1269,6 +1364,7 @@ DEP_CPP_FL_SHO=\ "..\fl\fl.h"\ "..\fl\fl_button.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1283,6 +1379,7 @@ DEP_CPP_FL_SHOW=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_show_colormap.h"\ "..\fl\fl_single_window.h"\ @@ -1296,6 +1393,7 @@ DEP_CPP_FL_SHOW=\ SOURCE=..\src\Fl_Single_Window.cxx DEP_CPP_FL_SI=\ "..\fl\enumerations.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_single_window.h"\ "..\fl\fl_widget.h"\ @@ -1309,6 +1407,7 @@ DEP_CPP_FL_SL=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_slider.h"\ "..\fl\fl_valuator.h"\ "..\fl\fl_widget.h"\ @@ -1321,7 +1420,7 @@ DEP_CPP_FL_SY=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ - "..\fl\fl_widget.h"\ + "..\fl\fl_export.h"\ # End Source File # Begin Source File @@ -1331,6 +1430,7 @@ DEP_CPP_FL_TA=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_tabs.h"\ "..\fl\fl_widget.h"\ @@ -1338,10 +1438,54 @@ DEP_CPP_FL_TA=\ # End Source File # Begin Source File +SOURCE=..\src\Fl_Text_Buffer.cxx +DEP_CPP_FL_TE=\ + "..\fl\fl_export.h"\ + "..\fl\fl_text_buffer.h"\ + +# End Source File +# Begin Source File + +SOURCE=..\src\Fl_Text_Display.cxx +DEP_CPP_FL_TEX=\ + "..\fl\enumerations.h"\ + "..\fl\fl.h"\ + "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ + "..\fl\fl_group.h"\ + "..\fl\fl_scrollbar.h"\ + "..\fl\fl_slider.h"\ + "..\fl\fl_text_buffer.h"\ + "..\fl\fl_text_display.h"\ + "..\fl\fl_valuator.h"\ + "..\fl\fl_widget.h"\ + +# End Source File +# Begin Source File + +SOURCE=..\src\Fl_Text_Editor.cxx +DEP_CPP_FL_TEXT=\ + "..\fl\enumerations.h"\ + "..\fl\fl.h"\ + "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ + "..\fl\fl_group.h"\ + "..\fl\fl_scrollbar.h"\ + "..\fl\fl_slider.h"\ + "..\fl\fl_text_buffer.h"\ + "..\fl\fl_text_display.h"\ + "..\fl\fl_text_editor.h"\ + "..\fl\fl_valuator.h"\ + "..\fl\fl_widget.h"\ + +# End Source File +# Begin Source File + SOURCE=..\src\Fl_Tile.cxx DEP_CPP_FL_TI=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_tile.h"\ "..\fl\fl_widget.h"\ @@ -1356,6 +1500,7 @@ DEP_CPP_FL_TO=\ "..\fl\fl.h"\ "..\fl\fl_box.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_menu_window.h"\ "..\fl\fl_single_window.h"\ @@ -1370,6 +1515,7 @@ SOURCE=..\src\Fl_Valuator.cxx DEP_CPP_FL_VA=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_valuator.h"\ "..\fl\fl_widget.h"\ "..\FL\math.h"\ @@ -1381,6 +1527,7 @@ SOURCE=..\src\Fl_Value_Input.cxx DEP_CPP_FL_VAL=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_input.h"\ "..\fl\fl_input_.h"\ @@ -1396,6 +1543,7 @@ DEP_CPP_FL_VALU=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_valuator.h"\ "..\fl\fl_value_output.h"\ "..\fl\fl_widget.h"\ @@ -1408,6 +1556,7 @@ DEP_CPP_FL_VALUE=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_slider.h"\ "..\fl\fl_valuator.h"\ "..\fl\fl_value_slider.h"\ @@ -1420,6 +1569,7 @@ SOURCE=..\src\fl_vertex.cxx DEP_CPP_FL_VE=\ "..\fl\enumerations.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1434,6 +1584,7 @@ SOURCE=..\src\Fl_visual.cxx DEP_CPP_FL_VI=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1448,6 +1599,8 @@ SOURCE=..\src\Fl_Widget.cxx DEP_CPP_FL_WI=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_tooltip.h"\ "..\fl\fl_widget.h"\ @@ -1459,6 +1612,7 @@ SOURCE=..\src\Fl_Window.cxx DEP_CPP_FL_WIN=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1470,6 +1624,7 @@ SOURCE=..\src\Fl_Window_fullscreen.cxx DEP_CPP_FL_WIND=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1483,6 +1638,7 @@ SOURCE=..\src\Fl_Window_hotspot.cxx DEP_CPP_FL_WINDO=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1494,6 +1650,7 @@ DEP_CPP_FL_WINDO=\ SOURCE=..\src\Fl_Window_iconize.cxx DEP_CPP_FL_WINDOW=\ "..\fl\enumerations.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1507,6 +1664,7 @@ SOURCE=..\src\Fl_Wizard.cxx DEP_CPP_FL_WIZ=\ "..\fl\enumerations.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_wizard.h"\ @@ -1519,6 +1677,7 @@ DEP_CPP_FL_X_=\ "..\fl\enumerations.h"\ "..\fl\filename.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_group.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ @@ -1548,11 +1707,13 @@ DEP_CPP_FORMS=\ "..\fl\fl_counter.h"\ "..\fl\fl_dial.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_file_chooser.h"\ "..\fl\fl_formsbitmap.h"\ "..\fl\fl_formspixmap.h"\ "..\fl\fl_free.h"\ "..\fl\fl_group.h"\ + "..\fl\fl_image.h"\ "..\fl\fl_input.h"\ "..\fl\fl_input_.h"\ "..\fl\fl_light_button.h"\ @@ -1593,11 +1754,13 @@ DEP_CPP_FORMS_=\ "..\fl\fl_counter.h"\ "..\fl\fl_dial.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_file_chooser.h"\ "..\fl\fl_formsbitmap.h"\ "..\fl\fl_formspixmap.h"\ "..\fl\fl_free.h"\ "..\fl\fl_group.h"\ + "..\fl\fl_image.h"\ "..\fl\fl_input.h"\ "..\fl\fl_input_.h"\ "..\fl\fl_light_button.h"\ @@ -1626,6 +1789,7 @@ SOURCE=..\src\forms_free.cxx DEP_CPP_FORMS_F=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_free.h"\ "..\fl\fl_widget.h"\ @@ -1650,11 +1814,13 @@ DEP_CPP_FORMS_FS=\ "..\fl\fl_counter.h"\ "..\fl\fl_dial.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_file_chooser.h"\ "..\fl\fl_formsbitmap.h"\ "..\fl\fl_formspixmap.h"\ "..\fl\fl_free.h"\ "..\fl\fl_group.h"\ + "..\fl\fl_image.h"\ "..\fl\fl_input.h"\ "..\fl\fl_input_.h"\ "..\fl\fl_light_button.h"\ @@ -1695,11 +1861,13 @@ DEP_CPP_FORMS_P=\ "..\fl\fl_counter.h"\ "..\fl\fl_dial.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_file_chooser.h"\ "..\fl\fl_formsbitmap.h"\ "..\fl\fl_formspixmap.h"\ "..\fl\fl_free.h"\ "..\fl\fl_group.h"\ + "..\fl\fl_image.h"\ "..\fl\fl_input.h"\ "..\fl\fl_input_.h"\ "..\fl\fl_light_button.h"\ @@ -1727,6 +1895,7 @@ DEP_CPP_FORMS_T=\ "..\fl\enumerations.h"\ "..\fl\fl.h"\ "..\fl\fl_draw.h"\ + "..\fl\fl_export.h"\ "..\fl\fl_timer.h"\ "..\fl\fl_widget.h"\ @@ -1736,6 +1905,7 @@ DEP_CPP_FORMS_T=\ SOURCE=..\src\numericsort.c DEP_CPP_NUMER=\ "..\fl\filename.h"\ + "..\fl\fl_export.h"\ ".\config.h"\ # End Source File