summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2005-05-20 02:39:39 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2005-05-20 02:39:39 +0000
commitb33cc948106fbea0fd4bc1a129f4e42346aa9840 (patch)
tree33030faef3c438d49014b0f900b0b89858d512ca
parent74d3204304e3344629f31fa9beebd44113c032a4 (diff)
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
-rw-r--r--CHANGES1
-rw-r--r--src/Fl_win32.cxx4
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);