cleanup - reformatting

[wxWidgets.git] / src / mac / carbon / display.cpp

diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
index 7dc8cf8c9a7005b4955cd99df2935b4a73709c0b..9619dfcc2fa5ecf9c63daabf01e821aad59c4dc9 100644 (file)
--- a/src/mac/carbon/display.cpp
+++ b/src/mac/carbon/display.cpp
@@ -9,11 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "display.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -34,7 +29,7 @@
     #include <Gestalt.h>
     #include <Displays.h>
     #include <Quickdraw.h>
     #include <Gestalt.h>
     #include <Displays.h>
     #include <Quickdraw.h>

-    #include <Video.h>  //for VDSwitchInfoRec
+    #include <Video.h>  // for VDSwitchInfoRec

     #include <FixMath.h>
 #endif
 
     #include <FixMath.h>
 #endif
 


@@ -57,12 +52,10 @@ public:
 size_t wxDisplayBase::GetCount()
 {
     CGDisplayCount count;
 size_t wxDisplayBase::GetCount()
 {
     CGDisplayCount count;

-#ifdef __WXDEBUG__
-    CGDisplayErr err =
-#endif
-    CGGetActiveDisplayList(0, NULL, &count);
+    CGDisplayErr err = CGGetActiveDisplayList(0, NULL, &count);

 
     wxASSERT(err == CGDisplayNoErr);
 
     wxASSERT(err == CGDisplayNoErr);

+

     return count;
 }
 
     return count;
 }
 


@@ -73,6 +66,7 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
     CGDisplayCount theCount;
     CGDisplayErr err = CGGetDisplaysWithPoint(thePoint, 1, &theID, &theCount);
     wxASSERT(err == CGDisplayNoErr);
     CGDisplayCount theCount;
     CGDisplayErr err = CGGetDisplaysWithPoint(thePoint, 1, &theID, &theCount);
     wxASSERT(err == CGDisplayNoErr);

+

     int nWhich = -1;
 
     if (theCount)
     int nWhich = -1;
 
     if (theCount)


@@ -82,15 +76,15 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
         err = CGGetActiveDisplayList(theCount, theIDs, &theCount);
         wxASSERT(err == CGDisplayNoErr);
 
         err = CGGetActiveDisplayList(theCount, theIDs, &theCount);
         wxASSERT(err == CGDisplayNoErr);
 

-        for(nWhich = 0; nWhich < (int) theCount; ++nWhich)
+        for (nWhich = 0; nWhich < (int) theCount; ++nWhich)

         {
         {

-            if(theIDs[nWhich] == theID)
+            if (theIDs[nWhich] == theID)

                 break;
         }
 
                 break;
         }
 

-        delete[] theIDs;
+        delete [] theIDs;

 
 

-        if(nWhich == (int) theCount)
+        if (nWhich == (int) theCount)

         {
             wxFAIL_MSG(wxT("Failed to find display in display list"));
             nWhich = -1;
         {
             wxFAIL_MSG(wxT("Failed to find display in display list"));
             nWhich = -1;


@@ -98,24 +92,23 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
     }
 
     return nWhich;
     }
 
     return nWhich;

-}//CFUserNotification[NSBundle bundleForClass:[self class]]
+}

 
 

-wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ) ,
-    m_priv ( new wxDisplayMacPriv() )
+wxDisplay::wxDisplay(size_t index)
+    : wxDisplayBase( index ) ,
+    m_priv( new wxDisplayMacPriv() )

 {
     CGDisplayCount theCount = GetCount();
     CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];
 {
     CGDisplayCount theCount = GetCount();
     CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];

-#ifdef __WXDEBUG__
-    CGDisplayErr err =
-#endif
-    CGGetActiveDisplayList(theCount, theIDs, &theCount);

 
 

-    wxASSERT(err == CGDisplayNoErr);
-    wxASSERT(index < theCount);
+    CGDisplayErr err = CGGetActiveDisplayList(theCount, theIDs, &theCount);
+
+    wxASSERT( err == CGDisplayNoErr );
+    wxASSERT( index < theCount );

 
     m_priv->m_id = theIDs[index];
 
 
     m_priv->m_id = theIDs[index];
 

