No changes, just remove unnecessary wxPickerBase::OnSize().

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

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index ecb46d2913b3ce95bf91b4150fc71a9b026ba142..b7abb3019222619035091300e8f443a31ef17149 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: VZ (resolutions enumeration/change support, DirectDraw, ...)
+// 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,50 +27,54 @@
 
 #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(s), 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
 

-#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 } };
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-#ifdef _UNICODE
-    #define WINFUNC(x)  _T(#x) L"W"
+#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
 
 // ----------------------------------------------------------------------------


@@ -86,494 +87,236 @@ typedef LONG (WINAPI *ChangeDisplaySettingsEx_t)(LPCTSTR lpszDeviceName,
                                                  DWORD dwFlags,
                                                  LPVOID lParam);
 
                                                  DWORD dwFlags,
                                                  LPVOID lParam);
 

-typedef BOOL (PASCAL *DDEnumExCallback_t)(GUID *pGuid,
-                                          LPTSTR driverDescription,
-                                          LPTSTR driverName,
-                                          LPVOID lpContext,
-                                          HMONITOR hmon);
+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);

 
 

-typedef HRESULT (WINAPI *DirectDrawEnumerateEx_t)(DDEnumExCallback_t lpCallback,
-                                                  LPVOID lpContext,
-                                                  DWORD dwFlags);
+#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__

 
 

-typedef HRESULT (WINAPI *DirectDrawCreate_t)(GUID *lpGUID,
-                                             LPDIRECTDRAW *lplpDD,
-                                             IUnknown *pUnkOuter);

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

-// private classes
+// wxDisplayMSW declaration

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

-class wxDisplayInfo
+class wxDisplayMSW : public wxDisplayImpl

 {
 public:
 {
 public:

-    // handle of this monitor used by MonitorXXX() functions, never NULL
-    HMONITOR m_hmon;
-
-    // IDirectDraw object used to control this display, may be NULL
-    IDirectDraw2 *m_pDD2;
-
-    // DirectDraw GUID for this display, only valid when using DirectDraw
-    GUID m_guid;
+    wxDisplayMSW(unsigned n, HMONITOR hmon)
+        : wxDisplayImpl(n),
+          m_hmon(hmon)
+    {
+    }

 
 

-    // the entire area of this monitor in virtual screen coordinates
-    wxRect m_rect;
+    virtual wxRect GetGeometry() const;
+    virtual wxRect GetClientArea() const;
+    virtual wxString GetName() const;
+    virtual bool IsPrimary() const;

 
 

-    // the display device name for this monitor, empty initially and retrieved
-    // on demand by DoGetName()
-    wxString m_devName;
+    virtual wxVideoMode GetCurrentMode() const;
+    virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
+    virtual bool ChangeMode(const wxVideoMode& mode);

 
 

-    wxDisplayInfo() { m_hmon = NULL; m_pDD2 = NULL; }
-    ~wxDisplayInfo() { if ( m_pDD2 ) m_pDD2->Release(); }
-};
+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);
+    }

 
 

-WX_DECLARE_OBJARRAY(wxDisplayInfo, wxDisplayInfoArray);
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxDisplayInfoArray);
+    // Call GetMonitorInfo() and fill in the provided struct and return true if
+    // it succeeded, otherwise return false.
+    bool GetMonInfo(MONITORINFOEX& monInfo) const;

 
 

-// this module is used to cleanup gs_displays array
-class wxDisplayModule : public wxModule
-{
-public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit();
+    HMONITOR m_hmon;

 
 

-    DECLARE_DYNAMIC_CLASS(wxDisplayModule)
+private:
+    wxDECLARE_NO_COPY_CLASS(wxDisplayMSW);

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxDisplayModule, wxModule)

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

-// globals
+// wxDisplayFactoryMSW declaration

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

-// do we use DirectX?
-static bool gs_useDirectX = false;
+WX_DEFINE_ARRAY(HMONITOR, wxMonitorHandleArray);

 
 

-// dynamically resolved DirectDrawCreate()
-static DirectDrawCreate_t gs_DirectDrawCreate = NULL;
+// functions dynamically bound by wxDisplayFactoryMSW ctor.
+static MonitorFromPoint_t gs_MonitorFromPoint = NULL;
+static MonitorFromWindow_t gs_MonitorFromWindow = NULL;
+static GetMonitorInfo_t gs_GetMonitorInfo = NULL;
+static EnumDisplayMonitors_t gs_EnumDisplayMonitors = NULL;

 
 

