diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2000-02-04 06:35:22 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2000-02-04 06:35:22 +0000 |
| commit | 53bf740c38dd39775b59b72a7bb1f52272deb2a3 (patch) | |
| tree | 4cf1621653d0728b5f33b1dbb0cce8ac46600b9f | |
| parent | d37850b115eb37cc8dccc6b7adc79c754e13e714 (diff) | |
3rd and deeper nested Fl_Windows on Win32 redraw correctly.
The symbol "table" from fl_cursor.cxx is no longer public
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@997 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_win32.cxx | 8 | ||||
| -rw-r--r-- | src/fl_cursor.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 0858a152e..68f1b234e 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_win32.cxx,v 1.33.2.20 1999/12/31 02:56:18 mike Exp $" +// "$Id: Fl_win32.cxx,v 1.33.2.21 2000/02/04 06:35:20 bill Exp $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // @@ -754,8 +754,8 @@ Fl_X* Fl_X::make(Fl_Window* w) { int hp = w->h(); if (w->parent()) { - style = WS_CHILD; - styleEx = WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT; + style |= WS_CHILD; + styleEx |= WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT; parent = fl_xid(w->window()); } else { if (!w->size_range_set) { @@ -954,5 +954,5 @@ void Fl_Window::make_current() { } // -// End of "$Id: Fl_win32.cxx,v 1.33.2.20 1999/12/31 02:56:18 mike Exp $". +// End of "$Id: Fl_win32.cxx,v 1.33.2.21 2000/02/04 06:35:20 bill Exp $". // diff --git a/src/fl_cursor.cxx b/src/fl_cursor.cxx index 95efcc080..f1e4743fc 100644 --- a/src/fl_cursor.cxx +++ b/src/fl_cursor.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_cursor.cxx,v 1.6.2.2 1999/12/06 14:43:40 mike Exp $" +// "$Id: fl_cursor.cxx,v 1.6.2.3 2000/02/04 06:35:22 bill Exp $" // // Mouse cursor support for the Fast Light Tool Kit (FLTK). // @@ -101,7 +101,7 @@ void Fl_Window::cursor(Fl_Cursor c, Fl_Color, Fl_Color) { #define CURSORSIZE 16 #define HOTXY 7 -struct TableEntry { +static struct TableEntry { uchar bits[CURSORSIZE*CURSORSIZE/8]; uchar mask[CURSORSIZE*CURSORSIZE/8]; Cursor cursor; @@ -184,5 +184,5 @@ void Fl_Window::cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) { #endif // -// End of "$Id: fl_cursor.cxx,v 1.6.2.2 1999/12/06 14:43:40 mike Exp $". +// End of "$Id: fl_cursor.cxx,v 1.6.2.3 2000/02/04 06:35:22 bill Exp $". // |