From b2c47ad3f8175554fa87190fa027c2e6374a856d Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Thu, 5 Mar 2009 21:20:57 +0000 Subject: [PATCH] Don't use result for both NS and wx button ID values. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/filedlg.mm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm index a509c1bb63..83f341d005 100644 --- a/src/osx/cocoa/filedlg.mm +++ b/src/osx/cocoa/filedlg.mm @@ -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;