-// 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 *gs_displays = NULL;
+class wxDisplayFactoryMSW : public wxDisplayFactory
+{
+public:
+    // ctor checks if the current system supports multimon API and dynamically
+    // bind the functions we need if this is the case and fills the
+    // m_displays array if they're available
+    wxDisplayFactoryMSW();
+
+    bool IsOk() const { return !m_displays.empty(); }
+
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);
+    virtual unsigned GetCount() { return unsigned(m_displays.size()); }
+    virtual int GetFromPoint(const wxPoint& pt);
+    virtual int GetFromWindow(const wxWindow *window);
+
+private:
+    // EnumDisplayMonitors() callback
+    static BOOL CALLBACK MultimonEnumProc(HMONITOR hMonitor,
+                                          HDC hdcMonitor,
+                                          LPRECT lprcMonitor,
+                                          LPARAM dwData);
+
+    // find the monitor corresponding to the given handle,
+    // return wxNOT_FOUND if not found
+    int FindDisplayFromHMONITOR(HMONITOR hmon) const;
+
+    // the array containing information about all available displays, filled by
+    // MultimonEnumProc()
+    wxMonitorHandleArray m_displays;
+
+    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryMSW);
+};

 
 

-// ===========================================================================
-// implementation
-// ===========================================================================

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

-// callbacks for monitor/modes enumeration stuff
+// wxDisplay implementation

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

-static BOOL CALLBACK wxmswMonitorEnumProc (
-  HMONITOR hMonitor,        // handle to display monitor
-  HDC WXUNUSED(hdcMonitor), // handle to monitor-appropriate device context
-  LPRECT lprcMonitor,       // pointer to monitor intersection rectangle
-  LPARAM WXUNUSED(dwData)   // data passed from EnumDisplayMonitors (unused)
-)
+/* static */ wxDisplayFactory *wxDisplay::CreateFactory()

 {
 {

-    wxDisplayInfo *info = new wxDisplayInfo();
+    wxDisplayFactoryMSW *factoryMM = new wxDisplayFactoryMSW;

 
 

-    // 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;
+    if ( factoryMM->IsOk() )
+        return factoryMM;

 
 

-    // 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 );
+    delete factoryMM;

 
 

-    // now add this monitor to the array
-    gs_displays->Add(info);
-
-    // continue the enumeration
-    return true;
+    // fall back to a stub implementation if no multimon support (Win95?)
+    return new wxDisplayFactorySingle;

 }
 
 }
 

-BOOL PASCAL
-wxDDEnumExCallback(GUID *pGuid,
-                   LPTSTR WXUNUSED(driverDescription),
-                   LPTSTR driverName,
-                   LPVOID WXUNUSED(lpContext),
-                   HMONITOR hmon)
-{
-    if ( pGuid )
-    {
-        wxDisplayInfo *info = new wxDisplayInfo();
-
-        info->m_hmon = hmon;
-        info->m_guid = *pGuid;
-        info->m_devName = driverName;
-
-        gs_displays->Add(info);
-    }
-    //else: we're called for the primary monitor, skip it
-
-    // continue the enumeration
-    return true;
-}
-
-HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc,  
-                                     LPVOID lpContext)
-{
-    // we need at least the mode size
-    static const int FLAGS_REQUIRED = DDSD_HEIGHT | DDSD_WIDTH;
-    if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED )
-    {
-        wxArrayVideoModes * const modes = (wxArrayVideoModes *)lpContext;
-
-        modes->Add(wxVideoMode(lpDDSurfaceDesc->dwWidth,
-                               lpDDSurfaceDesc->dwHeight,
-                               lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount,
-                               lpDDSurfaceDesc->dwRefreshRate));
-    }
-
-    // continue the enumeration
-    return DDENUMRET_OK;
-}

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

-// local functions
+// wxDisplayMSW implementation

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

