check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 0195c675ffc8cc1ebd0c44f51f0efa01a1d36a7d..e5d3247e08d5ad3c86bd2c34de6de6d7594ef54c 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -27,8 +27,9 @@
 
 #if wxUSE_DISPLAY
 
 
 #if wxUSE_DISPLAY
 

+#include "wx/display.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/msw/missing.h"

     #include "wx/dynarray.h"
     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/dynarray.h"
     #include "wx/app.h"
     #include "wx/frame.h"


@@ -37,8 +38,9 @@
 #include "wx/dynload.h"
 #include "wx/sysopt.h"
 
 #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/wrapwin.h"
+#include "wx/msw/missing.h"

 
 // 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
 
 // 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


@@ -174,7 +176,7 @@ 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)
     {
         : wxDisplayImpl(n),
           m_info(info)
     {


@@ -219,9 +221,9 @@ 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 GetFromPoint(const wxPoint& pt);

-    virtual int GetFromWindow(wxWindow *window);
+    virtual int GetFromWindow(const wxWindow *window);

 
 protected:
     // ctor checks if the current system supports multimon API and dynamically
 
 protected:
     // ctor checks if the current system supports multimon API and dynamically


@@ -257,7 +259,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)
     {
     }


@@ -274,7 +276,7 @@ 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


@@ -324,7 +326,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)
     {


@@ -351,7 +353,7 @@ public:
     wxDisplayFactoryDirectDraw();
     virtual ~wxDisplayFactoryDirectDraw();
 
     wxDisplayFactoryDirectDraw();
     virtual ~wxDisplayFactoryDirectDraw();
 

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

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


@@ -480,7 +482,9 @@ wxVideoMode wxDisplayImplWin32Base::GetCurrentMode() const
     // according to MSDN.  The version of GetName() we implement for Win95
     // returns an empty string.
     const wxString name = GetName();
     // according to MSDN.  The version of GetName() we implement for Win95
     // returns an empty string.
     const wxString name = GetName();

-    const wxChar * const deviceName = name.empty() ? NULL : name.c_str();
+    const wxChar * const deviceName = name.empty()
+                                          ? (const wxChar*)NULL
+                                          : (const wxChar*)name.c_str();

 
     DEVMODE dm;
     dm.dmSize = sizeof(dm);
 
     DEVMODE dm;
     dm.dmSize = sizeof(dm);


@@ -513,19 +517,9 @@ wxDisplayFactoryWin32Base::wxDisplayFactoryWin32Base()
 
         wxLogNull noLog;
 
 
         wxLogNull noLog;
 

-        gs_MonitorFromPoint = (MonitorFromPoint_t)
-            dllUser32.GetSymbol(wxT("MonitorFromPoint"));
-        if ( !gs_MonitorFromPoint )
-            return;
-
-        gs_MonitorFromWindow = (MonitorFromWindow_t)
-            dllUser32.GetSymbol(wxT("MonitorFromWindow"));
-        if ( !gs_MonitorFromWindow )
-            return;
-
-        gs_GetMonitorInfo = (GetMonitorInfo_t)
-            dllUser32.GetSymbolAorW(wxT("GetMonitorInfo"));
-        if ( !gs_GetMonitorInfo )
+        if ( (wxDL_INIT_FUNC(gs_, MonitorFromPoint, dllUser32)) == NULL ||
+             (wxDL_INIT_FUNC(gs_, MonitorFromWindow, dllUser32)) == NULL ||
+             (wxDL_INIT_FUNC_AW(gs_, GetMonitorInfo, dllUser32)) == NULL )

             return;
 
         ms_supportsMultimon = 1;
             return;
 
         ms_supportsMultimon = 1;


@@ -571,7 +565,7 @@ int wxDisplayFactoryWin32Base::GetFromPoint(const wxPoint& pt)
                                                        MONITOR_DEFAULTTONULL));
 }
 
                                                        MONITOR_DEFAULTTONULL));
 }
 

-int wxDisplayFactoryWin32Base::GetFromWindow(wxWindow *window)
+int wxDisplayFactoryWin32Base::GetFromWindow(const wxWindow *window)

 {
     return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
                                                         MONITOR_DEFAULTTONULL));
 {
     return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
                                                         MONITOR_DEFAULTTONULL));


@@ -597,9 +591,7 @@ wxDisplayFactoryMultimon::wxDisplayFactoryMultimon()
         wxLogNull noLog;
 
         wxDynamicLibrary dllUser32(_T("user32.dll"));
         wxLogNull noLog;
 
         wxDynamicLibrary dllUser32(_T("user32.dll"));

