Don't use m_macToolbar in wxOSX wxToolBar if it is NULL.

[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..7c5c828048b59d63b4136642550665921f3fc047 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
 
-long UMAGetSystemVersion() 
-{ 
+long UMAGetSystemVersion()
+{
     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
@@ -101,8 +101,6 @@ wxString wxGetOsDescription()
             wxString::FromAscii(name.machine).c_str());
 }
 
-#endif // wxOSX_USE_COCOA_OR_CARBON
-
 //===========================================================================
 //  IMPLEMENTATION
 //===========================================================================
@@ -193,8 +191,8 @@ bool wxMacLaunch(char **argv)
     // Loop through command line arguments to the bundle,
     // turn them into CFURLs and then put them in cfaFiles
     // For use to launch services call
-        for( ; *argv != NULL ; ++argv)
-        {
+    for( ; *argv != NULL ; ++argv)
+    {
         // Check for '<' as this will ring true for
         // CFURLCreateWithString but is generally not considered
         // typical on mac but is usually passed here from wxExecute
@@ -246,12 +244,12 @@ bool wxMacLaunch(char **argv)
 
         // Add the valid CFURL to the argument array and then
         // release it as the CFArray adds a ref count to it
-            CFArrayAppendValue(
-                cfaFiles,
-                cfurlCurrentFile
-                            );
-            CFRelease(cfurlCurrentFile); // array has retained it
-        }
+        CFArrayAppendValue(
+            cfaFiles,
+            cfurlCurrentFile
+                        );
+        CFRelease(cfurlCurrentFile); // array has retained it
+    }
 
     // Create a LSLaunchURLSpec for use with LSOpenFromURLSpec
     // Note that there are several flag options (launchFlags) such
@@ -286,3 +284,4 @@ bool wxMacLaunch(char **argv)
     return true ;
 }
 
+#endif // wxOSX_USE_COCOA_OR_CARBON