diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2006-06-18 15:53:26 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2006-06-18 15:53:26 +0000 |
| commit | 582447c16482d8ff57ae61ab21d052d9243d7d5d (patch) | |
| tree | a61db422fabddc47550f9680380fa961d296f8c2 | |
| parent | baeafbea45cc47aaaab2bca6e55ca9f63c307d0e (diff) | |
Converted global static variables into class static variables
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5207 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Help_View.H | 15 | ||||
| -rw-r--r-- | src/Fl_Help_View.cxx | 28 |
2 files changed, 29 insertions, 14 deletions
diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H index d8a20fb17..e2ac842db 100644 --- a/FL/Fl_Help_View.H +++ b/FL/Fl_Help_View.H @@ -133,6 +133,21 @@ class FL_EXPORT Fl_Help_View : public Fl_Group //// Help viewer widget Fl_Scrollbar scrollbar_, // Vertical scrollbar for document hscrollbar_; // Horizontal scrollbar + static int selection_first; + static int selection_last; + static int selection_push_first; + static int selection_push_last; + static int selection_drag_first; + static int selection_drag_last; + static int selected; + static int draw_mode; + static int mouse_x; + static int mouse_y; + static int current_pos; + static Fl_Help_View *current_view; + static Fl_Color hv_selection_color; + static Fl_Color hv_selection_text_color; + Fl_Help_Block *add_block(const char *s, int xx, int yy, int ww, int hh, uchar border = 0); void add_link(const char *n, int xx, int yy, int ww, int hh); void add_target(const char *n, int yy); diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 68c893ad3..1fa9488ae 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -173,20 +173,20 @@ fl_line() img->draw() */ -static int selection_first = 0; -static int selection_last = 0; -static int selection_push_first = 0; -static int selection_push_last = 0; -static int selection_drag_first = 0; -static int selection_drag_last = 0; -static int selected = 0; -static int draw_mode = 0; -static int mouse_x = 0; -static int mouse_y = 0; -static int current_pos = 0; -static Fl_Help_View *current_view = 0L; -Fl_Color hv_selection_color; -Fl_Color hv_selection_text_color; +int Fl_Help_View::selection_first = 0; +int Fl_Help_View::selection_last = 0; +int Fl_Help_View::selection_push_first = 0; +int Fl_Help_View::selection_push_last = 0; +int Fl_Help_View::selection_drag_first = 0; +int Fl_Help_View::selection_drag_last = 0; +int Fl_Help_View::selected = 0; +int Fl_Help_View::draw_mode = 0; +int Fl_Help_View::mouse_x = 0; +int Fl_Help_View::mouse_y = 0; +int Fl_Help_View::current_pos = 0; +Fl_Help_View *Fl_Help_View::current_view = 0L; +Fl_Color Fl_Help_View::hv_selection_color; +Fl_Color Fl_Help_View::hv_selection_text_color; /* * Limitation: if a word contains &code; notations, we will calculate a wrong length. |