X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..b4446c244775324631b8dd2b588ea35f32e71728:/src/mac/classic/display.cpp?ds=sidebyside

diff --git a/src/mac/classic/display.cpp b/src/mac/classic/display.cpp
index 00f4d034db..f216f1fd65 100644
--- a/src/mac/classic/display.cpp
+++ b/src/mac/classic/display.cpp
@@ -1,14 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        display.cpp
+// Name:        src/mac/classic/display.cpp
 // Purpose:     Mac implementation of wxDisplay class
 // Author:      Brian Victor
-// Modified by: Royce Mitchell III & Ryan Norton
+// Modified by: Royce Mitchell III & Ryan Norton, Vadim Zeitlin
 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -18,10 +26,12 @@
 
 #if wxUSE_DISPLAY
 
+#include "wx/display.h"
+
 #ifndef WX_PRECOMP
-   #include "wx/dynarray.h"
-   #include "wx/log.h"
-   #include "wx/msgdlg.h"
+    #include "wx/dynarray.h"
+    #include "wx/log.h"
+    #include "wx/string.h"
 #endif
 
 #ifdef __DARWIN__
@@ -34,25 +44,56 @@
     #include <FixMath.h>
 #endif
 
-#include "wx/display.h"
+#include "wx/display_impl.h"
 #include "wx/gdicmn.h"
-#include "wx/string.h"
 
 // ----------------------------------------------------------------------------
-// private classes
+// display implementation classes
 // ----------------------------------------------------------------------------
 
-class wxDisplayMacPriv
+class wxDisplayImplMac : public wxDisplayImpl
 {
 public:
+    wxDisplayImplMac(size_t n, GDHandle hndl)
+        : wxDisplayImpl(n),
+          m_hndl(hndl)
+    {
+    }
+
+    virtual wxRect GetGeometry() const;
+    virtual wxString GetName() const { return wxString(); }
+
+    virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
+    virtual wxVideoMode GetCurrentMode() const;
+    virtual bool ChangeMode(const wxVideoMode& mode);
+
+private:
     GDHandle m_hndl;
+
+    DECLARE_NO_COPY_CLASS(wxDisplayImplMac)
+};
+
+class wxDisplayFactoryMac : public wxDisplayFactory
+{
+public:
+    wxDisplayFactoryMac();
+
+    virtual wxDisplayImpl *CreateDisplay(size_t n);
+    virtual size_t GetCount();
+    virtual int GetFromPoint(const wxPoint& pt);
+
+protected:
+    DECLARE_NO_COPY_CLASS(wxDisplayFactoryMac)
 };
 
-size_t wxDisplayBase::GetCount()
+// ============================================================================
+// wxDisplayFactoryMac implementation
+// ============================================================================
+
+size_t wxDisplayFactoryMac::GetCount()
 {
-    GDHandle hndl;
     size_t num = 0;
-    hndl = DMGetFirstScreenDevice(true);
+    GDHandle hndl = DMGetFirstScreenDevice(true);
     while(hndl)
     {
         num++;
@@ -61,11 +102,10 @@ size_t wxDisplayBase::GetCount()
     return num;
 }
 
-int wxDisplayBase::GetFromPoint(const wxPoint &p)
+int wxDisplayFactoryMac::GetFromPoint(const wxPoint &p)
 {
-    GDHandle hndl;
     size_t num = 0;
-    hndl = DMGetFirstScreenDevice(true);
+    GDHandle hndl = DMGetFirstScreenDevice(true);
     while(hndl)
     {
         Rect screenrect = (*hndl)->gdRect;
@@ -79,154 +119,136 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
         num++;
         hndl = DMGetNextScreenDevice(hndl, true);
     }
-    return -1;
+
+    return wxNOT_FOUND;
 }
 
-wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ),
-    m_priv ( new wxDisplayMacPriv() )
+wxDisplayImpl *wxDisplayFactoryMac::CreateDisplay(size_t n)
 {
-    GDHandle hndl;
-    hndl = DMGetFirstScreenDevice(true);
-    m_priv->m_hndl = NULL;
+    size_t nOrig = n;
+
+    GDHandle hndl = DMGetFirstScreenDevice(true);
     while(hndl)
     {
-        if (index == 0)
+        if (n == 0)
         {
-            m_priv->m_hndl = hndl;
+            return new wxDisplayImplMac(nOrig, hndl);
         }
-        index--;
+        n--;
         hndl = DMGetNextScreenDevice(hndl, true);
     }
-}
 