-// initialize gs_displays using DirectX functions
-static bool DoInitDirectX()
+bool wxDisplayMSW::GetMonInfo(MONITORINFOEX& monInfo) const

 {
 {

-    // suppress the errors if ddraw.dll is not found
-    wxLog::EnableLogging(false);
-
-    wxDynamicLibrary dllDX(_T("ddraw.dll"));
-
-    wxLog::EnableLogging(true);
-
-    if ( !dllDX.IsLoaded() )
-        return false;
-
-    DirectDrawEnumerateEx_t pDDEnumEx = (DirectDrawEnumerateEx_t)
-        dllDX.GetSymbol(WINFUNC(DirectDrawEnumerateEx));
-    if ( !pDDEnumEx )
-        return false;
-
-    // we'll also need DirectDrawCreate() later, resolve it right now
-    gs_DirectDrawCreate = (DirectDrawCreate_t)
-        dllDX.GetSymbol(_T("DirectDrawCreate"));
-    if ( !gs_DirectDrawCreate )
-        return false;
-
-    if ( (*pDDEnumEx)(wxDDEnumExCallback,
-                      NULL,
-                      DDENUM_ATTACHEDSECONDARYDEVICES) != DD_OK )
+    if ( !gs_GetMonitorInfo(m_hmon, &monInfo) )

     {
     {

+        wxLogLastError(wxT("GetMonitorInfo"));

         return false;
     }
 
         return false;
     }
 

-    // ok, it seems like we're going to use DirectDraw and so we're going to
-    // need ddraw.dll all the time, don't unload it
-    dllDX.Detach();
-

     return true;
 }
 
     return true;
 }
 

-// initialize gs_displays using the standard Windows functions
-static void DoInitStdWindows()
-{
-    // enumerate all displays
-    if ( !::EnumDisplayMonitors(NULL, NULL, wxmswMonitorEnumProc, 0) )
-    {
-        wxLogLastError(wxT("EnumDisplayMonitors"));
-
-        // TODO: still create at least one (valid) entry in gs_displays for the
-        //       primary display!
-    }
-}
-
-// this function must be called before accessing gs_displays array as it
-// creates and initializes it
-static void InitDisplays()
-{
-    if ( gs_displays )
-        return;
-
-    gs_displays = new wxDisplayInfoArray();
-
-    if ( !gs_useDirectX || !DoInitDirectX() )
-    {
-        // either we were told not to try to use DirectX or fall back to std
-        // functions if DirectX method failed
-        gs_useDirectX = false;
-
-        DoInitStdWindows();
-    }
-}
-
-// convert a DEVMODE to our wxVideoMode
-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);
-}
-
-// emulation of ChangeDisplaySettingsEx() for Win95
-LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName),
-                                            LPDEVMODE lpDevMode,
-                                            HWND WXUNUSED(hwnd),
-                                            DWORD dwFlags,
-                                            LPVOID WXUNUSED(lParam))
+wxRect wxDisplayMSW::GetGeometry() const

 {
 {

-    return ::ChangeDisplaySettings(lpDevMode, dwFlags);
-}
+    WinStruct<MONITORINFOEX> monInfo;

 
 

-// ----------------------------------------------------------------------------
-// wxDisplayModule
-// ----------------------------------------------------------------------------
-
-void wxDisplayModule::OnExit()
-{
-    delete gs_displays;
-}
+    wxRect rect;
+    if ( GetMonInfo(monInfo) )
+        wxCopyRECTToRect(monInfo.rcMonitor, rect);

 
 

-// ---------------------------------------------------------------------------
-// wxDisplay
-// ---------------------------------------------------------------------------
-
-/* static */
-void wxDisplay::UseDirectX(bool useDX)
-{
-    wxCHECK_RET( !gs_displays, _T("it is too late to call UseDirectX") );
-
-    gs_useDirectX = useDX;
-}
-
-// helper of GetFromPoint() and GetFromWindow()
-static int DisplayFromHMONITOR(HMONITOR hmon)
-{
-    if ( hmon )
-    {
-        const size_t count = wxDisplay::GetCount();
-
-        for ( size_t n = 0; n < count; n++ )
-        {
-            if ( hmon == (*gs_displays)[n].m_hmon )
-                return n;
-        }
-    }
-
-    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( gs_displays->GetCount() == (size_t)::GetSystemMetrics(SM_CMONITORS),
-                    _T("So how many displays does this system have?") );
-
-    return gs_displays->GetCount();
+    return rect;

 }
 
 }
 

