diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-06 23:51:39 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-06 23:51:39 +0000 |
| commit | 9ab0bb195e8f79568c2a52fa4ebd287b1686ccaa (patch) | |
| tree | 16b50763c44ee92024edb01f20cbe60041f98fcd /FL | |
| parent | 45010ee2fe988e00930e43713802c870c2bdecf2 (diff) | |
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
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Group.H | 8 | ||||
| -rw-r--r-- | FL/Fl_HelpView.H | 7 | ||||
| -rw-r--r-- | FL/Fl_Text_Display.H | 112 | ||||
| -rw-r--r-- | FL/Fl_Text_Editor.H | 68 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 68 |
5 files changed, 131 insertions, 132 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); - - void xy_to_rowcol(int x, int y, int* row, int* column, + FL_EXPORT static void h_scrollbar_cb(Fl_Scrollbar* w, Fl_Text_Display* d); + FL_EXPORT static void v_scrollbar_cb( Fl_Scrollbar* w, Fl_Text_Display* d); + FL_EXPORT void update_v_scrollbar(); + FL_EXPORT void update_h_scrollbar(); + FL_EXPORT int measure_vline(int visLineNum); + FL_EXPORT int longest_vline(); + FL_EXPORT int empty_vlines(); + FL_EXPORT int vline_length(int visLineNum); + FL_EXPORT int xy_to_position(int x, int y, int PosType = CHARACTER_POS); + + FL_EXPORT void xy_to_rowcol(int x, int y, int* row, int* column, 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 $". // |
