Initialize all fields of struct tm used by wxDateTime::Format().

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

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index e85dd3e787cc9e758fb5f62813cd9642bd8262fd..69285f9f044786cca73db4f586ec6a3409996193 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -1,11 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        display.cpp
+// Name:        src/msw/display.cpp

 // Purpose:     MSW Implementation of wxDisplay class
 // Purpose:     MSW Implementation of wxDisplay class

-// Author:      Royce Mitchell III
-// Modified by:
+// Author:      Royce Mitchell III, Vadim Zeitlin
+// Modified by: Ryan Norton (IsPrimary override)

 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Created:     06/21/02
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
+// Copyright:   (c) 2002-2006 wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +18,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "display.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,44 +27,58 @@
 
 #if wxUSE_DISPLAY
 
 
 #if wxUSE_DISPLAY
 

-#ifndef WX_PRECOMP
-   #include "wx/dynarray.h"
-#endif
-
-#include "wx/dynload.h"
-

 #include "wx/display.h"
 
 #include "wx/display.h"
 

-// the following define is necessary to access the multi-monitor function
-// declarations in a manner safe to use w/ Windows 95
-#define COMPILE_MULTIMON_STUBS
-
-// if you don't have multimon.h you can download the file from:
-//
-//  http://www.microsoft.com/msj/0697/monitor/monitortextfigs.htm#fig4
-//
-
-#ifdef _MSC_VER
-    // as (m)any standard header, this one doesn't compile without warnings
-    // with VC++ 6 <sigh>
-    #pragma warning(disable:4706)
-#endif
-
-#include <multimon.h>
-
-#ifdef _MSC_VER
-    #pragma warning(default:4706)
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/app.h"
+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#ifdef _UNICODE
-    #define MAKE_WFUNC(x) #x "W"
-    #define WINFUNC(x)  L ## MAKE_WFUNC(x)
+#include "wx/dynload.h"
+#include "wx/sysopt.h"
+
+#include "wx/display_impl.h"
+#include "wx/msw/wrapwin.h"
+#include "wx/msw/missing.h"
+#include "wx/msw/private.h"
+
+#ifndef __WXWINCE__
+    // Older versions of windef.h don't define HMONITOR.  Unfortunately, we
+    // can't directly test whether HMONITOR is defined or not in windef.h as
+    // it's not a macro but a typedef, so we test for an unrelated symbol which
+    // 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__
+
+// display functions are found in different DLLs under WinCE and normal Win32
+#ifdef __WXWINCE__
+static const wxChar displayDllName[] = wxT("coredll.dll");

 #else
 #else

-    #define WINFUNC(x) #x "A"
+static const wxChar displayDllName[] = wxT("user32.dll");

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

-// typedefs
+// typedefs for dynamically loaded Windows functions

 // ----------------------------------------------------------------------------
 
 typedef LONG (WINAPI *ChangeDisplaySettingsEx_t)(LPCTSTR lpszDeviceName,
 // ----------------------------------------------------------------------------
 
 typedef LONG (WINAPI *ChangeDisplaySettingsEx_t)(LPCTSTR lpszDeviceName,


@@ -76,144 +87,337 @@ typedef LONG (WINAPI *ChangeDisplaySettingsEx_t)(LPCTSTR lpszDeviceName,
                                                  DWORD dwFlags,
                                                  LPVOID lParam);
 
                                                  DWORD dwFlags,
                                                  LPVOID lParam);
 

+typedef BOOL (WINAPI *EnumDisplayMonitors_t)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
+typedef HMONITOR (WINAPI *MonitorFromPoint_t)(POINT,DWORD);
+typedef HMONITOR (WINAPI *MonitorFromWindow_t)(HWND,DWORD);
+typedef BOOL (WINAPI *GetMonitorInfo_t)(HMONITOR,LPMONITORINFO);
+
+#ifndef __WXWINCE__
+// emulation of ChangeDisplaySettingsEx() for Win95
+LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName),
+                                            LPDEVMODE lpDevMode,
+                                            HWND WXUNUSED(hwnd),
+                                            DWORD dwFlags,
+                                            LPVOID WXUNUSED(lParam))
+{
+    return ::ChangeDisplaySettings(lpDevMode, dwFlags);
+}
+#endif // !__WXWINCE__
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// private classes
+// display information classes

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class wxDisplayInfo
+struct wxDisplayInfo

 {
 {

-public:
+    wxDisplayInfo(HMONITOR hmon = NULL)
+    {
+        m_hmon = hmon;
+        m_flags = (DWORD)-1;
+    }
+
+    virtual ~wxDisplayInfo() { }
+
+
+    // use GetMonitorInfo() to fill in all of our fields if needed (i.e. if it
+    // hadn't been done before)
+    void Initialize();
+
+

     // handle of this monitor used by MonitorXXX() functions, never NULL
     HMONITOR m_hmon;
 
     // the entire area of this monitor in virtual screen coordinates
     wxRect m_rect;
 
     // handle of this monitor used by MonitorXXX() functions, never NULL
     HMONITOR m_hmon;
 
     // 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;
 

-    wxDisplayInfo() { m_hmon = NULL; }
+    // the flags of this monitor, also used as initialization marker: if this
+    // is -1, GetMonitorInfo() hadn't been called yet
+    DWORD m_flags;

 };
 
 };
 

