non-PCH build fix (according to Tinderbox).

[wxWidgets.git] / src / msw / display.cpp

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index ac0dc4c61293f9dcc7ec82ca7392b440f2acc560..3e87a50557df25eb42c86385d5dcfaf68a9c82df 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -27,30 +27,26 @@
 
 #if wxUSE_DISPLAY
 
 
 #if wxUSE_DISPLAY
 

+#include "wx/display.h"
+

 #ifndef WX_PRECOMP
 #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"
 #include "wx/sysopt.h"
 
 #endif
 
 #include "wx/dynload.h"
 #include "wx/sysopt.h"
 

-#include "wx/display.h"

 #include "wx/display_impl.h"
 #include "wx/display_impl.h"

+#include "wx/msw/missing.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__
 #endif
 
 #ifndef __WXWINCE__


@@ -60,17 +56,33 @@
     // is only defined in winuser.h if WINVER >= 0x0500
     #if !defined(HMONITOR_DECLARED) && !defined(MNS_NOCHECK)
         DECLARE_HANDLE(HMONITOR);
     // 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__
 
         #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
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_DIRECTDRAW
 
 // ----------------------------------------------------------------------------


@@ -83,7 +95,7 @@ typedef LONG (WINAPI *ChangeDisplaySettingsEx_t)(LPCTSTR lpszDeviceName,
                                                  DWORD dwFlags,
                                                  LPVOID lParam);
 
                                                  DWORD dwFlags,
                                                  LPVOID lParam);
 

