cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use result for both NS and wx button ID values.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier 2009-03-05 21:20:57 +00:00
parent ba41a8c629
commit b2c47ad3f8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osx/cocoa/filedlg.mm
View File

@ -181,15 +181,15 @@ int wxFileDialog::ShowModal()
didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
contextInfo: nil]; contextInfo: nil];
[sheetDelegate waitForSheetToFinish]; [sheetDelegate waitForSheetToFinish];
result = [sheetDelegate code]; returnCode = [sheetDelegate code];
[sheetDelegate release]; [sheetDelegate release];
} }
else 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; panel = sPanel;
result = wxID_OK; result = wxID_OK;
@ -221,15 +221,15 @@ int wxFileDialog::ShowModal()
didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
contextInfo: nil]; contextInfo: nil];
[sheetDelegate waitForSheetToFinish]; [sheetDelegate waitForSheetToFinish];
result = [sheetDelegate code]; returnCode = [sheetDelegate code];
[sheetDelegate release]; [sheetDelegate release];
} }
else else
{ {
result = [oPanel runModalForDirectory:dir.AsNSString() returnCode = [oPanel runModalForDirectory:dir.AsNSString()
file:file.AsNSString() types:types]; file:file.AsNSString() types:types];
} }
if (result == NSOKButton ) if (returnCode == NSOKButton )
{ {
panel = oPanel; panel = oPanel;
result = wxID_OK; result = wxID_OK;