-WX_DECLARE_OBJARRAY(wxDisplayInfo, wxDisplayInfoArray);
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxDisplayInfoArray);
-
-// this is not really MT-unsafe as wxDisplay is only going to be used from the
-// main thread, i.e. we consider that it's a GUI class and so don't protect it
-static wxDisplayInfoArray *g_displays = NULL;
+WX_DEFINE_ARRAY_PTR(wxDisplayInfo *, wxDisplayInfoArray);

 
 

+// ----------------------------------------------------------------------------
+// common base class for all Win32 wxDisplayImpl versions
+// ----------------------------------------------------------------------------

 
 

-// this module is used to cleanup g_displays array
-class wxDisplayModule : public wxModule
+class wxDisplayImplWin32Base : public wxDisplayImpl

 {
 public:
 {
 public:

-    virtual bool OnInit() { return TRUE; }
-    virtual void OnExit();
+    wxDisplayImplWin32Base(unsigned n, wxDisplayInfo& info)
+        : wxDisplayImpl(n),
+          m_info(info)
+    {
+    }
+
+    virtual wxRect GetGeometry() const;
+    virtual wxRect GetClientArea() const;
+    virtual wxString GetName() const;
+    virtual bool IsPrimary() const;

 
 

-    DECLARE_DYNAMIC_CLASS(wxDisplayModule)
+    virtual wxVideoMode GetCurrentMode() const;
+
+protected:
+    // convert a DEVMODE to our wxVideoMode
+    static wxVideoMode ConvertToVideoMode(const DEVMODE& dm)
+    {
+        // note that dmDisplayFrequency may be 0 or 1 meaning "standard one"
+        // and although 0 is ok for us we don't want to return modes with 1hz
+        // refresh
+        return wxVideoMode(dm.dmPelsWidth,
+                           dm.dmPelsHeight,
+                           dm.dmBitsPerPel,
+                           dm.dmDisplayFrequency > 1 ? dm.dmDisplayFrequency : 0);
+    }
+
+    wxDisplayInfo& m_info;

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxDisplayModule, wxModule)
+// ----------------------------------------------------------------------------
+// common base class for all Win32 wxDisplayFactory versions
+// ----------------------------------------------------------------------------

 
 

-// ===========================================================================
-// implementation
-// ===========================================================================
+// functions dynamically bound by wxDisplayFactoryWin32Base::Initialize()
+static MonitorFromPoint_t gs_MonitorFromPoint = NULL;
+static MonitorFromWindow_t gs_MonitorFromWindow = NULL;
+static GetMonitorInfo_t gs_GetMonitorInfo = NULL;
+
+class wxDisplayFactoryWin32Base : public wxDisplayFactory
+{
+public:
+    virtual ~wxDisplayFactoryWin32Base();
+
+    bool IsOk() const { return !m_displays.empty(); }
+
+    virtual unsigned GetCount() { return unsigned(m_displays.size()); }
+    virtual int GetFromPoint(const wxPoint& pt);
+    virtual int GetFromWindow(const wxWindow *window);
+
+protected:
+    // ctor checks if the current system supports multimon API and dynamically
+    // bind the functions we need if this is the case and sets
+    // ms_supportsMultimon if they're available
+    wxDisplayFactoryWin32Base();
+
+    // delete all m_displays elements: can be called from the derived class
+    // dtor if it is important to do this before destroying it,
+    // otherwise will be done by our dtor
+    void Clear();
+
+    // find the monitor corresponding to the given handle, return wxNOT_FOUND
+    // if not found
+    int FindDisplayFromHMONITOR(HMONITOR hmon) const;
+
+
+    // flag indicating whether gs_MonitorXXX functions are available
+    static int ms_supportsMultimon;
+
+    // the array containing information about all available displays, should be
+    // filled by the derived class ctors
+    wxDisplayInfoArray m_displays;
+
+
+    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base);
+};

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// local functions
+// wxDisplay implementation using Windows multi-monitor support functions

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-static BOOL CALLBACK wxmswMonitorEnumProc (
-  HMONITOR hMonitor,  // handle to display monitor
-  HDC hdcMonitor,     // handle to monitor-appropriate device context (NULL)
-  LPRECT lprcMonitor, // pointer to monitor intersection rectangle
-  LPARAM dwData       // data passed from EnumDisplayMonitors (unused)
-)
+class wxDisplayImplMultimon : public wxDisplayImplWin32Base

 {
 {

-    wxDisplayInfo* info = new wxDisplayInfo();
+public:
+    wxDisplayImplMultimon(unsigned n, wxDisplayInfo& info)
+        : wxDisplayImplWin32Base(n, info)
+    {
+    }

 
 

-    // we need hMonitor to be able to map display id to it which is needed for
-    // MonitorXXX() functions, in particular MonitorFromPoint()
-    info->m_hmon = hMonitor;
+    virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
+    virtual bool ChangeMode(const wxVideoMode& mode);

 
 

-    // we also store the display geometry
-    info->m_rect.SetX ( lprcMonitor->left );
-    info->m_rect.SetY ( lprcMonitor->top );
-    info->m_rect.SetWidth ( lprcMonitor->right - lprcMonitor->left );
-    info->m_rect.SetHeight ( lprcMonitor->bottom - lprcMonitor->top );
+private:
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImplMultimon);
+};

 
 