-    delete[] theIDs;
+    delete [] theIDs;

 }
 
 wxRect wxDisplay::GetGeometry() const
 }
 
 wxRect wxDisplay::GetGeometry() const


@@ -124,12 +117,12 @@ wxRect wxDisplay::GetGeometry() const
     return wxRect( (int)theRect.origin.x,
                    (int)theRect.origin.y,
                    (int)theRect.size.width,
     return wxRect( (int)theRect.origin.x,
                    (int)theRect.origin.y,
                    (int)theRect.size.width,

-                   (int)theRect.size.height  ); //floats
+                   (int)theRect.size.height ); //floats

 }
 
 int wxDisplay::GetDepth() const
 {
 }
 
 int wxDisplay::GetDepth() const
 {

-    return (int) CGDisplayBitsPerPixel(m_priv->m_id); //size_t
+    return (int) CGDisplayBitsPerPixel( m_priv->m_id ); //size_t

 }
 
 wxString wxDisplay::GetName() const
 }
 
 wxString wxDisplay::GetName() const


@@ -140,67 +133,70 @@ wxString wxDisplay::GetName() const
 
 static int wxCFDictKeyToInt( CFDictionaryRef desc, CFStringRef key )
 {
 
 static int wxCFDictKeyToInt( CFDictionaryRef desc, CFStringRef key )
 {

-    CFNumberRef value;
+    CFNumberRef value = (CFNumberRef) CFDictionaryGetValue( desc, key );
+    if (value == NULL)
+        return 0;
+

     int num = 0;
     int num = 0;

+    CFNumberGetValue( value, kCFNumberIntType, &num );

 
 

-    if ( (value = (CFNumberRef) CFDictionaryGetValue(desc, key)) == NULL )
-        return 0;
-    CFNumberGetValue(value, kCFNumberIntType, &num);

     return num;
 }
 
 wxArrayVideoModes
     wxDisplay::GetModes(const wxVideoMode& mode) const
 {
     return num;
 }
 
 wxArrayVideoModes
     wxDisplay::GetModes(const wxVideoMode& mode) const
 {

-    wxArrayVideoModes Modes;
+    wxArrayVideoModes resultModes;

 
 

-    CFArrayRef theArray = CGDisplayAvailableModes(m_priv->m_id);
+    CFArrayRef theArray = CGDisplayAvailableModes( m_priv->m_id );

 
 

-    for(CFIndex i = 0; i < CFArrayGetCount(theArray); ++i)
+    for (CFIndex i = 0; i < CFArrayGetCount(theArray); ++i)

     {
     {

-        CFDictionaryRef theValue = (CFDictionaryRef) CFArrayGetValueAtIndex(theArray, i);
+        CFDictionaryRef theValue = (CFDictionaryRef) CFArrayGetValueAtIndex( theArray, i );

 
 

-        wxVideoMode theMode(wxCFDictKeyToInt(theValue, kCGDisplayWidth),
-                            wxCFDictKeyToInt(theValue, kCGDisplayHeight),
-                            wxCFDictKeyToInt(theValue, kCGDisplayBitsPerPixel),
-                            wxCFDictKeyToInt(theValue, kCGDisplayRefreshRate));
+        wxVideoMode theMode(
+            wxCFDictKeyToInt( theValue, kCGDisplayWidth ),
+            wxCFDictKeyToInt( theValue, kCGDisplayHeight ),
+            wxCFDictKeyToInt( theValue, kCGDisplayBitsPerPixel ),
+            wxCFDictKeyToInt( theValue, kCGDisplayRefreshRate ));

 
 

-        if (theMode.Matches(mode))
-            Modes.Add(theMode);
+        if (theMode.Matches( mode ))
+            resultModes.Add( theMode );

     }
 
     }
 

-    return Modes;
+    return resultModes;

 }
 
 wxVideoMode wxDisplay::GetCurrentMode() const
 {
 }
 
 wxVideoMode wxDisplay::GetCurrentMode() const
 {

-    CFDictionaryRef theValue = CGDisplayCurrentMode (m_priv->m_id);
+    CFDictionaryRef theValue = CGDisplayCurrentMode( m_priv->m_id );

 
 

-    return wxVideoMode(wxCFDictKeyToInt(theValue, kCGDisplayWidth),
-                            wxCFDictKeyToInt(theValue, kCGDisplayHeight),
-                            wxCFDictKeyToInt(theValue, kCGDisplayBitsPerPixel),
-                            wxCFDictKeyToInt(theValue, kCGDisplayRefreshRate));
+    return wxVideoMode(
+        wxCFDictKeyToInt( theValue, kCGDisplayWidth ),
+        wxCFDictKeyToInt( theValue, kCGDisplayHeight ),
+        wxCFDictKeyToInt( theValue, kCGDisplayBitsPerPixel ),
+        wxCFDictKeyToInt( theValue, kCGDisplayRefreshRate ));

 }
 
 }
 

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

 {
 {

-    //Changing to default mode (wxDefualtVideoMode) doesn't
-    //work because we don't have access to the system's 'scrn'
-    //resource which holds the user's mode which the system
-    //will return to after this app is done
+    // Changing to default mode (wxDefaultVideoMode) doesn't
+    // work because we don't have access to the system's 'scrn'
+    // resource which holds the user's mode which the system
+    // will return to after this app is done

     boolean_t bExactMatch;
     boolean_t bExactMatch;

-    CFDictionaryRef theCGMode = CGDisplayBestModeForParametersAndRefreshRate (
-                                        m_priv->m_id,
-                                        (size_t)mode.bpp,
-                                        (size_t)mode.w,
-                                        (size_t)mode.h,
-                                        (double)mode.refresh,
-                                        &bExactMatch);
+    CFDictionaryRef theCGMode = CGDisplayBestModeForParametersAndRefreshRate(
+        m_priv->m_id,
+        (size_t)mode.bpp,
+        (size_t)mode.w,
+        (size_t)mode.h,
+        (double)mode.refresh,
+        &bExactMatch );

 
     bool bOK = bExactMatch;
 
 
     bool bOK = bExactMatch;
 

-    if(bOK)
-        bOK = CGDisplaySwitchToMode(m_priv->m_id, theCGMode) == CGDisplayNoErr;
+    if (bOK)
+        bOK = CGDisplaySwitchToMode( m_priv->m_id, theCGMode ) == CGDisplayNoErr;

 
     return bOK;
 }
 
     return bOK;
 }


