summaryrefslogtreecommitdiff
path: root/src/Fl_win32.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/Fl_win32.cxx')
-rw-r--r--src/Fl_win32.cxx17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 1945ac886..ff8e9844a 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_win32.cxx,v 1.16 1998/11/08 16:47:44 mike Exp $"
+// "$Id: Fl_win32.cxx,v 1.17 1998/11/08 17:02:39 mike Exp $"
//
// WIN32-specific code for the Fast Light Tool Kit (FLTK).
//
@@ -227,7 +227,7 @@ static int ms2fltk(int vk, int extended) {
}
#if USE_COLORMAP
-extern HPALETTE fl_select_palette(int gl); // in fl_color_win32.C
+extern HPALETTE fl_select_palette(void); // in fl_color_win32.C
#endif
static Fl_Window* resize_bug_fix;
@@ -388,20 +388,17 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
#if USE_COLORMAP
case WM_QUERYNEWPALETTE :
fl_GetDC(hWnd);
- if (fl_select_palette(window->type() == FL_GL_WINDOW))
- InvalidateRect(hWnd, NULL, FALSE);
+ if (fl_select_palette()) InvalidateRect(hWnd, NULL, FALSE);
break;
case WM_PALETTECHANGED:
fl_GetDC(hWnd);
- if ((HWND)wParam != hWnd &&
- fl_select_palette(window->type() == FL_GL_WINDOW))
- UpdateColors(fl_gc);
+ if ((HWND)wParam != hWnd && fl_select_palette()) UpdateColors(fl_gc);
break;
case WM_CREATE :
fl_GetDC(hWnd);
- fl_select_palette(window->type() == FL_GL_WINDOW);
+ fl_select_palette();
break;
#endif
@@ -755,7 +752,7 @@ void Fl_Window::make_current() {
// for all drawing calls, so we must select it here before any
// code does any drawing...
- fl_select_palette(type() == FL_GL_WINDOW);
+ fl_select_palette();
#endif // USE_COLORMAP
current_ = this;
@@ -816,5 +813,5 @@ void Fl_Window::flush() {
}
//
-// End of "$Id: Fl_win32.cxx,v 1.16 1998/11/08 16:47:44 mike Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.17 1998/11/08 17:02:39 mike Exp $".
//