-    // now add this monitor to the array
-    g_displays->Add(info);
+class wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base
+{
+public:
+    wxDisplayFactoryMultimon();
+
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);
+
+private:
+    // EnumDisplayMonitors() callback
+    static BOOL CALLBACK MultimonEnumProc(HMONITOR hMonitor,
+                                          HDC hdcMonitor,
+                                          LPRECT lprcMonitor,
+                                          LPARAM dwData);
+
+    // add a monitor description to m_displays array
+    void AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor);
+};

 
 

-    // continue the enumeration
-    return TRUE;
-}

 
 

-// this function must be called before accessing g_displays array as it
-// creates and initializes it
-static void InitDisplays()
+// ============================================================================
+// common classes implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxDisplay
+// ----------------------------------------------------------------------------
+
+/* static */ wxDisplayFactory *wxDisplay::CreateFactory()

 {
 {

-    if ( g_displays )
-        return;
+    wxDisplayFactoryMultimon *factoryMM = new wxDisplayFactoryMultimon;

 
 

-    g_displays = new wxDisplayInfoArray();
+    if ( factoryMM->IsOk() )
+        return factoryMM;

 
 

-    // enumerate all displays
-    if ( !::EnumDisplayMonitors(NULL, NULL, wxmswMonitorEnumProc, 0) )
+    delete factoryMM;
+
+    // finally fall back to a stub implementation if all else failed (Win95?)
+    return new wxDisplayFactorySingle;
+}
+
+
+// ----------------------------------------------------------------------------
+// wxDisplayInfo
+// ----------------------------------------------------------------------------
+
+void wxDisplayInfo::Initialize()
+{
+    if ( m_flags == (DWORD)-1 )

     {
     {

-        wxLogLastError(wxT("EnumDisplayMonitors"));
+        WinStruct<MONITORINFOEX> monInfo;
+        if ( !gs_GetMonitorInfo(m_hmon, (LPMONITORINFO)&monInfo) )
+        {
+            wxLogLastError(wxT("GetMonitorInfo"));
+            m_flags = 0;
+            return;
+        }

 
 

-        // TODO: still create at least one (valid) entry in g_displays for the
-        //       primary display!
+        wxCopyRECTToRect(monInfo.rcMonitor, m_rect);
+        wxCopyRECTToRect(monInfo.rcWork, m_rectClient);
+        m_devName = monInfo.szDevice;
+        m_flags = monInfo.dwFlags;

     }
 }
 
     }
 }
 

