Applying patch #10784: eliminate gauge flicker

[wxWidgets.git] / src / osx / core / utilsexc_base.cpp

diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp
index fe8b87c45e532b26ae44a153d16b1324459bf699..e3e9f996bc387f131cc45a9d1fb6f568e81dc0c2 100644 (file)
--- a/src/osx/core/utilsexc_base.cpp
+++ b/src/osx/core/utilsexc_base.cpp
@@ -64,14 +64,14 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning()
 
 // have a fast version for mac code that returns the version as a return value
 
 
 // have a fast version for mac code that returns the version as a return value
 

-long UMAGetSystemVersion() 
-{ 
+long UMAGetSystemVersion()
+{

     static SInt32 sUMASystemVersion = 0 ;
     if ( sUMASystemVersion == 0 )
     {
         verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
     }
     static SInt32 sUMASystemVersion = 0 ;
     if ( sUMASystemVersion == 0 )
     {
         verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
     }

-    return sUMASystemVersion ; 
+    return sUMASystemVersion ;

 }
 
 // our OS version is the same in non GUI and GUI cases
 }
 
 // our OS version is the same in non GUI and GUI cases


@@ -101,8 +101,6 @@ wxString wxGetOsDescription()
             wxString::FromAscii(name.machine).c_str());
 }
 
             wxString::FromAscii(name.machine).c_str());
 }
 

-#endif // wxOSX_USE_COCOA_OR_CARBON
-

 //===========================================================================
 //  IMPLEMENTATION
 //===========================================================================
 //===========================================================================
 //  IMPLEMENTATION
 //===========================================================================


@@ -286,3 +284,4 @@ bool wxMacLaunch(char **argv)
     return true ;
 }
 
     return true ;
 }
 

+#endif // wxOSX_USE_COCOA_OR_CARBON