@@ -227,11 +223,12 @@ size_t wxDisplayBase::GetCount()
     GDHandle hndl;
     size_t num = 0;
     hndl = DMGetFirstScreenDevice(true);
     GDHandle hndl;
     size_t num = 0;
     hndl = DMGetFirstScreenDevice(true);

-    while(hndl)
+    while (hndl)

     {
         num++;
         hndl = DMGetNextScreenDevice(hndl, true);
     }
     {
         num++;
         hndl = DMGetNextScreenDevice(hndl, true);
     }

+

     return num;
 }
 
     return num;
 }
 


@@ -240,7 +237,8 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
     GDHandle hndl;
     size_t num = 0;
     hndl = DMGetFirstScreenDevice(true);
     GDHandle hndl;
     size_t num = 0;
     hndl = DMGetFirstScreenDevice(true);

-    while(hndl)
+
+    while (hndl)

     {
         Rect screenrect = (*hndl)->gdRect;
         if (p.x >= screenrect.left &&
     {
         Rect screenrect = (*hndl)->gdRect;
         if (p.x >= screenrect.left &&


@@ -250,24 +248,27 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
         {
             return num;
         }
         {
             return num;
         }

+

         num++;
         hndl = DMGetNextScreenDevice(hndl, true);
     }
         num++;
         hndl = DMGetNextScreenDevice(hndl, true);
     }

+

     return -1;
 }
 
     return -1;
 }
 

-wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ),
-    m_priv ( new wxDisplayMacPriv() )
+wxDisplay::wxDisplay( size_t index )
+    : wxDisplayBase( index ),
+    m_priv( new wxDisplayMacPriv() )

 {
     GDHandle hndl;
     hndl = DMGetFirstScreenDevice(true);
     m_priv->m_hndl = NULL;
 {
     GDHandle hndl;
     hndl = DMGetFirstScreenDevice(true);
     m_priv->m_hndl = NULL;

-    while(hndl)
+
+    while (hndl)

     {
         if (index == 0)
     {
         if (index == 0)

-        {

             m_priv->m_hndl = hndl;
             m_priv->m_hndl = hndl;

-        }
+

         index--;
         hndl = DMGetNextScreenDevice(hndl, true);
     }
         index--;
         hndl = DMGetNextScreenDevice(hndl, true);
     }


@@ -275,25 +276,28 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ),
 
 wxRect wxDisplay::GetGeometry() const
 {
 
 wxRect wxDisplay::GetGeometry() const
 {

-    if (!(m_priv)) return wxRect(0, 0, 0, 0);
-    if (!(m_priv->m_hndl)) return wxRect(0, 0, 0, 0);
+    if ((m_priv == NULL) || (m_priv->m_hndl == NULL))
+        return wxRect(0, 0, 0, 0);
+

     Rect screenrect = (*(m_priv->m_hndl))->gdRect;
     Rect screenrect = (*(m_priv->m_hndl))->gdRect;

-    return wxRect( screenrect.left, screenrect.top,
-                   screenrect.right - screenrect.left, screenrect.bottom - screenrect.top);
+    return wxRect(
+        screenrect.left, screenrect.top,
+        screenrect.right - screenrect.left,
+        screenrect.bottom - screenrect.top );

 }
 
 int wxDisplay::GetDepth() const
 {
 }
 
 int wxDisplay::GetDepth() const
 {

-    if (!(m_priv)) return 0;
-    if (!(m_priv->m_hndl)) return 0;
+    if ((m_priv == NULL) || (m_priv->m_hndl == NULL))
+        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
 
 
     // This cryptic looking code is based on Apple's sample code:
     // http://developer.apple.com/samplecode/Sample_Code/Graphics_2D/GDevVideo/Gen.cp.htm
 

-    //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)...
+    // 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;
 }
 
     return ((*(*(m_priv->m_hndl))->gdPMap)->pixelSize) & 0x0000FFFF;
 }
 


@@ -309,31 +313,35 @@ struct DMModeIteratorRec
     const wxVideoMode* pMatchMode;
 };
 
     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;
 
 {
     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);
 
     int refresh = (int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate);
 

-    for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
-    {

 #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
 
 #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
 

-        if (wxVideoMode((int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
+    for (unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
+    {
+        if (wxVideoMode( (int) pInfo->displayModeResolutionInfo->csHorizontalPixels,

                         (int) pInfo->displayModeResolutionInfo->csVerticalLines,
                         (int) pDBI->vpPixelSize,
                         refresh).Matches(*pInfoData->pMatchMode) )
         {
                         (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));
+            pInfoData->pModes->Add(
+                wxVideoMode(
+                    (int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
+                    (int) pInfo->displayModeResolutionInfo->csVerticalLines,
+                    (int) pDBI->vpPixelSize,
+                    refresh ) );

         }
         }

-#undef pDBI

     }
     }

+
+#undef pDBI

 }
 
 struct DMModeInfoRec
 }
 
 struct DMModeInfoRec


@@ -343,29 +351,34 @@ struct DMModeInfoRec
     bool bMatched;
 };
 
     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)
-    {

 #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
 #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock

+
+    for (unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
+    {

         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)
         {
         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));
+            memcpy(
+                &pInfoData->sMode,
+                pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo,
+                sizeof(VDSwitchInfoRec));

             pInfoData->sMode.csMode = pDBI->vpPixelSize;
             pInfoData->bMatched = true;
             break;
         }
             pInfoData->sMode.csMode = pDBI->vpPixelSize;
             pInfoData->bMatched = true;
             break;
         }

-#undef pDBI

     }
     }

+
+#undef pDBI

 }
 
 struct DMModeTransRec
 }
 
 struct DMModeTransRec


@@ -375,41 +388,43 @@ struct DMModeTransRec
     bool bMatched;
 };
 
     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)