-// convert a DEVMODE to our wxVideoMode
-wxVideoMode ConvertToVideoMode(const DEVMODE& dm)
+// ----------------------------------------------------------------------------
+// wxDisplayImplWin32Base
+// ----------------------------------------------------------------------------
+
+wxRect wxDisplayImplWin32Base::GetGeometry() const

 {
 {

-    // note that dmDisplayFrequency may be 0 or 1 meaning "standard one" and
-    // although 0 is ok for us we don't want to return modes with 1hz refresh
-    return wxVideoMode(dm.dmPelsWidth,
-                       dm.dmPelsHeight,
-                       dm.dmBitsPerPel,
-                       dm.dmDisplayFrequency > 1 ? dm.dmDisplayFrequency : 0);
+    if ( m_info.m_rect.IsEmpty() )
+        m_info.Initialize();
+
+    return m_info.m_rect;

 }
 
 }
 

-// emulation of ChangeDisplaySettingsEx() for Win95
-LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName),
-                                            LPDEVMODE lpDevMode,
-                                            HWND WXUNUSED(hwnd),
-                                            DWORD dwFlags,
-                                            LPVOID WXUNUSED(lParam))
+wxRect wxDisplayImplWin32Base::GetClientArea() const

 {
 {

-    return ::ChangeDisplaySettings(lpDevMode, dwFlags);
+    if ( m_info.m_rectClient.IsEmpty() )
+        m_info.Initialize();
+
+    return m_info.m_rectClient;
+}
+
+wxString wxDisplayImplWin32Base::GetName() const
+{
+    if ( m_info.m_devName.empty() )
+        m_info.Initialize();
+
+    return m_info.m_devName;
+}
+
+bool wxDisplayImplWin32Base::IsPrimary() const
+{
+    if ( m_info.m_flags == (DWORD)-1 )
+        m_info.Initialize();
+
+    return (m_info.m_flags & MONITORINFOF_PRIMARY) != 0;
+}
+
+wxVideoMode wxDisplayImplWin32Base::GetCurrentMode() const
+{
+    wxVideoMode mode;
+
+    // The first parameter of EnumDisplaySettings() must be NULL under Win95
+    // 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()
+                                          ? (const wxChar*)NULL
+                                          : (const wxChar*)name.c_str();
+
+    DEVMODE dm;
+    dm.dmSize = sizeof(dm);
+    dm.dmDriverExtra = 0;
+    if ( !::EnumDisplaySettings(deviceName, ENUM_CURRENT_SETTINGS, &dm) )
+    {
+        wxLogLastError(wxT("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)"));
+    }
+    else
+    {
+        mode = ConvertToVideoMode(dm);
+    }
+
+    return mode;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxDisplayModule
+// wxDisplayFactoryWin32Base

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxDisplayModule::OnExit()
+int wxDisplayFactoryWin32Base::ms_supportsMultimon = -1;
+
+wxDisplayFactoryWin32Base::wxDisplayFactoryWin32Base()

 {
 {

-    delete g_displays;
+    if ( ms_supportsMultimon == -1 )
+    {
+        ms_supportsMultimon = 0;
+
+        wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET);
+
+        if ( (wxDL_INIT_FUNC(gs_, MonitorFromPoint, dllDisplay)) == NULL ||
+             (wxDL_INIT_FUNC(gs_, MonitorFromWindow, dllDisplay)) == NULL ||
+             (wxDL_INIT_FUNC_AW(gs_, GetMonitorInfo, dllDisplay)) == NULL )
+            return;
+
+        ms_supportsMultimon = 1;
+
+        // we can safely let dllDisplay go out of scope, the DLL itself will
+        // still remain loaded as all programs link to it statically anyhow
+    }

 }
 
 }
 

-// ---------------------------------------------------------------------------
-// wxDisplay
-// ---------------------------------------------------------------------------
+void wxDisplayFactoryWin32Base::Clear()
+{
+    WX_CLEAR_ARRAY(m_displays);
+}
+
+wxDisplayFactoryWin32Base::~wxDisplayFactoryWin32Base()
+{
+    Clear();
+}

 
 

-// helper of GetFromPoint() and GetFromWindow()
-static int DisplayFromHMONITOR(HMONITOR hmon)
+// helper for GetFromPoint() and GetFromWindow()
+int wxDisplayFactoryWin32Base::FindDisplayFromHMONITOR(HMONITOR hmon) const

 {
     if ( hmon )
     {
 {
     if ( hmon )
     {

-        const size_t count = wxDisplay::GetCount();
-
+        const size_t count = m_displays.size();

         for ( size_t n = 0; n < count; n++ )
         {
         for ( size_t n = 0; n < count; n++ )
         {

-            if ( hmon == (*g_displays)[n].m_hmon )
+            if ( hmon == m_displays[n]->m_hmon )

                 return n;
         }
     }
                 return n;
         }
     }


@@ -221,98 +425,114 @@ static int DisplayFromHMONITOR(HMONITOR hmon)
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-/* static */
-size_t wxDisplayBase::GetCount()
-{
-    InitDisplays();
-
-    // I'm not sure if they really always return the same thing and if this is
-    // not true I'd like to know in which situation does it happen
-    wxASSERT_MSG( g_displays->GetCount() == (size_t)::GetSystemMetrics(SM_CMONITORS),
-                    _T("So how many displays does this system have?") );
-
-    return g_displays->GetCount();
-}
-
-/* static */
-int wxDisplayBase::GetFromPoint ( const wxPoint& pt )
+int wxDisplayFactoryWin32Base::GetFromPoint(const wxPoint& pt)

 {
     POINT pt2;
     pt2.x = pt.x;
     pt2.y = pt.y;
 
 {
     POINT pt2;
     pt2.x = pt.x;
     pt2.y = pt.y;
 

-    return DisplayFromHMONITOR(::MonitorFromPoint(pt2, MONITOR_DEFAULTTONULL));
+    return FindDisplayFromHMONITOR(gs_MonitorFromPoint(pt2,
+                                                       MONITOR_DEFAULTTONULL));

 }
 
 }
 

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

 {
 {

-    return DisplayFromHMONITOR
-           (
-            ::MonitorFromWindow(GetHwndOf(window), MONITOR_DEFAULTTONULL)
-           );
+    return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
+                                                        MONITOR_DEFAULTTONULL));

 }
 
 }
 

-wxDisplay::wxDisplay ( size_t n )
-         : wxDisplayBase ( n )
+// ============================================================================
+// wxDisplay implementation using Win32 multimon API
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxDisplayFactoryMultimon initialization
+// ----------------------------------------------------------------------------
+
+wxDisplayFactoryMultimon::wxDisplayFactoryMultimon()

 {
 {

-    // if we do this in ctor we won't have to call it from all the member
-    // functions
-    InitDisplays();
+    if ( !ms_supportsMultimon )
+        return;
+
+    // look up EnumDisplayMonitors()
+    EnumDisplayMonitors_t pfnEnumDisplayMonitors;
+    {
+        wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET);
+        if ( (wxDL_INIT_FUNC(pfn, EnumDisplayMonitors, dllDisplay)) == NULL )
+            return;
+    }
+
+    // enumerate all displays
+    if ( !pfnEnumDisplayMonitors(NULL, NULL, MultimonEnumProc, (LPARAM)this) )
+    {
+        wxLogLastError(wxT("EnumDisplayMonitors"));
+    }

 }
 
 }
 

