X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14e03f5b719ce6dbe4a0e81b22ae8436bd230ae..63f84de849c26e11c9de8295d3cdf52b1d089936:/src/msw/display.cpp

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index c4be2e60fc..9266bf1b73 100644
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -28,9 +28,9 @@
 #if wxUSE_DISPLAY
 
 #ifndef WX_PRECOMP
-   #include "wx/app.h"
-   #include "wx/dynarray.h"
-   #include "wx/frame.h"
+    #include "wx/dynarray.h"
+    #include "wx/app.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/dynload.h"
@@ -39,18 +39,12 @@
 #include "wx/display.h"
 #include "wx/display_impl.h"
 
-// Mingw's w32api headers don't include ddraw.h, though the user may have
-// installed it.  If using configure, we actually probe for ddraw.h there
-// and set wxUSE_DIRECTDRAW.  Otherwise, assume we don't have it if using
-// the w32api headers, and that we do otherwise.
-#if !defined HAVE_W32API_H && !defined HAVE_DDRAW_H
-    #define HAVE_DDRAW_H
-#endif
+// define this to use DirectDraw for display mode switching: this is disabled
+// by default because ddraw.h is now always available and also it's not really
+// clear what are the benefits of using DirectDraw compared to the standard API
 
-// user may disable compilation of DirectDraw code by setting
-// wxUSE_DIRECTDRAW to 0 in the makefile/project settings
-#if defined(HAVE_DDRAW_H) && !defined(wxUSE_DIRECTDRAW)
-    #define wxUSE_DIRECTDRAW 1
+#if !defined(wxUSE_DIRECTDRAW)
+    #define wxUSE_DIRECTDRAW 0
 #endif
 
 #ifndef __WXWINCE__
@@ -60,17 +54,33 @@
     // is only defined in winuser.h if WINVER >= 0x0500
     #if !defined(HMONITOR_DECLARED) && !defined(MNS_NOCHECK)
         DECLARE_HANDLE(HMONITOR);
+        typedef BOOL(CALLBACK * MONITORENUMPROC )(HMONITOR, HDC, LPRECT, LPARAM);
+        typedef struct tagMONITORINFO
+        {
+            DWORD   cbSize;
+            RECT    rcMonitor;
+            RECT    rcWork;
+            DWORD   dwFlags;
+        } MONITORINFO, *LPMONITORINFO;
+        typedef struct tagMONITORINFOEX : public tagMONITORINFO
+        {
+            TCHAR       szDevice[CCHDEVICENAME];
+        } MONITORINFOEX, *LPMONITORINFOEX;
+        #define MONITOR_DEFAULTTONULL       0x00000000
+        #define MONITOR_DEFAULTTOPRIMARY    0x00000001
+        #define MONITOR_DEFAULTTONEAREST    0x00000002
+        #define MONITORINFOF_PRIMARY        0x00000001
         #define HMONITOR_DECLARED
     #endif
 #endif // !__WXWINCE__
 
-#ifdef wxUSE_DIRECTDRAW
-#include <ddraw.h>
+#if wxUSE_DIRECTDRAW
+    #include <ddraw.h>
 
-// we don't want to link with ddraw.lib which contains the real
-// IID_IDirectDraw2 definition
-const GUID wxIID_IDirectDraw2 =
-    { 0xB3A6F3E0, 0x2B43, 0x11CF, { 0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 } };
+    // we don't want to link with ddraw.lib which contains the real
+    // IID_IDirectDraw2 definition
+    const GUID wxIID_IDirectDraw2 =
+     { 0xB3A6F3E0, 0x2B43, 0x11CF, { 0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 } };
 #endif // wxUSE_DIRECTDRAW
 
 // ----------------------------------------------------------------------------
@@ -83,7 +93,7 @@ typedef LONG (WINAPI *ChangeDisplaySettingsEx_t)(LPCTSTR lpszDeviceName,
                                                  DWORD dwFlags,
                                                  LPVOID lParam);
 
-#ifdef wxUSE_DIRECTDRAW
+#if wxUSE_DIRECTDRAW
 typedef BOOL (PASCAL *DDEnumExCallback_t)(GUID *pGuid,
                                           LPTSTR driverDescription,
                                           LPTSTR driverName,
@@ -281,7 +291,7 @@ private:
 // wxDisplay implementation using DirectDraw
 // ----------------------------------------------------------------------------
 
-#ifdef wxUSE_DIRECTDRAW
+#if wxUSE_DIRECTDRAW
 
 struct wxDisplayInfoDirectDraw : wxDisplayInfo
 {
@@ -380,7 +390,7 @@ private:
     // and another using DirectDraw, the choice between them is done using a
     // system option
 
-#ifdef wxUSE_DIRECTDRAW
+#if wxUSE_DIRECTDRAW
     if ( wxSystemOptions::GetOptionInt(_T("msw.display.directdraw")) )
     {
         wxDisplayFactoryDirectDraw *factoryDD = new wxDisplayFactoryDirectDraw;