-/* static */
-int wxDisplayBase::GetFromPoint ( const wxPoint& pt )
+wxRect wxDisplayMSW::GetClientArea() const

 {
 {

-    POINT pt2;
-    pt2.x = pt.x;
-    pt2.y = pt.y;
+    WinStruct<MONITORINFOEX> monInfo;

 
 

-    return DisplayFromHMONITOR(::MonitorFromPoint(pt2, MONITOR_DEFAULTTONULL));
-}
+    wxRect rectClient;
+    if ( GetMonInfo(monInfo) )
+        wxCopyRECTToRect(monInfo.rcWork, rectClient);

 
 

-/* static */
-int wxDisplayBase::GetFromWindow(wxWindow *window)
-{
-    return DisplayFromHMONITOR
-           (
-            ::MonitorFromWindow(GetHwndOf(window), MONITOR_DEFAULTTONULL)
-           );
+    return rectClient;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxDisplay ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxDisplay::wxDisplay ( size_t n )
-         : wxDisplayBase ( n )
+wxString wxDisplayMSW::GetName() const

 {
 {

-    // if we do this in ctor we won't have to call it from all the member
-    // functions
-    InitDisplays();
+    WinStruct<MONITORINFOEX> monInfo;

 
 

-    if ( gs_useDirectX )
-    {
-        wxDisplayInfo& dpyInfo = (*gs_displays)[n];
-
-        LPDIRECTDRAW2& pDD2 = dpyInfo.m_pDD2;
-        if ( !pDD2 )
-        {
-            if ( !gs_DirectDrawCreate )
-            {
-                // what to do??
-                return;
-            }
-
-            IDirectDraw *pDD;
-            HRESULT hr = (*gs_DirectDrawCreate)(&dpyInfo.m_guid, &pDD, NULL);
-
-            if ( FAILED(hr) || !pDD )
-            {
-                // what to do??
-                wxLogApiError(_T("DirectDrawCreate"), hr);
-            }
-            else // got IDirectDraw, we want IDirectDraw2
-            {
-                hr = pDD->QueryInterface(wxIID_IDirectDraw2, (void **)&pDD2);
-                if ( FAILED(hr) || !pDD2 )
-                {
-                    wxLogApiError(_T("IDirectDraw::QueryInterface(IDD2)"), hr);
-                }
+    wxString name;
+    if ( GetMonInfo(monInfo) )
+        name = monInfo.szDevice;

 
 

-                pDD->Release();
-            }
-        }
-        //else: DirectDraw object corresponding to our display already exists
-
-        // increment its ref count to account for Release() in dtor
-        //
-        // NB: pDD2 will be only really Release()d when gs_displays is
-        //     destroyed which is ok as we don't want to recreate DD objects
-        //     all the time
-        pDD2->AddRef();
-    }
+    return name;

 }
 
 }
 

-wxDisplay::~wxDisplay()
+bool wxDisplayMSW::IsPrimary() const

 {
 {

-    wxDisplayInfo& dpyInfo = (*gs_displays)[m_index];
+    WinStruct<MONITORINFOEX> monInfo;

 
 

-    LPDIRECTDRAW2& pDD2 = dpyInfo.m_pDD2;
-    if ( pDD2 )
-    {
-        pDD2->Release();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxDisplay simple accessors
-// ----------------------------------------------------------------------------
+    if ( !GetMonInfo(monInfo) )
+        return false;

 
 

-bool wxDisplay::IsOk() const
-{
-    return m_index < GetCount() &&
-                (!gs_useDirectX || (*gs_displays)[m_index].m_pDD2);
+    return (monInfo.dwFlags & MONITORINFOF_PRIMARY) != 0;

 }
 
 }
 

-wxRect wxDisplay::GetGeometry() const
+wxVideoMode wxDisplayMSW::GetCurrentMode() const

 {
 {

-    wxDisplayInfo& dpyInfo = (*gs_displays)[m_index];
-    wxRect& rect = dpyInfo.m_rect;
-    if ( !rect.width )
-    {
-        MONITORINFO monInfo;
-        wxZeroMemory(monInfo);
-        monInfo.cbSize = sizeof(monInfo);
+    wxVideoMode mode;

 
 

-        if ( !::GetMonitorInfo(dpyInfo.m_hmon, &monInfo) )
-        {
-            wxLogLastError(_T("GetMonitorInfo"));
-        }
-        else
-        {
-            wxCopyRECTToRect(monInfo.rcMonitor, rect);
-        }
-    }
+    // 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();

 
 

-    return rect;
-}
+    DEVMODE dm;
+    dm.dmSize = sizeof(dm);
+    dm.dmDriverExtra = 0;

 
 

-wxString wxDisplay::GetName() const
-{
-    wxDisplayInfo& dpyInfo = (*gs_displays)[m_index];
-    if ( dpyInfo.m_devName.empty() )
+    if ( !::EnumDisplaySettings(deviceName, ENUM_CURRENT_SETTINGS, &dm) )

     {
     {

-        MONITORINFOEX monInfo;
-        wxZeroMemory(monInfo);
-        monInfo.cbSize = sizeof(monInfo);
-
-        if ( !::GetMonitorInfo(dpyInfo.m_hmon, &monInfo) )
-        {
-            wxLogLastError(_T("GetMonitorInfo"));
-        }
-        else
-        {
-            dpyInfo.m_devName = monInfo.szDevice;
-        }
+        wxLogLastError(wxT("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)"));

     }
     }

-
-    return dpyInfo.m_devName;
-}
-
-wxString wxDisplay::GetNameForEnumSettings() const
-{
-    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;
-}
-
-// ----------------------------------------------------------------------------
-// video modes enumeration
-// ----------------------------------------------------------------------------
-
-wxArrayVideoModes
-wxDisplay::DoGetModesDirectX(const wxVideoMode& WXUNUSED(modeMatch)) const
-{
-    wxArrayVideoModes modes;
-
-    IDirectDraw2 *pDD = (*gs_displays)[m_index].m_pDD2;
-
-    if ( pDD )
+    else

     {
     {

-        HRESULT hr = pDD->EnumDisplayModes
-                          (
-                            DDEDM_REFRESHRATES,
-                            NULL,   // all modes (TODO: use modeMatch!)
-                            &modes,   // callback parameter
-                            wxDDEnumModesCallback
-                          );
-
-        if ( FAILED(hr) )
-        {
-            wxLogApiError(_T("IDirectDraw::EnumDisplayModes"), hr);
-        }
+        mode = ConvertToVideoMode(dm);

     }
 
     }
 

-    return modes;
+    return mode;

 }
 
 }
 

-wxArrayVideoModes
-wxDisplay::DoGetModesWindows(const wxVideoMode& modeMatch) const
+wxArrayVideoModes wxDisplayMSW::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++ )


@@ -588,75 +331,12 @@ wxDisplay::DoGetModesWindows(const wxVideoMode& modeMatch) const
     return modes;
 }
 
     return modes;
 }
 

-wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& modeMatch) const
+bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode)

 {
 {

-    return gs_useDirectX ? DoGetModesDirectX(modeMatch)
-                         : DoGetModesWindows(modeMatch);
-}
-
-wxVideoMode wxDisplay::GetCurrentMode() const
-{
-    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;
-}
-
-// ----------------------------------------------------------------------------
-// video mode switching
-// ----------------------------------------------------------------------------
-
-bool wxDisplay::DoChangeModeDirectX(const wxVideoMode& mode)
-{
-    IDirectDraw2 *pDD = (*gs_displays)[m_index].m_pDD2;
-    if ( !pDD )
-        return false;
-
-    wxWindow *winTop = wxTheApp->GetTopWindow();
-    wxCHECK_MSG( winTop, false, _T("top level window required for DirectX") );
-
-    HRESULT hr = pDD->SetCooperativeLevel
-                      (
-                        GetHwndOf(winTop),
-                        DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN
-                      );
-    if ( FAILED(hr) )
-    {
-        wxLogApiError(_T("IDirectDraw::SetCooperativeLevel"), hr);
-
-        return false;
-    }
-
-    hr = pDD->SetDisplayMode(mode.w, mode.h, mode.bpp, mode.refresh, 0);
-    if ( FAILED(hr) )
-    {
-        wxLogApiError(_T("IDirectDraw::SetDisplayMode"), hr);
-
-        return false;
-    }
-
-         
-    return true;
-}
-
-bool wxDisplay::DoChangeModeWindows(const wxVideoMode& mode)
-{
-    // prepare ChangeDisplaySettingsEx() parameters
-    DEVMODE dm,
-           *pDevMode;

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


@@ -667,30 +347,35 @@ bool wxDisplay::DoChangeModeWindows(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__

     }
 
 
     }
 
 


@@ -701,44 +386,45 @@ bool wxDisplay::DoChangeModeWindows(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
             {
                 // If we have a top-level, full-screen frame, emulate
              ) )
     {
         case DISP_CHANGE_SUCCESSFUL:
             // ok
             {
                 // If we have a top-level, full-screen frame, emulate

-                // the DirectX behavior and resize it.  This makes this
+                // the DirectX behaviour 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();
                 // 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.w, current.h);
+                    frameTop->SetClientSize(current.GetWidth(), current.GetHeight());

                 }
             }
             return true;
                 }
             }
             return true;