-wxRect wxDisplay::GetGeometry() const
+/* static */
+BOOL CALLBACK
+wxDisplayFactoryMultimon::MultimonEnumProc(
+  HMONITOR hMonitor,        // handle to display monitor
+  HDC WXUNUSED(hdcMonitor), // handle to monitor-appropriate device context
+  LPRECT lprcMonitor,       // pointer to monitor intersection rectangle
+  LPARAM dwData             // data passed from EnumDisplayMonitors (this)
+)

 {
 {

-    return (*g_displays)[m_index].m_rect;
+    wxDisplayFactoryMultimon *const self = (wxDisplayFactoryMultimon *)dwData;
+    self->AddDisplay(hMonitor, lprcMonitor);
+
+    // continue the enumeration
+    return TRUE;

 }
 
 }
 

-wxString wxDisplay::GetName() const
+// ----------------------------------------------------------------------------
+// wxDisplayFactoryMultimon helper functions
+// ----------------------------------------------------------------------------
+
+void wxDisplayFactoryMultimon::AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor)

 {
 {

-    wxDisplayInfo& dpyInfo = (*g_displays)[m_index];
-    if ( dpyInfo.m_devName.empty() )
-    {
-        MONITORINFOEX monInfo;
-        wxZeroMemory(monInfo);
-        monInfo.cbSize = sizeof(monInfo);
+    wxDisplayInfo *info = new wxDisplayInfo(hMonitor);

 
 

-        if ( !::GetMonitorInfo(dpyInfo.m_hmon, &monInfo) )
-        {
-            wxLogLastError(_T("GetMonitorInfo"));
-        }
-        else
-        {
-            dpyInfo.m_devName = monInfo.szDevice;
-        }
-    }
+    // we also store the display geometry
+    info->m_rect = wxRect(lprcMonitor->left, lprcMonitor->top,
+                          lprcMonitor->right - lprcMonitor->left,
+                          lprcMonitor->bottom - lprcMonitor->top);

 
 

-    return dpyInfo.m_devName;
+    // now add this monitor to the array
+    m_displays.Add(info);

 }
 
 }
 