-    {

 #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
 #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock

+
+    for (unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
+    {

         if (pInfoData->psMode->csData == pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo->csData)
         {
         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->Mode = wxVideoMode(
+                (int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
+                (int) pInfo->displayModeResolutionInfo->csVerticalLines,
+                (int) pDBI->vpPixelSize,
+                (int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate) );

             pInfoData->bMatched = true;
             break;
         }
             pInfoData->bMatched = true;
             break;
         }

-#undef pDBI

     }
     }

+
+#undef pDBI

 }
 
 wxArrayVideoModes
     wxDisplay::GetModes(const wxVideoMode& mode) const
 {
 }
 
 wxArrayVideoModes
     wxDisplay::GetModes(const wxVideoMode& mode) const
 {

-

     wxArrayVideoModes Modes;
     wxArrayVideoModes Modes;

-

     unsigned long dwDMVer;
     unsigned long dwDMVer;

-    Gestalt(gestaltDisplayMgrVers, (long*) &dwDMVer);

 
 

-    //Check DM version (for backward compatibility only - 7.5.3+ use 2.0)
-    if (dwDMVer >= 0x020000) //version 2?
+    // Check DM version == 2
+    // (for backward compatibility only - 7.5.3+ use 2.0)
+    Gestalt( gestaltDisplayMgrVers, (long*) &dwDMVer );
+    if (dwDMVer >= 0x020000)

     {
     {

-

         DMListIndexType nNumModes;
         DMListType pModes;
         DMDisplayModeListIteratorUPP uppMLI;
         DMListIndexType nNumModes;
         DMListType pModes;
         DMDisplayModeListIteratorUPP uppMLI;


@@ -417,34 +432,36 @@ wxArrayVideoModes
         OSErr err;
 
         err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);
         OSErr err;
 
         err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);

-        wxASSERT(err == noErr);
+        verify_noerr( err );

 
 

-        //Create a new list...
+        // Create a new list...

         err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);
         err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);

-        wxASSERT_MSG(err == noErr, wxT("Could not create a new display mode list") );
+        wxASSERT_MSG( err == noErr, wxT("Could not create a new display mode list") );

 
         uppMLI = NewDMDisplayModeListIteratorUPP(DMModeListIteratorProc);
 
         uppMLI = NewDMDisplayModeListIteratorUPP(DMModeListIteratorProc);

-        wxASSERT(uppMLI);
+        wxASSERT( uppMLI );

 
         DMModeIteratorRec sModeInfo;
         sModeInfo.pModes = &Modes;
         sModeInfo.pMatchMode = &mode;
 
         DMModeIteratorRec sModeInfo;
         sModeInfo.pModes = &Modes;
         sModeInfo.pMatchMode = &mode;

+

         for (DMListIndexType i = 0; i < nNumModes; ++i)
         {
             err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);
         for (DMListIndexType i = 0; i < nNumModes; ++i)
         {
             err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);

-            wxASSERT(err == noErr);
+            verify_noerr( err );

         }
         }

-        DisposeDMDisplayModeListIteratorUPP(uppMLI);

 
 

+        DisposeDMDisplayModeListIteratorUPP(uppMLI);

         err = DMDisposeList(pModes);
         err = DMDisposeList(pModes);

-        wxASSERT(err == noErr);
+        verify_noerr( err );

     }
     }

-    else //DM 1.0, 1.2, 1.x
+    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;
     }
 
     return Modes;


@@ -455,28 +472,31 @@ wxVideoMode wxDisplay::GetCurrentMode() const
     unsigned long dwDMVer;
     wxVideoMode RetMode;
 
     unsigned long dwDMVer;
     wxVideoMode RetMode;
 

