Override CanFocus because the wxWindow level test will check if the NSTextView's...

[wxWidgets.git] / src / osx / cocoa / dialog.mm

diff --git a/src/osx/cocoa/dialog.mm b/src/osx/cocoa/dialog.mm
index 47a50ba404d311a4409670efab41d3a12aee35d6..d55449d1b517559bb9079616f5644483788c3826 100644 (file)
--- a/src/osx/cocoa/dialog.mm
+++ b/src/osx/cocoa/dialog.mm
@@ -24,7 +24,7 @@
 
 extern wxList wxModalDialogs;
 
-void wxDialog::ShowWindowModal()
+void wxDialog::DoShowWindowModal()
 {   
     wxTopLevelWindow* parent = static_cast<wxTopLevelWindow*>(wxGetTopLevelParent(GetParent()));
     
@@ -32,8 +32,6 @@ void wxDialog::ShowWindowModal()
     
     NSWindow* parentWindow = parent->GetWXWindow();
     NSWindow* theWindow = GetWXWindow();
-
-    wxWindow::Show(true);
     
     [NSApp beginSheet: theWindow
             modalForWindow: parentWindow
@@ -45,12 +43,11 @@ void wxDialog::ShowWindowModal()
 void wxDialog::EndWindowModal()
 {
     [NSApp endSheet: GetWXWindow()];
+    [GetWXWindow() orderOut:GetWXWindow()];
 }
 
 void wxDialog::DoShowModal()
 {
-    wxCHECK_RET( !IsModal(), wxT("DoShowModal() called twice") );
-
     // If the app hasn't started, flush the event queue
     // If we don't do this, the Dock doesn't get the message that
     // the app has started so will refuse to activate it.
@@ -64,8 +61,6 @@ void wxDialog::DoShowModal()
         }
     }
 
-    wxModalDialogs.Append(this);
-
     SetFocus() ;
 /*
     WindowGroupRef windowGroup;