-wxString wxDisplay::GetNameForEnumSettings() const
+// ----------------------------------------------------------------------------
+// wxDisplayFactoryMultimon inherited pure virtuals implementation
+// ----------------------------------------------------------------------------
+
+wxDisplayImpl *wxDisplayFactoryMultimon::CreateDisplay(unsigned n)

 {
 {

-    int major, minor;
-    const bool isWin95 = wxGetOsVersion(&major, &minor) == wxWIN95 &&
-                            major == 4 && minor == 0;
-
-    // the first parameter of EnumDisplaySettings() must be NULL under Win95
-    // according to MSDN but GetMonitorInfo() stub in multimon.h still returns
-    // something even in this case, so we have to correct this manually
-    wxString name;
-    if ( !isWin95 )
-        name = GetName();
-
-    return name;
+    wxCHECK_MSG( n < m_displays.size(), NULL, wxT("invalid display index") );
+
+    return new wxDisplayImplMultimon(n, *(m_displays[n]));

 }
 
 }
 

-wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& modeMatch) const
+// ----------------------------------------------------------------------------
+// wxDisplayImplMultimon implementation
+// ----------------------------------------------------------------------------
+
+wxArrayVideoModes
+wxDisplayImplMultimon::GetModes(const wxVideoMode& modeMatch) const

 {
     wxArrayVideoModes modes;
 
 {
     wxArrayVideoModes modes;
 

-    const wxString name = GetNameForEnumSettings();
-
-    const wxChar * const deviceName = name.empty() ? NULL : name.c_str();
+    // The first parameter of EnumDisplaySettings() must be NULL under Win95
+    // 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()
+                                            ? (const wxChar*)NULL
+                                            : (const wxChar*)name.c_str();

 
     DEVMODE dm;
 
     DEVMODE dm;

+    dm.dmSize = sizeof(dm);
+    dm.dmDriverExtra = 0;

     for ( int iModeNum = 0;
           ::EnumDisplaySettings(deviceName, iModeNum, &dm);
           iModeNum++ )
     for ( int iModeNum = 0;
           ::EnumDisplaySettings(deviceName, iModeNum, &dm);
           iModeNum++ )


@@ -327,32 +547,12 @@ wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& modeMatch) const
     return modes;
 }
 
     return modes;
 }
 