-        pfnEnumDisplayMonitors = (EnumDisplayMonitors_t)
-            dllUser32.GetSymbol(wxT("EnumDisplayMonitors"));
-        if ( !pfnEnumDisplayMonitors )
+        if ( (wxDL_INIT_FUNC(pfn, EnumDisplayMonitors, dllUser32)) == NULL )

             return;
     }
 
             return;
     }
 


@@ -647,7 +639,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") );
 


@@ -667,7 +659,9 @@ wxDisplayImplMultimon::GetModes(const wxVideoMode& modeMatch) const
     // according to MSDN.  The version of GetName() we implement for Win95
     // returns an empty string.
     const wxString name = GetName();
     // according to MSDN.  The version of GetName() we implement for Win95
     // returns an empty string.
     const wxString name = GetName();

-    const wxChar * const deviceName = name.empty() ? NULL : name.c_str();
+    const wxChar * const deviceName = name.empty()
+                                            ? (const wxChar*)NULL
+                                            : (const wxChar*)name.c_str();

 
     DEVMODE dm;
     dm.dmSize = sizeof(dm);
 
     DEVMODE dm;
     dm.dmSize = sizeof(dm);


@@ -744,8 +738,7 @@ bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode)
         wxDynamicLibrary dllUser32(_T("user32.dll"));
         if ( dllUser32.IsLoaded() )
         {
         wxDynamicLibrary dllUser32(_T("user32.dll"));
         if ( dllUser32.IsLoaded() )
         {

-            pfnChangeDisplaySettingsEx = (ChangeDisplaySettingsEx_t)
-                dllUser32.GetSymbolAorW(_T("ChangeDisplaySettingsEx"));
+            wxDL_INIT_FUNC_AW(pfn, ChangeDisplaySettingsEx, dllUser32);

         }
         //else: huh, no user32.dll??
 
         }
         //else: huh, no user32.dll??
 


@@ -762,11 +755,11 @@ bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode)
     // do change the mode
     switch ( pfnChangeDisplaySettingsEx
              (
     // do change the mode
     switch ( pfnChangeDisplaySettingsEx
              (

-                GetName(),      // display name
-                pDevMode,       // dev mode or NULL to reset
-                NULL,           // reserved
+                GetName().wx_str(), // display name
+                pDevMode,           // dev mode or NULL to reset
+                NULL,               // reserved

                 flags,
                 flags,

-                NULL            // pointer to video parameters (not used)
+                NULL                // pointer to video parameters (not used)

              ) )
     {
         case DISP_CHANGE_SUCCESSFUL:
              ) )
     {
         case DISP_CHANGE_SUCCESSFUL:


@@ -823,21 +816,19 @@ wxDisplayFactoryDirectDraw::wxDisplayFactoryDirectDraw()
     if ( !m_dllDDraw.IsLoaded() )
         return;
 
     if ( !m_dllDDraw.IsLoaded() )
         return;
 

-    DirectDrawEnumerateEx_t pDDEnumEx = (DirectDrawEnumerateEx_t)
-        m_dllDDraw.GetSymbolAorW(_T("DirectDrawEnumerateEx"));
-    if ( !pDDEnumEx )
+    DirectDrawEnumerateEx_t
+        wxDL_INIT_FUNC_AW(pfn, DirectDrawEnumerateEx, m_dllDDraw);
+    if ( !pfnDirectDrawEnumerateEx )

         return;
 
     // we can't continue without DirectDrawCreate() later, so resolve it right
     // now and fail the initialization if it's not available
         return;
 
     // we can't continue without DirectDrawCreate() later, so resolve it right
     // now and fail the initialization if it's not available

-    m_pfnDirectDrawCreate = (DirectDrawCreate_t)
-        m_dllDDraw.GetSymbol(_T("DirectDrawCreate"));
-    if ( !m_pfnDirectDrawCreate )
+    if ( !wxDL_INIT_FUNC(m_pfn, DirectDrawCreate, m_dllDDraw) )

         return;
 
         return;
 

-    if ( (*pDDEnumEx)(DDEnumExCallback,
-                      this,
-                      DDENUM_ATTACHEDSECONDARYDEVICES) != DD_OK )
+    if ( (*pfnDirectDrawEnumerateEx)(DDEnumExCallback,
+                                     this,
+                                     DDENUM_ATTACHEDSECONDARYDEVICES) != DD_OK )

     {
         wxLogLastError(_T("DirectDrawEnumerateEx"));
     }
     {
         wxLogLastError(_T("DirectDrawEnumerateEx"));
     }


@@ -888,7 +879,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") );