@@ -748,17 +434,98 @@ bool wxDisplay::DoChangeModeWindows(const wxVideoMode& mode)
             break;
 
         default:
             break;
 
         default:

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

     }
 
     return false;
 }
 
     }
 
     return false;
 }
 

-bool wxDisplay::ChangeMode(const wxVideoMode& mode)
+
+// ----------------------------------------------------------------------------
+// wxDisplayFactoryMSW implementation
+// ----------------------------------------------------------------------------
+
+wxDisplayFactoryMSW::wxDisplayFactoryMSW()
+{
+    if ( gs_MonitorFromPoint==NULL || gs_MonitorFromWindow==NULL
+         || gs_GetMonitorInfo==NULL || gs_EnumDisplayMonitors==NULL )
+    {
+        // First initialization, or last initialization failed.
+        wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET);
+
+        wxDL_INIT_FUNC(gs_, MonitorFromPoint, dllDisplay);
+        wxDL_INIT_FUNC(gs_, MonitorFromWindow, dllDisplay);
+        wxDL_INIT_FUNC_AW(gs_, GetMonitorInfo, dllDisplay);
+        wxDL_INIT_FUNC(gs_, EnumDisplayMonitors, dllDisplay);
+
+        // we can safely let dllDisplay go out of scope, the DLL itself will
+        // still remain loaded as all programs link to it statically anyhow
+    }
+
+    if ( gs_MonitorFromPoint==NULL || gs_MonitorFromWindow==NULL
+         || gs_GetMonitorInfo==NULL || gs_EnumDisplayMonitors==NULL )
+        return;
+
+    // enumerate all displays
+    if ( !gs_EnumDisplayMonitors(NULL, NULL, MultimonEnumProc, (LPARAM)this) )
+    {
+        wxLogLastError(wxT("EnumDisplayMonitors"));
+    }
+}
+
+/* static */
+BOOL CALLBACK
+wxDisplayFactoryMSW::MultimonEnumProc(
+    HMONITOR hMonitor,              // handle to display monitor
+    HDC WXUNUSED(hdcMonitor),       // handle to monitor-appropriate device context
+    LPRECT WXUNUSED(lprcMonitor),   // pointer to monitor intersection rectangle
+    LPARAM dwData)                  // data passed from EnumDisplayMonitors (this)

 {
 {

-    return gs_useDirectX ? DoChangeModeDirectX(mode)
-                         : DoChangeModeWindows(mode);
+    wxDisplayFactoryMSW *const self = (wxDisplayFactoryMSW *)dwData;
+
+    self->m_displays.Add(hMonitor);
+
+    // continue the enumeration
+    return TRUE;

 }
 
 }
 

-#endif // wxUSE_DISPLAY
+wxDisplayImpl *wxDisplayFactoryMSW::CreateDisplay(unsigned n)
+{
+    wxCHECK_MSG( n < m_displays.size(), NULL, wxT("An invalid index was passed to wxDisplay") );

 
 

+    return new wxDisplayMSW(n, m_displays[n]);
+}
+
+// helper for GetFromPoint() and GetFromWindow()
+int wxDisplayFactoryMSW::FindDisplayFromHMONITOR(HMONITOR hmon) const
+{
+    if ( hmon )
+    {
+        const size_t count = m_displays.size();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            if ( hmon == m_displays[n] )
+                return n;
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+int wxDisplayFactoryMSW::GetFromPoint(const wxPoint& pt)
+{
+    POINT pt2;
+    pt2.x = pt.x;
+    pt2.y = pt.y;
+
+    return FindDisplayFromHMONITOR(gs_MonitorFromPoint(pt2,
+                                                       MONITOR_DEFAULTTONULL));
+}
+
+int wxDisplayFactoryMSW::GetFromWindow(const wxWindow *window)
+{
+    return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
+                                                        MONITOR_DEFAULTTONULL));
+}
+
+#endif // wxUSE_DISPLAY