-wxVideoMode wxDisplay::GetCurrentMode() const
+bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode)

 {
 {

-    wxVideoMode mode;
-
-    const wxString name = GetNameForEnumSettings();
-
+    // prepare ChangeDisplaySettingsEx() parameters

     DEVMODE dm;
     DEVMODE dm;

-    if ( !::EnumDisplaySettings(name.empty() ? NULL : name.c_str(),
-                                ENUM_CURRENT_SETTINGS,
-                                &dm) )
-    {
-        wxLogLastError(_T("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)"));
-    }
-    else
-    {
-        mode = ConvertToVideoMode(dm);
-    }
+    DEVMODE *pDevMode;

 
 

-    return mode;
-}
-
-bool wxDisplay::ChangeMode(const wxVideoMode& mode)
-{
-    // prepare ChangeDisplaySettingsEx() parameters
-    DEVMODE dm,
-           *pDevMode;

     int flags;
 
     if ( mode == wxDefaultVideoMode )
     int flags;
 
     if ( mode == wxDefaultVideoMode )


@@ -363,30 +563,35 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
     }
     else // change to the given mode
     {
     }
     else // change to the given mode
     {

-        wxCHECK_MSG( mode.w && mode.h, FALSE,
-                        _T("at least the width and height must be specified") );
+        wxCHECK_MSG( mode.GetWidth() && mode.GetHeight(), false,
+                        wxT("at least the width and height must be specified") );

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

+        dm.dmDriverExtra = 0;

         dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;
         dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;

-        dm.dmPelsWidth = mode.w;
-        dm.dmPelsHeight = mode.h;
+        dm.dmPelsWidth = mode.GetWidth();
+        dm.dmPelsHeight = mode.GetHeight();

 
 

-        if ( mode.bpp )
+        if ( mode.GetDepth() )

         {
             dm.dmFields |= DM_BITSPERPEL;
         {
             dm.dmFields |= DM_BITSPERPEL;

-            dm.dmBitsPerPel = mode.bpp;
+            dm.dmBitsPerPel = mode.GetDepth();

         }
 
         }
 

-        if ( mode.refresh )
+        if ( mode.GetRefresh() )

         {
             dm.dmFields |= DM_DISPLAYFREQUENCY;
         {
             dm.dmFields |= DM_DISPLAYFREQUENCY;

-            dm.dmDisplayFrequency = mode.refresh;
+            dm.dmDisplayFrequency = mode.GetRefresh();

         }
 
         pDevMode = &dm;
 
         }
 
         pDevMode = &dm;
 

+#ifdef __WXWINCE__
+        flags = 0;
+#else // !__WXWINCE__

         flags = CDS_FULLSCREEN;
         flags = CDS_FULLSCREEN;

+#endif // __WXWINCE__/!__WXWINCE__

     }
 
 
     }
 
 


@@ -397,46 +602,58 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
     static ChangeDisplaySettingsEx_t pfnChangeDisplaySettingsEx = NULL;
     if ( !pfnChangeDisplaySettingsEx )
     {
     static ChangeDisplaySettingsEx_t pfnChangeDisplaySettingsEx = NULL;
     if ( !pfnChangeDisplaySettingsEx )
     {

-        wxDynamicLibrary dllUser32(_T("user32.dll"));
-        if ( dllUser32.IsLoaded() )
+        wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET);
+        if ( dllDisplay.IsLoaded() )

         {
         {

-            pfnChangeDisplaySettingsEx = (ChangeDisplaySettingsEx_t)
-                dllUser32.GetSymbol(WINFUNC(ChangeDisplaySettingsEx));
+            wxDL_INIT_FUNC_AW(pfn, ChangeDisplaySettingsEx, dllDisplay);

         }
         }

-        //else: huh, no user32.dll??
+        //else: huh, no this DLL must always be present, what's going on??

 
 

+#ifndef __WXWINCE__

         if ( !pfnChangeDisplaySettingsEx )
         {
             // we must be under Win95 and so there is no multiple monitors
             // support anyhow
             pfnChangeDisplaySettingsEx = ChangeDisplaySettingsExForWin95;
         }
         if ( !pfnChangeDisplaySettingsEx )
         {
             // we must be under Win95 and so there is no multiple monitors
             // support anyhow
             pfnChangeDisplaySettingsEx = ChangeDisplaySettingsExForWin95;
         }

+#endif // !__WXWINCE__

     }
 
     // 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:
             // ok
              ) )
     {
         case DISP_CHANGE_SUCCESSFUL:
             // ok

-            return TRUE;
+            {
+                // If we have a top-level, full-screen frame, emulate
+                // the DirectX behavior and resize it.  This makes this
+                // API quite a bit easier to use.
+                wxWindow *winTop = wxTheApp->GetTopWindow();
+                wxFrame *frameTop = wxDynamicCast(winTop, wxFrame);
+                if (frameTop && frameTop->IsFullScreen())
+                {
+                    wxVideoMode current = GetCurrentMode();
+                    frameTop->SetClientSize(current.GetWidth(), current.GetHeight());
+                }
+            }
+            return true;

 
         case DISP_CHANGE_BADMODE:
             // don't complain about this, this is the only "expected" error
             break;
 
         default:
 
         case DISP_CHANGE_BADMODE:
             // don't complain about this, this is the only "expected" error
             break;
 
         default:

-            wxFAIL_MSG( _T("unexpected ChangeDisplaySettingsEx() return value") );
+            wxFAIL_MSG( wxT("unexpected ChangeDisplaySettingsEx() return value") );

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 #endif // wxUSE_DISPLAY
 }
 
 #endif // wxUSE_DISPLAY

-