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

Disabling sheets codepath until we can resolve the nested loop issue.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-03-22 06:33:37 +00:00
parent c7428e0813
commit 440e5cb2fa
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osx/cocoa/dirdlg.mm
View File

@@ -79,6 +79,7 @@ int wxDirDialog::ShowModal()
fprintf(stderr, "No parent!\n"); fprintf(stderr, "No parent!\n");
} }
/*
if (parentWindow) if (parentWindow)
{ {
NSWindow* nativeParent = parentWindow->GetWXWindow(); NSWindow* nativeParent = parentWindow->GetWXWindow();
@@ -92,6 +93,7 @@ int wxDirDialog::ShowModal()
[sheetDelegate release]; [sheetDelegate release];
} }
else else
*/
{ {
returnCode = (NSInteger)[oPanel runModalForDirectory:dir.AsNSString() file:nil types:nil]; returnCode = (NSInteger)[oPanel runModalForDirectory:dir.AsNSString() file:nil types:nil];
} }

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

@@ -177,8 +177,8 @@ int wxFileDialog::ShowModal()
{ {
} }
// avoid multiple event handlers on stack /*
if ( 0 /*parentWindow*/) if (parentWindow)
{ {
NSWindow* nativeParent = parentWindow->GetWXWindow(); NSWindow* nativeParent = parentWindow->GetWXWindow();
ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
@@ -191,6 +191,7 @@ int wxFileDialog::ShowModal()
[sheetDelegate release]; [sheetDelegate release];
} }
else else
*/
{ {
returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ]; returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ];
} }
@@ -217,8 +218,8 @@ int wxFileDialog::ShowModal()
[oPanel setCanChooseFiles:YES]; [oPanel setCanChooseFiles:YES];
[oPanel setMessage:cf.AsNSString()]; [oPanel setMessage:cf.AsNSString()];
// avoid multiple event handlers on stack /*
if ( 0 /*parentWindow*/) if (parentWindow)
{ {
NSWindow* nativeParent = parentWindow->GetWXWindow(); NSWindow* nativeParent = parentWindow->GetWXWindow();
ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
@@ -232,6 +233,7 @@ int wxFileDialog::ShowModal()
[sheetDelegate release]; [sheetDelegate release];
} }
else else
*/
{ {
returnCode = [oPanel runModalForDirectory:dir.AsNSString() returnCode = [oPanel runModalForDirectory:dir.AsNSString()
file:file.AsNSString() types:types]; file:file.AsNSString() types:types];

2
src/osx/cocoa/msgdlg.mm
View File

@@ -192,6 +192,7 @@ int wxMessageDialog::ShowModal()
parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent())); parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
} }
/*
if (parentWindow) if (parentWindow)
{ {
NSWindow* nativeParent = parentWindow->GetWXWindow(); NSWindow* nativeParent = parentWindow->GetWXWindow();
@@ -204,6 +205,7 @@ int wxMessageDialog::ShowModal()
[sheetDelegate release]; [sheetDelegate release];
} }
else else
*/
{ {
button = [alert runModal]; button = [alert runModal];
} }