-    Gestalt(gestaltDisplayMgrVers, (long*) &dwDMVer);
-    //Check DM version (for backward compatibility only - 7.5.3+ use 2.0)
-    if (dwDMVer >= 0x020000) //version 2?
+    // Check DM version == 2
+    // (for backward compatibility only - 7.5.3+ use 2.0)
+    Gestalt( gestaltDisplayMgrVers, (long*) &dwDMVer );
+    if (dwDMVer >= 0x020000)

     {
     {

-        VDSwitchInfoRec sMode; //Note - csMode member also contains the bit depth
-        if (DMGetDisplayMode(m_priv->m_hndl, &sMode) == noErr)
+        VDSwitchInfoRec sMode; // Note: csMode member also contains the bit depth
+        OSErr err;
+
+        err = DMGetDisplayMode( m_priv->m_hndl, &sMode );
+        if (err == noErr)

         {
             DMListIndexType nNumModes;
             DMListType pModes;
             DMDisplayModeListIteratorUPP uppMLI;
             DisplayIDType nDisplayID;
         {
             DMListIndexType nNumModes;
             DMListType pModes;
             DMDisplayModeListIteratorUPP uppMLI;
             DisplayIDType nDisplayID;

-            OSErr err;

 
             err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);
 
             err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);

-            wxASSERT(err == noErr);
+            verify_noerr( err );

 
 

-            //Create a new list...
+            // Create a new list...

             err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);
             err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);

-            wxASSERT_MSG(err == noErr, wxT("Could not create a new display mode list") );
+            wxASSERT_MSG( err == noErr, wxT("Could not create a new display mode list") );

 
             uppMLI = NewDMDisplayModeListIteratorUPP(DMModeTransProc);
 
             uppMLI = NewDMDisplayModeListIteratorUPP(DMModeTransProc);

-            wxASSERT(uppMLI);
+            wxASSERT( uppMLI );

 
             DMModeTransRec sModeInfo;
             sModeInfo.bMatched = false;
 
             DMModeTransRec sModeInfo;
             sModeInfo.bMatched = false;


@@ -484,7 +504,7 @@ wxVideoMode wxDisplay::GetCurrentMode() const
             for (DMListIndexType i = 0; i < nNumModes; ++i)
             {
                 err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);
             for (DMListIndexType i = 0; i < nNumModes; ++i)
             {
                 err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);

-                wxASSERT(err == noErr);
+                verify_noerr( err );

 
                 if ( sModeInfo.bMatched )
                 {
 
                 if ( sModeInfo.bMatched )
                 {


@@ -494,22 +514,24 @@ wxVideoMode wxDisplay::GetCurrentMode() const
             }
 
             DisposeDMDisplayModeListIteratorUPP(uppMLI);
             }
 
             DisposeDMDisplayModeListIteratorUPP(uppMLI);

-

             err = DMDisposeList(pModes);
             err = DMDisposeList(pModes);

-            wxASSERT(err == noErr);
+            verify_noerr( err );

         }
         }

-        else //Can't get current mode?
+        else // Can't get current mode?

         {
         {

-            wxLogSysError(wxString::Format(wxT("Couldn't obtain current display mode!!!\ndwDMVer:%u"),
-                                           (unsigned int) dwDMVer));
+            wxLogSysError(
+                wxString::Format(
+                    wxT("Couldn't obtain current display mode!!!\ndwDMVer:%u"),
+                    (unsigned int) dwDMVer));

         }
     }
         }
     }

-    else //DM ver 1
+    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;
     }
 
     return RetMode;