-wxRect wxDisplay::GetGeometry() const
-{
-    if (!(m_priv)) return wxRect(0, 0, 0, 0);
-    if (!(m_priv->m_hndl)) return wxRect(0, 0, 0, 0);
-    Rect screenrect = (*(m_priv->m_hndl))->gdRect;
-    return wxRect( screenrect.left, screenrect.top, 
-                   screenrect.right - screenrect.left, screenrect.bottom - screenrect.top);
+    return NULL;
 }
 
-int wxDisplay::GetDepth() const
-{
-    if (!(m_priv)) return 0;
-    if (!(m_priv->m_hndl)) return 0;
-
-    // This cryptic looking code is based on Apple's sample code:
-    // http://developer.apple.com/samplecode/Sample_Code/Graphics_2D/GDevVideo/Gen.cp.htm
+// ============================================================================
+// wxDisplayImplMac implementation
+// ============================================================================
 
-    //RN - according to the docs
-	//gdPMap is a bitmap-type representation of the GDevice, and all
-	//0x0000FFFF does is get the lower 16 bits of pixelSize.  However,
-	//since pixelSize is only 16 bits (a short)...
-    return ((*(*(m_priv->m_hndl))->gdPMap)->pixelSize) & 0x0000FFFF;
-}
-
-wxString wxDisplay::GetName() const
+wxRect wxDisplayImplMac::GetGeometry() const
 {
-    // Macs don't name their displays...
-    return wxEmptyString;
+    Rect screenrect = (*m_hndl)->gdRect;
+    return wxRect(screenrect.left, screenrect.top,
+                  screenrect.right - screenrect.left,
+                  screenrect.bottom - screenrect.top);
 }
 
 struct DMModeIteratorRec
 {
-	wxArrayVideoModes* pModes;
-	const wxVideoMode* pMatchMode;
+    wxArrayVideoModes* pModes;
+    const wxVideoMode* pMatchMode;
 };
 
