From 95c4a62896f7608b499f9be9c70453f19b9ad7e0 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 26 May 2006 15:19:10 +0000
Subject: [PATCH] fix display-left-top-offset for Windows

svn: r3075
---
 src/wxwindow/include/base/wb_gdi.h | 2 +-
 src/wxwindow/src/msw/wx_gdi.cxx    | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/wxwindow/include/base/wb_gdi.h b/src/wxwindow/include/base/wb_gdi.h
index 19d60ea63d..4aea164e2c 100644
--- a/src/wxwindow/include/base/wb_gdi.h
+++ b/src/wxwindow/include/base/wb_gdi.h
@@ -334,7 +334,7 @@ extern Bool wxColourDisplay(void);
 extern int wxDisplayDepth(void);
 
 extern void wxDisplaySize(int *width, int *height, int flags = 0);
-extern void wxDisplayOrigin(int *x, int *y);
+extern void wxDisplayOrigin(int *x, int *y, int flags = 0);
 
 extern void wxSetCursor(wxCursor *cursor);
 
diff --git a/src/wxwindow/src/msw/wx_gdi.cxx b/src/wxwindow/src/msw/wx_gdi.cxx
index 60b2f4394c..7a1a267b07 100644
--- a/src/wxwindow/src/msw/wx_gdi.cxx
+++ b/src/wxwindow/src/msw/wx_gdi.cxx
@@ -1615,10 +1615,7 @@ void wxDisplaySize(int *width, int *height, int flags)
 {
   RECT r;
 
-  if (!flags && SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0)) {
-    *width = (r.right - r.left);
-    *height = (r.bottom - r.top);
-  } else {
+  {
     HDC dc;
     int dw, dh;
     dc = ::GetDC(NULL);
@@ -1630,11 +1627,11 @@ void wxDisplaySize(int *width, int *height, int flags)
   }
 }
 
-void wxDisplayOrigin(int *x, int *y)
+void wxDisplayOrigin(int *x, int *y, int flags)
 {
   RECT r;
 
-  if (SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0)) {
+  if (flags && SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0)) {
     *x = r.left;
     *y = r.top;
   } else {