-#ifdef wxUSE_DIRECTDRAW
+#if wxUSE_DIRECTDRAW

 typedef BOOL (PASCAL *DDEnumExCallback_t)(GUID *pGuid,
                                           LPTSTR driverDescription,
                                           LPTSTR driverName,
 typedef BOOL (PASCAL *DDEnumExCallback_t)(GUID *pGuid,
                                           LPTSTR driverDescription,
                                           LPTSTR driverName,


@@ -142,6 +154,9 @@ struct wxDisplayInfo
     // the entire area of this monitor in virtual screen coordinates
     wxRect m_rect;
 
     // the entire area of this monitor in virtual screen coordinates
     wxRect m_rect;
 

+    // the work or client area, i.e. the area available for the normal windows
+    wxRect m_rectClient;
+

     // the display device name for this monitor, empty initially and retrieved
     // on demand by DoGetName()
     wxString m_devName;
     // the display device name for this monitor, empty initially and retrieved
     // on demand by DoGetName()
     wxString m_devName;


@@ -160,13 +175,14 @@ WX_DEFINE_ARRAY_PTR(wxDisplayInfo *, wxDisplayInfoArray);
 class wxDisplayImplWin32Base : public wxDisplayImpl
 {
 public:
 class wxDisplayImplWin32Base : public wxDisplayImpl
 {
 public:

-    wxDisplayImplWin32Base(size_t n, wxDisplayInfo& info)
+    wxDisplayImplWin32Base(unsigned n, wxDisplayInfo& info)

         : wxDisplayImpl(n),
           m_info(info)
     {
     }
 
     virtual wxRect GetGeometry() const;
         : wxDisplayImpl(n),
           m_info(info)
     {
     }
 
     virtual wxRect GetGeometry() const;

+    virtual wxRect GetClientArea() const;

     virtual wxString GetName() const;
     virtual bool IsPrimary() const;
 
     virtual wxString GetName() const;
     virtual bool IsPrimary() const;
 


@@ -204,7 +220,7 @@ public:
 
     bool IsOk() const { return !m_displays.empty(); }
 
 
     bool IsOk() const { return !m_displays.empty(); }
 

-    virtual size_t GetCount() { return m_displays.size(); }
+    virtual unsigned GetCount() { return unsigned(m_displays.size()); }

     virtual int GetFromPoint(const wxPoint& pt);
     virtual int GetFromWindow(wxWindow *window);
 
     virtual int GetFromPoint(const wxPoint& pt);
     virtual int GetFromWindow(wxWindow *window);
 


@@ -242,7 +258,7 @@ protected:
 class wxDisplayImplMultimon : public wxDisplayImplWin32Base
 {
 public:
 class wxDisplayImplMultimon : public wxDisplayImplWin32Base
 {
 public:

-    wxDisplayImplMultimon(size_t n, wxDisplayInfo& info)
+    wxDisplayImplMultimon(unsigned n, wxDisplayInfo& info)

         : wxDisplayImplWin32Base(n, info)
     {
     }
         : wxDisplayImplWin32Base(n, info)
     {
     }


@@ -254,12 +270,12 @@ private:
     DECLARE_NO_COPY_CLASS(wxDisplayImplMultimon)
 };
 
     DECLARE_NO_COPY_CLASS(wxDisplayImplMultimon)
 };
 

-class WXDLLEXPORT wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base
+class wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base

 {
 public:
     wxDisplayFactoryMultimon();
 
 {
 public:
     wxDisplayFactoryMultimon();
 

-    virtual wxDisplayImpl *CreateDisplay(size_t n);
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);

 
 private:
     // EnumDisplayMonitors() callback
 
 private:
     // EnumDisplayMonitors() callback


@@ -277,7 +293,7 @@ private:
 // wxDisplay implementation using DirectDraw
 // ----------------------------------------------------------------------------
 
 // wxDisplay implementation using DirectDraw
 // ----------------------------------------------------------------------------
 

-#ifdef wxUSE_DIRECTDRAW
+#if wxUSE_DIRECTDRAW

 
 struct wxDisplayInfoDirectDraw : wxDisplayInfo
 {
 
 struct wxDisplayInfoDirectDraw : wxDisplayInfo
 {


@@ -309,7 +325,7 @@ struct wxDisplayInfoDirectDraw : wxDisplayInfo
 class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base
 {
 public:
 class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base
 {
 public:

-    wxDisplayImplDirectDraw(size_t n, wxDisplayInfo& info, IDirectDraw2 *pDD2)
+    wxDisplayImplDirectDraw(unsigned n, wxDisplayInfo& info, IDirectDraw2 *pDD2)

         : wxDisplayImplWin32Base(n, info),
           m_pDD2(pDD2)
     {
         : wxDisplayImplWin32Base(n, info),
           m_pDD2(pDD2)
     {


@@ -330,13 +346,13 @@ private:
     DECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw)
 };
 
     DECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw)
 };
 

-class WXDLLEXPORT wxDisplayFactoryDirectDraw : public wxDisplayFactoryWin32Base
+class wxDisplayFactoryDirectDraw : public wxDisplayFactoryWin32Base

 {
 public:
     wxDisplayFactoryDirectDraw();
     virtual ~wxDisplayFactoryDirectDraw();
 
 {
 public:
     wxDisplayFactoryDirectDraw();
     virtual ~wxDisplayFactoryDirectDraw();
 

-    virtual wxDisplayImpl *CreateDisplay(size_t n);
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);

 
 private:
     // callback used with DirectDrawEnumerateEx()
 
 private:
     // callback used with DirectDrawEnumerateEx()


@@ -375,6 +391,8 @@ private:
     // we have 2 implementations for modern Windows: one using standard Win32
     // and another using DirectDraw, the choice between them is done using a
     // system option
     // we have 2 implementations for modern Windows: one using standard Win32
     // and another using DirectDraw, the choice between them is done using a
     // system option

+
+#if wxUSE_DIRECTDRAW

     if ( wxSystemOptions::GetOptionInt(_T("msw.display.directdraw")) )
     {
         wxDisplayFactoryDirectDraw *factoryDD = new wxDisplayFactoryDirectDraw;
     if ( wxSystemOptions::GetOptionInt(_T("msw.display.directdraw")) )
     {
         wxDisplayFactoryDirectDraw *factoryDD = new wxDisplayFactoryDirectDraw;


@@ -383,6 +401,7 @@ private:
 
         delete factoryDD;
     }
 
         delete factoryDD;
     }

+#endif // wxUSE_DIRECTDRAW

 
     wxDisplayFactoryMultimon *factoryMM = new wxDisplayFactoryMultimon;
     if ( factoryMM->IsOk() )
 
     wxDisplayFactoryMultimon *factoryMM = new wxDisplayFactoryMultimon;
     if ( factoryMM->IsOk() )


@@ -412,6 +431,7 @@ void wxDisplayInfo::Initialize()
         }
 
         wxCopyRECTToRect(monInfo.rcMonitor, m_rect);
         }
 
         wxCopyRECTToRect(monInfo.rcMonitor, m_rect);

+        wxCopyRECTToRect(monInfo.rcWork, m_rectClient);

         m_devName = monInfo.szDevice;
         m_flags = monInfo.dwFlags;
     }
         m_devName = monInfo.szDevice;
         m_flags = monInfo.dwFlags;
     }


@@ -429,9 +449,17 @@ wxRect wxDisplayImplWin32Base::GetGeometry() const
     return m_info.m_rect;
 }
 
     return m_info.m_rect;
 }
 

+wxRect wxDisplayImplWin32Base::GetClientArea() const
+{
+    if ( m_info.m_rectClient.IsEmpty() )
+        m_info.Initialize();
+
+    return m_info.m_rectClient;
+}
+

 wxString wxDisplayImplWin32Base::GetName() const
 {
 wxString wxDisplayImplWin32Base::GetName() const
 {

-    if ( m_info.m_devName.IsEmpty() )
+    if ( m_info.m_devName.empty() )

         m_info.Initialize();
 
     return m_info.m_devName;
         m_info.Initialize();
 
     return m_info.m_devName;


@@ -620,7 +648,7 @@ void wxDisplayFactoryMultimon::AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor)
 // wxDisplayFactoryMultimon inherited pure virtuals implementation
 // ----------------------------------------------------------------------------
 
 // wxDisplayFactoryMultimon inherited pure virtuals implementation
 // ----------------------------------------------------------------------------
 

-wxDisplayImpl *wxDisplayFactoryMultimon::CreateDisplay(size_t n)
+wxDisplayImpl *wxDisplayFactoryMultimon::CreateDisplay(unsigned n)

 {
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
 
 {
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
 


@@ -861,7 +889,7 @@ void wxDisplayFactoryDirectDraw::AddDisplay(const GUID& guid,
 // wxDisplayFactoryDirectDraw inherited pure virtuals implementation
 // ----------------------------------------------------------------------------
 
 // wxDisplayFactoryDirectDraw inherited pure virtuals implementation
 // ----------------------------------------------------------------------------
 

-wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(size_t n)
+wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(unsigned n)

 {
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
 
 {
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );