]> git.saurik.com Git - wxWidgets.git/commitdiff
building on 10.5
authorStefan Csomor <csomor@advancedconcepts.ch>
Tue, 17 Apr 2012 06:13:16 +0000 (06:13 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Tue, 17 Apr 2012 06:13:16 +0000 (06:13 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/cocoa/filedlg.mm

index a1c79b7fc51150881b913791457c7765d4123ae2..e026bc744e908cb7c192b3624e12d402f515c6d1 100644 (file)
@@ -585,20 +585,22 @@ int wxFileDialog::ShowModal()
         [oPanel setMessage:cf.AsNSString()];
         [oPanel setAllowsMultipleSelection: (HasFlag(wxFD_MULTIPLE) ? YES : NO )];
 
         [oPanel setMessage:cf.AsNSString()];
         [oPanel setAllowsMultipleSelection: (HasFlag(wxFD_MULTIPLE) ? YES : NO )];
 
-        if ( UMAGetSystemVersion() < 0x1060 )
-        {
-            returnCode = [oPanel runModalForDirectory:m_dir.IsEmpty() ? nil : dir.AsNSString()
-                                                 file:file.AsNSString() types:(m_delegate == nil ? types : nil)];
-        }
-        else 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+        if ( UMAGetSystemVersion() >= 0x1060 )
         {
             [oPanel setAllowedFileTypes: (m_delegate == nil ? types : nil)];
             if ( !m_dir.IsEmpty() )
                 [oPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString() 
         {
             [oPanel setAllowedFileTypes: (m_delegate == nil ? types : nil)];
             if ( !m_dir.IsEmpty() )
                 [oPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString() 
-                                               isDirectory:YES]];
+                                                   isDirectory:YES]];
             returnCode = [oPanel runModal];
         }
             returnCode = [oPanel runModal];
         }
-
+        else 
+#endif
+        {
+            returnCode = [oPanel runModalForDirectory:m_dir.IsEmpty() ? nil : dir.AsNSString()
+                                                 file:file.AsNSString() types:(m_delegate == nil ? types : nil)];
+        }
+            
         ModalFinishedCallback(oPanel, returnCode);
     }
 
         ModalFinishedCallback(oPanel, returnCode);
     }