@@ -518,11 +540,15 @@ wxVideoMode wxDisplay::GetCurrentMode() const
 bool wxDisplay::ChangeMode(const wxVideoMode& mode)
 {
     unsigned long dwDMVer;
 bool wxDisplay::ChangeMode(const wxVideoMode& mode)
 {
     unsigned long dwDMVer;

-    Gestalt(gestaltDisplayMgrVers, (long*)&dwDMVer);
+
+    Gestalt( gestaltDisplayMgrVers, (long*)&dwDMVer );

     if (GetCount() == 1 || dwDMVer >= 0x020000)
     {
         if (mode == wxDefaultVideoMode)
         {
     if (GetCount() == 1 || dwDMVer >= 0x020000)
     {
         if (mode == wxDefaultVideoMode)
         {

+             return true;
+
+#if 0

 //#ifndef __DARWIN__
 //            Handle hDisplayState;
 //            if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
 //#ifndef __DARWIN__
 //            Handle hDisplayState;
 //            if (DMBeginConfigureDisplays(&hDisplayState) != noErr)


@@ -530,20 +556,22 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
 //                wxLogSysError(wxT("Could not lock display for display mode changing!"));
 //                return false;
 //            }
 //                wxLogSysError(wxT("Could not lock display for display mode changing!"));
 //                return false;
 //            }

+//

 //            wxASSERT( DMUseScreenPrefs(true, hDisplayState) == noErr);
 //            DMEndConfigureDisplays(hDisplayState);
 //            return true;
 //#else
 //            wxASSERT( DMUseScreenPrefs(true, hDisplayState) == noErr);
 //            DMEndConfigureDisplays(hDisplayState);
 //            return true;
 //#else

-             //hmmmmm....
-             return true;
+             // hmmmmm....
+//           return true;

 //#endif
 //#endif

+#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;
         }
 
         //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) );
+        memset( &sMode, 0, sizeof(VDSwitchInfoRec) );

 
         DMListIndexType nNumModes;
         DMListType pModes;
 
         DMListIndexType nNumModes;
         DMListType pModes;


@@ -552,9 +580,9 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
         OSErr err;
 
         err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);
         OSErr err;
 
         err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);

-        wxASSERT(err == noErr);
+        verify_noerr( err );

 
 

-        //Create a new list...
+        // Create a new list...

         err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);
         wxASSERT_MSG(err == noErr, wxT("Could not create a new display mode list") );
 
         err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);
         wxASSERT_MSG(err == noErr, wxT("Could not create a new display mode list") );
 


@@ -565,10 +593,11 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
         sModeInfo.bMatched = false;
         sModeInfo.pMode = &mode;
         unsigned int i;
         sModeInfo.bMatched = false;
         sModeInfo.pMode = &mode;
         unsigned int i;

-        for(i = 0; i < nNumModes; ++i)
+
+        for (i = 0; i < nNumModes; ++i)

         {
             err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);
         {
             err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);

-            wxASSERT(err == noErr);
+            verify_noerr( err );

 
             if (sModeInfo.bMatched)
             {
 
             if (sModeInfo.bMatched)
             {


@@ -576,13 +605,14 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
                 break;
             }
         }
                 break;
             }
         }

-        if(i == nNumModes)
+
+        if (i == nNumModes)

             return false;
 
         DisposeDMDisplayModeListIteratorUPP(uppMLI);
 
         err = DMDisposeList(pModes);
             return false;
 
         DisposeDMDisplayModeListIteratorUPP(uppMLI);
 
         err = DMDisposeList(pModes);

-        wxASSERT(err == noErr);
+        verify_noerr( err );

 
         // For the really paranoid -
         //     unsigned long flags;
 
         // For the really paranoid -
         //     unsigned long flags;


@@ -595,26 +625,34 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
         if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
         {
             wxLogSysError(wxT("Could not lock display for display mode changing!"));
         if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
         {
             wxLogSysError(wxT("Could not lock display for display mode changing!"));

+

             return false;
         }
 
         unsigned long dwBPP = (unsigned long) mode.bpp;
             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)
+        err = DMSetDisplayMode(
+            m_priv->m_hndl, sMode.csData,
+            (unsigned long*) &(dwBPP),
+            NULL, //(unsigned long) &sMode
+            hDisplayState );
+
+        if (err != noErr)

         {
             DMEndConfigureDisplays(hDisplayState);
         {
             DMEndConfigureDisplays(hDisplayState);

-            wxMessageBox(wxString::Format(wxT("Could not set the display mode")));
+            wxMessageBox( wxString::Format(wxT("Could not set the display mode")) );
+

             return false;
         }
             return false;
         }

+

         DMEndConfigureDisplays(hDisplayState);
     }
         DMEndConfigureDisplays(hDisplayState);
     }

-    else  //DM 1.0, 1.2, 1.x
+    else  // DM 1.0, 1.2, 1.x

     {
     {

-        wxLogSysError(wxString::Format(wxT("Monitor gravitation not supported yet.  dwDMVer:%u"),
-                      (unsigned int) dwDMVer));
+        wxLogSysError(
+            wxString::Format(
+                wxT("Monitor gravitation not supported yet.  dwDMVer:%u"),
+                (unsigned int) dwDMVer));
+

         return false;
     }
 
         return false;
     }