]> git.saurik.com Git - wxWidgets.git/commitdiff
Don't use result for both NS and wx button ID values.
authorKevin Ollivier <kevino@theolliviers.com>
Thu, 5 Mar 2009 21:20:57 +0000 (21:20 +0000)
committerKevin Ollivier <kevino@theolliviers.com>
Thu, 5 Mar 2009 21:20:57 +0000 (21:20 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/cocoa/filedlg.mm

index a509c1bb63e53f9d8075e825830a6a187e648946..83f341d0053015c5b08884f0ea8a09ca7d62cf66 100644 (file)
@@ -181,15 +181,15 @@ int wxFileDialog::ShowModal()
                 didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) 
                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
-            result = [sheetDelegate code];
+            returnCode = [sheetDelegate code];
             [sheetDelegate release];
         }
         else
         {
-            result = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ];
+            returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ];
         }
         
-        if (result == NSOKButton )
+        if (returnCode == NSOKButton )
         {
             panel = sPanel;
             result = wxID_OK;
@@ -221,15 +221,15 @@ int wxFileDialog::ShowModal()
                 didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) 
                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
-            result = [sheetDelegate code];
+            returnCode = [sheetDelegate code];
             [sheetDelegate release];
         }
         else
         {
-            result = [oPanel runModalForDirectory:dir.AsNSString() 
+            returnCode = [oPanel runModalForDirectory:dir.AsNSString() 
                         file:file.AsNSString() types:types];
         }
-        if (result == NSOKButton )
+        if (returnCode == NSOKButton )
         {
             panel = oPanel;
             result = wxID_OK;