From b33cc948106fbea0fd4bc1a129f4e42346aa9840 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 20 May 2005 02:39:39 +0000 Subject: Fix sentinel value for HWND on WIN32 (STR #862) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4362 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 1 + src/Fl_win32.cxx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index f9c124c55..212650cbd 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ CHANGES IN FLTK 1.1.7 - Documentation fixes (STR #648, STR #692, STR #730, STR #744, STR #745) + - Changed initializations on WIN32 (STR #862) - Fl_Preferences::getUserdataPath() didn't work for sub-groups (STR #872) - Fixed some redraw issues on Windows XP. diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 12d17c478..6d182d831 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1219,12 +1219,12 @@ Fl_Window *Fl_Window::current_; HDC fl_gc = 0; // the current window handle, initially set to -1 so we can correctly // allocate fl_GetDC(0) -HWND fl_window = (HWND)-1; +HWND fl_window = NULL; // Here we ensure only one GetDC is ever in place. HDC fl_GetDC(HWND w) { if (fl_gc) { - if (w == fl_window) return fl_gc; + if (w == fl_window && fl_window != NULL) return fl_gc; ReleaseDC(fl_window, fl_gc); } fl_gc = GetDC(w); -- cgit v1.2.3