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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/cocoa/dirdlg.mm b/src/osx/cocoa/dirdlg.mm
index 4f5063ba61a8e607a2644a91fff40752083a5c77..fae04d0e658735530123ebdc67600d412944784d 100644 (file)
--- a/src/osx/cocoa/dirdlg.mm
+++ b/src/osx/cocoa/dirdlg.mm
@@ -78,7 +78,8 @@ int wxDirDialog::ShowModal()
     {
         fprintf(stderr, "No parent!\n");
     }
     {
         fprintf(stderr, "No parent!\n");
     }

-    
+
+/*    

     if (parentWindow)
     {
         NSWindow* nativeParent = parentWindow->GetWXWindow();
     if (parentWindow)
     {
         NSWindow* nativeParent = parentWindow->GetWXWindow();


@@ -92,6 +93,7 @@ int wxDirDialog::ShowModal()
         [sheetDelegate release];
     }
     else
         [sheetDelegate release];
     }
     else

+*/

     {
         returnCode = (NSInteger)[oPanel runModalForDirectory:dir.AsNSString() file:nil types:nil];
     }
     {
         returnCode = (NSInteger)[oPanel runModalForDirectory:dir.AsNSString() file:nil types:nil];
     }

diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm
index dfb81bc98dec7ce5c44a0f1f7744600479418030..0b34682a7213d23efefd8e70aaf49d59af26c53b 100644 (file)
--- a/src/osx/cocoa/filedlg.mm
+++ b/src/osx/cocoa/filedlg.mm
@@ -176,9 +176,9 @@ int wxFileDialog::ShowModal()
         if ( HasFlag(wxFD_OVERWRITE_PROMPT) )
         {
         }
         if ( HasFlag(wxFD_OVERWRITE_PROMPT) )
         {
         }

-    
-        // avoid multiple event handlers on stack
-        if ( 0 /*parentWindow*/)
+
+/*
+        if (parentWindow)

         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
             ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
             ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 


@@ -191,6 +191,7 @@ int wxFileDialog::ShowModal()
             [sheetDelegate release];
         }
         else
             [sheetDelegate release];
         }
         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 setMessage:cf.AsNSString()];
 
         [oPanel setCanChooseFiles:YES];
         [oPanel setMessage:cf.AsNSString()];
 

-        // avoid multiple event handlers on stack
-        if ( 0 /*parentWindow*/)
+/*
+        if (parentWindow)

         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
             ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
             ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 


@@ -232,6 +233,7 @@ int wxFileDialog::ShowModal()
             [sheetDelegate release];
         }
         else
             [sheetDelegate release];
         }
         else

+*/

         {
             returnCode = [oPanel runModalForDirectory:dir.AsNSString() 
                         file:file.AsNSString() types:types];
         {
             returnCode = [oPanel runModalForDirectory:dir.AsNSString() 
                         file:file.AsNSString() types:types];

diff --git a/src/osx/cocoa/msgdlg.mm b/src/osx/cocoa/msgdlg.mm
index d574137f1eea5c93f9d46fc60d3fd80a2367a80c..ab6ffb99e6981151ebdf5e0867c4a7f2a424fcaf 100644 (file)
--- a/src/osx/cocoa/msgdlg.mm
+++ b/src/osx/cocoa/msgdlg.mm
@@ -192,6 +192,7 @@ int wxMessageDialog::ShowModal()
             parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
         }
  
             parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
         }
  

+ /*

         if (parentWindow)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
         if (parentWindow)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();


@@ -204,6 +205,7 @@ int wxMessageDialog::ShowModal()
             [sheetDelegate release];
         }
         else
             [sheetDelegate release];
         }
         else

+*/

         {
             button = [alert runModal];
         }
         {
             button = [alert runModal];
         }