-pascal void DMModeListIteratorProc (	void* pData,
-			      DMListIndexType nIndex,
-			      DMDisplayModeListEntryPtr pInfo)
+pascal void DMModeListIteratorProc (    void* pData,
+                  DMListIndexType nIndex,
+                  DMDisplayModeListEntryPtr pInfo)
 {
     DMModeIteratorRec* pInfoData = (DMModeIteratorRec*) pData;
 
-	//Note that in testing the refresh rate is always 0 on my ibook - RN
+    //Note that in testing the refresh rate is always 0 on my ibook - RN
     int refresh = (int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate);
 
-	for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
-	{
+    for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
+    {
 #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
 
-		if (wxVideoMode((int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
-				  (int) pInfo->displayModeResolutionInfo->csVerticalLines,
-				  (int) pDBI->vpPixelSize,
-				  refresh).Matches(*pInfoData->pMatchMode) )
-			{
-			pInfoData->pModes->Add(wxVideoMode((int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
-						   (int) pInfo->displayModeResolutionInfo->csVerticalLines,
-						   (int) pDBI->vpPixelSize,
-						   refresh));			
-			}
+        if (wxVideoMode((int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
+                  (int) pInfo->displayModeResolutionInfo->csVerticalLines,
+                  (int) pDBI->vpPixelSize,
+                  refresh).Matches(*pInfoData->pMatchMode) )
+            {
+            pInfoData->pModes->Add(wxVideoMode((int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
+                           (int) pInfo->displayModeResolutionInfo->csVerticalLines,
+                           (int) pDBI->vpPixelSize,
+                           refresh));
+            }
 #undef pDBI
-	}
+    }
 }
 
 struct DMModeInfoRec
 {
-	const wxVideoMode* pMode;
-	VDSwitchInfoRec sMode;
-	bool bMatched;
+    const wxVideoMode* pMode;
+    VDSwitchInfoRec sMode;
+    bool bMatched;
 };
 
-pascal void DMModeInfoProc (	void* pData,
-							  DMListIndexType nIndex,
-							  DMDisplayModeListEntryPtr pInfo)
+pascal void DMModeInfoProc (    void* pData,
+                              DMListIndexType nIndex,
+                              DMDisplayModeListEntryPtr pInfo)
 {
-	DMModeInfoRec* pInfoData = (DMModeInfoRec*) pData;
-	Fixed refresh = Long2Fix(pInfoData->pMode->refresh);
+    DMModeInfoRec* pInfoData = (DMModeInfoRec*) pData;
+    Fixed refresh = Long2Fix(pInfoData->pMode->refresh);
 
-	for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
-		{
+    for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
+        {
 #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
-		    if (pInfoData->pMode->w == (int&) pInfo->displayModeResolutionInfo->csHorizontalPixels &&
-		        pInfoData->pMode->h == (int&) pInfo->displayModeResolutionInfo->csVerticalLines &&
-		        pInfoData->pMode->bpp == (int) pDBI->vpPixelSize &&
-		        refresh == pInfo->displayModeResolutionInfo->csRefreshRate)
-			{
-				memcpy(&pInfoData->sMode, pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo,
-		                       sizeof(VDSwitchInfoRec));
-				pInfoData->sMode.csMode = pDBI->vpPixelSize;
-				pInfoData->bMatched = true;
-				break;
-			}
+            if (pInfoData->pMode->w == (int&) pInfo->displayModeResolutionInfo->csHorizontalPixels &&
+                pInfoData->pMode->h == (int&) pInfo->displayModeResolutionInfo->csVerticalLines &&
+                pInfoData->pMode->bpp == (int) pDBI->vpPixelSize &&
+                refresh == pInfo->displayModeResolutionInfo->csRefreshRate)
+            {
+                memcpy(&pInfoData->sMode, pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo,
+                               sizeof(VDSwitchInfoRec));
+                pInfoData->sMode.csMode = pDBI->vpPixelSize;
+                pInfoData->bMatched = true;
+                break;
+            }
 #undef pDBI
-		}		
+        }
 }
 
 struct DMModeTransRec
 {
-	wxVideoMode Mode;
-	const VDSwitchInfoRec* psMode;
-	bool bMatched;
+    wxVideoMode Mode;
+    const VDSwitchInfoRec* psMode;
+    bool bMatched;
 };
 
-pascal void DMModeTransProc (	void* pData,
-					  DMListIndexType nIndex,
-					  DMDisplayModeListEntryPtr pInfo)
+pascal void DMModeTransProc (    void* pData,
+                      DMListIndexType nIndex,
+                      DMDisplayModeListEntryPtr pInfo)
 {
-	DMModeTransRec* pInfoData = (DMModeTransRec*) pData;
+    DMModeTransRec* pInfoData = (DMModeTransRec*) pData;
 
-	for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
-		{
+    for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
+        {
 #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
-		if (pInfoData->psMode->csData == pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo->csData)
-			{
-			pInfoData->Mode = wxVideoMode((int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
-								 (int) pInfo->displayModeResolutionInfo->csVerticalLines,
-								 (int) pDBI->vpPixelSize,
-								 (int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate) );
-			pInfoData->bMatched = true;
-			break;
-			}
+        if (pInfoData->psMode->csData == pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo->csData)
+            {
+            pInfoData->Mode = wxVideoMode((int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
+                                 (int) pInfo->displayModeResolutionInfo->csVerticalLines,
+                                 (int) pDBI->vpPixelSize,
+                                 (int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate) );
+            pInfoData->bMatched = true;
+            break;
+            }
 #undef pDBI
-		}
+        }
 }
 
-wxArrayVideoModes
-    wxDisplay::GetModes(const wxVideoMode& mode) const
+wxArrayVideoModes wxDisplayImplMac::GetModes(const wxVideoMode& mode) const
 {
-
     wxArrayVideoModes Modes;
 
     unsigned long dwDMVer;
@@ -236,207 +258,207 @@ wxArrayVideoModes
     if (dwDMVer >= 0x020000) //version 2?
     {
 
-    	DMListIndexType nNumModes;
-    	DMListType pModes;
-    	DMDisplayModeListIteratorUPP uppMLI;
-    	DisplayIDType nDisplayID;
-
-    	wxASSERT(DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false) == noErr);	
-    	//Create a new list...
-    	wxASSERT_MSG(DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, 							&pModes) == noErr, wxT("Could not create a new display mode list") );
-
-    	uppMLI = NewDMDisplayModeListIteratorUPP(DMModeListIteratorProc);
-    	wxASSERT(uppMLI);
-
-    	DMModeIteratorRec sModeInfo;
-    	sModeInfo.pModes = &Modes;
-    	sModeInfo.pMatchMode = &mode;
-    	for (DMListIndexType i = 0; i < nNumModes; ++i)
-    	{
-    	    wxASSERT(DMGetIndexedDisplayModeFromList(pModes, i, NULL,
-    					      uppMLI, &sModeInfo) == noErr);
-    	}
-    	DisposeDMDisplayModeListIteratorUPP(uppMLI);
-    	wxASSERT(DMDisposeList(pModes) == noErr);	
+        DMListIndexType nNumModes;
+        DMListType pModes;
+        DMDisplayModeListIteratorUPP uppMLI;
+        DisplayIDType nDisplayID;
+
+        wxASSERT(DMGetDisplayIDByGDevice(m_hndl, &nDisplayID, false) == noErr);
+        //Create a new list...
+        wxASSERT_MSG(DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes,                             &pModes) == noErr, wxT("Could not create a new display mode list") );
+
+        uppMLI = NewDMDisplayModeListIteratorUPP(DMModeListIteratorProc);
+        wxASSERT(uppMLI);
+
+        DMModeIteratorRec sModeInfo;
+        sModeInfo.pModes = &Modes;
+        sModeInfo.pMatchMode = &mode;
+        for (DMListIndexType i = 0; i < nNumModes; ++i)
+        {
+            wxASSERT(DMGetIndexedDisplayModeFromList(pModes, i, NULL,
+                              uppMLI, &sModeInfo) == noErr);
+        }
+        DisposeDMDisplayModeListIteratorUPP(uppMLI);
+        wxASSERT(DMDisposeList(pModes) == noErr);
     }
     else //DM 1.0, 1.2, 1.x
     {
-    	wxLogSysError(wxString::Format(wxT("Display Manager Version %u Not Supported!  Present? %s"),
-    				(unsigned int) dwDMVer / 0x10000,
-    				(dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No"))  )
-    	             );
+        wxLogSysError(wxString::Format(wxT("Display Manager Version %u Not Supported!  Present? %s"),
+                    (unsigned int) dwDMVer / 0x10000,
+                    (dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No"))  )
+                     );
     }
 
     return Modes;
 }
 
-wxVideoMode wxDisplay::GetCurrentMode() const
+wxVideoMode wxDisplayImplMac::GetCurrentMode() const
 {
     unsigned long dwDMVer;
     wxVideoMode RetMode;
-    
-    Gestalt(gestaltDisplayMgrVers, (long*) &dwDMVer);    
+
+    Gestalt(gestaltDisplayMgrVers, (long*) &dwDMVer);
     //Check DM version (for backward compatibility only - 7.5.3+ use 2.0)
     if (dwDMVer >= 0x020000) //version 2?
     {
-    	VDSwitchInfoRec sMode; //Note - csMode member also contains the bit depth
-    	if (DMGetDisplayMode(m_priv->m_hndl, &sMode) == noErr) 
-    	{
-    	    DMListIndexType nNumModes;
-    	    DMListType pModes;
-    		DMDisplayModeListIteratorUPP uppMLI;
-    	    DisplayIDType nDisplayID;
-
-    	    wxASSERT(DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false) == noErr);
-    	    //Create a new list...
-    	    wxASSERT_MSG(DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes) == noErr,
-    				  wxT("Could not create a new display mode list") );
-    		
-    		uppMLI = NewDMDisplayModeListIteratorUPP(DMModeTransProc);
-    		wxASSERT(uppMLI);
-
-    		DMModeTransRec sModeInfo;
-    		sModeInfo.bMatched = false;
-    		sModeInfo.psMode = &sMode;
-    		for (DMListIndexType i = 0; i < nNumModes; ++i)
-    		{
-    			wxASSERT(DMGetIndexedDisplayModeFromList(pModes, i, NULL,
-    											uppMLI, &sModeInfo) == noErr);
-
-    			if ( sModeInfo.bMatched == true )
-    			{
-    				RetMode = sModeInfo.Mode;
-    				break;
-    			}
-    		}
-
-    	    DisposeDMDisplayModeListIteratorUPP(uppMLI);
-    	    wxASSERT(DMDisposeList(pModes) == noErr);
-    	}
-    	else //Can't get current mode?
-    	{
-    		wxLogSysError(wxString::Format(wxT("Couldn't obtain current display mode!!!\ndwDMVer:%u"),
-    								(unsigned int) dwDMVer));
-    	}
+        VDSwitchInfoRec sMode; //Note - csMode member also contains the bit depth
+        if (DMGetDisplayMode(m_hndl, &sMode) == noErr)
+        {
+            DMListIndexType nNumModes;
+            DMListType pModes;
+            DMDisplayModeListIteratorUPP uppMLI;
+            DisplayIDType nDisplayID;
+
+            wxASSERT(DMGetDisplayIDByGDevice(m_hndl, &nDisplayID, false) == noErr);
+            //Create a new list...
+            wxASSERT_MSG(DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes) == noErr,
+                      wxT("Could not create a new display mode list") );
+
+            uppMLI = NewDMDisplayModeListIteratorUPP(DMModeTransProc);
+            wxASSERT(uppMLI);
+
+            DMModeTransRec sModeInfo;
+            sModeInfo.bMatched = false;
+            sModeInfo.psMode = &sMode;
+            for (DMListIndexType i = 0; i < nNumModes; ++i)
+            {
+                wxASSERT(DMGetIndexedDisplayModeFromList(pModes, i, NULL,
+                                                uppMLI, &sModeInfo) == noErr);
+
+                if ( sModeInfo.bMatched == true )
+                {
+                    RetMode = sModeInfo.Mode;
+                    break;
+                }
+            }
+
+            DisposeDMDisplayModeListIteratorUPP(uppMLI);
+            wxASSERT(DMDisposeList(pModes) == noErr);
+        }
+        else //Can't get current mode?
+        {
+            wxLogSysError(wxString::Format(wxT("Couldn't obtain current display mode!!!\ndwDMVer:%u"),
+                                    (unsigned int) dwDMVer));
+        }
     }
     else //DM ver 1
     {
-    	wxLogSysError(wxString::Format(wxT("Display Manager Version %u Not Supported!  Present? %s"),
-    				(unsigned int) dwDMVer / 0x10000,
-    				(dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No")) )
-    	             );
+        wxLogSysError(wxString::Format(wxT("Display Manager Version %u Not Supported!  Present? %s"),
+                    (unsigned int) dwDMVer / 0x10000,
+                    (dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No")) )
+                     );
     }
-	 
+
     return RetMode;
 }
 
-bool wxDisplay::ChangeMode(const wxVideoMode& mode)
+bool wxDisplayImplMac::ChangeMode(const wxVideoMode& mode)
 {
     unsigned long dwDMVer;
     Gestalt(gestaltDisplayMgrVers, (long*)&dwDMVer);
     if (GetCount() == 1 || dwDMVer >= 0x020000)
     {
-		if (mode == wxDefaultVideoMode)
-		{
+        if (mode == wxDefaultVideoMode)
+        {
 //#ifndef __DARWIN__
-//			Handle hDisplayState;
-//			if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
-//				{
-//				wxLogSysError(wxT("Could not lock display for display mode changing!"));
-//				return false;
-//				}
-//			wxASSERT( DMUseScreenPrefs(true, hDisplayState) == noErr);
-//			DMEndConfigureDisplays(hDisplayState);
-//			return true;
+//            Handle hDisplayState;
+//            if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
+//                {
+//                wxLogSysError(wxT("Could not lock display for display mode changing!"));
+//                return false;
+//                }
+//            wxASSERT( DMUseScreenPrefs(true, hDisplayState) == noErr);
+//            DMEndConfigureDisplays(hDisplayState);
+//            return true;
 //#else
-			//hmmmmm....
-			return true;
+            //hmmmmm....
+            return true;
 //#endif
-		}
-		
-    	//0 & NULL for params 2 & 3 of DMSetVideoMode signal it to use defaults (current mode)
-    	//DM 2.0+ doesn't use params 2 & 3 of DMSetDisplayMode
-    	//so we have to use this icky structure
-    	VDSwitchInfoRec sMode;
-    	memset(&sMode, 0, sizeof(VDSwitchInfoRec) );
-
-    	DMListIndexType nNumModes;
-    	DMListType pModes;
-    	DMDisplayModeListIteratorUPP uppMLI;
-    	DisplayIDType nDisplayID;
-
-    	wxASSERT(DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false) == noErr);
-    	//Create a new list...
-    	wxASSERT_MSG(DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes) == noErr,
-    			  wxT("Could not create a new display mode list") );
-
-    	uppMLI = NewDMDisplayModeListIteratorUPP(DMModeInfoProc);
-    	wxASSERT(uppMLI);
-
-    	DMModeInfoRec sModeInfo;
-    	sModeInfo.bMatched = false;
-    	sModeInfo.pMode = &mode;
-    	unsigned int i;
-    	for(i = 0; i < nNumModes; ++i)
-    	{
-    		wxASSERT(DMGetIndexedDisplayModeFromList(pModes, i, NULL,
-    										   uppMLI, &sModeInfo) == noErr);
-    		if (sModeInfo.bMatched == true)
-    		{
-    			sMode = sModeInfo.sMode;
-    			break;
-    		}
-    	}
-    	if(i == nNumModes)
-    		return false;
-
-    	DisposeDMDisplayModeListIteratorUPP(uppMLI);
-    	wxASSERT(DMDisposeList(pModes) == noErr);
-
-    	// For the really paranoid -
-    	// 	    unsigned long flags;
-    	//      Boolean bok;
-    	//     wxASSERT(noErr == DMCheckDisplayMode(m_priv->m_hndl, sMode.csData,
-    	//								  sMode.csMode, &flags, NULL, &bok));
-    	//     wxASSERT(bok);
-
-    	Handle hDisplayState;
-    	if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
-    	{
-    	    wxLogSysError(wxT("Could not lock display for display mode changing!"));
-    	    return false;
-    	}
-
-    	unsigned long dwBPP = (unsigned long) mode.bpp;
-    	if (DMSetDisplayMode(m_priv->m_hndl, sMode.csData,
-    					    (unsigned long*) &(dwBPP), NULL
-    					   //(unsigned long) &sMode
-    					   , hDisplayState
-    					   )  != noErr)
-    	{
-    		DMEndConfigureDisplays(hDisplayState);
-    		wxMessageBox(wxString::Format(wxT("Could not set the display mode")));
+        }
+
+        //0 & NULL for params 2 & 3 of DMSetVideoMode signal it to use defaults (current mode)
+        //DM 2.0+ doesn't use params 2 & 3 of DMSetDisplayMode
+        //so we have to use this icky structure
+        VDSwitchInfoRec sMode;
+        memset(&sMode, 0, sizeof(VDSwitchInfoRec) );
+
+        DMListIndexType nNumModes;
+        DMListType pModes;
+        DMDisplayModeListIteratorUPP uppMLI;
+        DisplayIDType nDisplayID;
+
+        wxASSERT(DMGetDisplayIDByGDevice(m_hndl, &nDisplayID, false) == noErr);
+        //Create a new list...
+        wxASSERT_MSG(DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes) == noErr,
+                  wxT("Could not create a new display mode list") );
+
+        uppMLI = NewDMDisplayModeListIteratorUPP(DMModeInfoProc);
+        wxASSERT(uppMLI);
+
+        DMModeInfoRec sModeInfo;
+        sModeInfo.bMatched = false;
+        sModeInfo.pMode = &mode;
+        unsigned int i;
+        for(i = 0; i < nNumModes; ++i)
+        {
+            wxASSERT(DMGetIndexedDisplayModeFromList(pModes, i, NULL,
+                                               uppMLI, &sModeInfo) == noErr);
+            if (sModeInfo.bMatched == true)
+            {
+                sMode = sModeInfo.sMode;
+                break;
+            }
+        }
+        if(i == nNumModes)
+            return false;
+
+        DisposeDMDisplayModeListIteratorUPP(uppMLI);
+        wxASSERT(DMDisposeList(pModes) == noErr);
+
+        // For the really paranoid -
+        //         unsigned long flags;
+        //      Boolean bok;
+        //     wxASSERT(noErr == DMCheckDisplayMode(m_hndl, sMode.csData,
+        //                                  sMode.csMode, &flags, NULL, &bok));
+        //     wxASSERT(bok);
+
+        Handle hDisplayState;
+        if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
+        {
+            wxLogSysError(wxT("Could not lock display for display mode changing!"));
+            return false;
+        }
+
+        unsigned long dwBPP = (unsigned long) mode.bpp;
+        if (DMSetDisplayMode(m_hndl, sMode.csData,
+                            (unsigned long*) &(dwBPP), NULL
+                           //(unsigned long) &sMode
+                           , hDisplayState
+                           )  != noErr)
+        {
+            DMEndConfigureDisplays(hDisplayState);
+            wxLogError(wxT("Could not set the display mode"));
             return false;
-    	}
-    	DMEndConfigureDisplays(hDisplayState);
+        }
+        DMEndConfigureDisplays(hDisplayState);
     }
     else  //DM 1.0, 1.2, 1.x
     {
-    	wxLogSysError(wxString::Format(wxT("Monitor gravitation not supported yet.  dwDMVer:%u"),
-    				(unsigned int) dwDMVer));
-    		return false;
+        wxLogSysError(wxString::Format(wxT("Monitor gravitation not supported yet.  dwDMVer:%u"),
+                    (unsigned int) dwDMVer));
+            return false;
     }
-    
+
     return true;
 }
 
-wxDisplay::~wxDisplay()
+// ============================================================================
+// wxDisplay::CreateFactory()
+// ============================================================================
+
+/* static */ wxDisplayFactory *wxDisplay::CreateFactory()
 {
-    if ( m_priv )
-    {
-        delete m_priv;
-        m_priv = 0;
-    }
+    return new wxDisplayFactoryMac;
 }
 
 #endif // wxUSE_DISPLAY