don't give error messages if ws2_32.dll is not available in wxGetHostName()

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

diff --git a/src/cocoa/dialog.mm b/src/cocoa/dialog.mm
index 59cf2fb0a2103642e2310115c207a39fe3486133..4a13a49a957cff55426deeafbe34e386845e75d4 100644 (file)
--- a/src/cocoa/dialog.mm
+++ b/src/cocoa/dialog.mm
@@ -9,13 +9,21 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/dialog.h"
-#include "wx/app.h"
-#include "wx/settings.h"
-#include "wx/log.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/dialog.h"
+    #include "wx/settings.h"
+#endif //WX_PRECOMP
+
+#include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/string.h"

 
 #import <AppKit/NSPanel.h>
 #import <AppKit/NSApplication.h>
 
 #import <AppKit/NSPanel.h>
 #import <AppKit/NSApplication.h>

+#import <AppKit/NSEvent.h>
+#import <Foundation/NSRunLoop.h>

 
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs


@@ -44,6 +52,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID winid,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

+    wxAutoNSAutoreleasePool pool;

     wxTopLevelWindows.Append(this);
 
     if(!CreateBase(parent,winid,pos,size,style,wxDefaultValidator,name))
     wxTopLevelWindows.Append(this);
 
     if(!CreateBase(parent,winid,pos,size,style,wxDefaultValidator,name))


@@ -66,24 +75,26 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID winid,
     // Because we do not release on close, the following release matches the
     // above alloc and thus the retain count will be 1.
     [m_cocoaNSWindow release];
     // Because we do not release on close, the following release matches the
     // above alloc and thus the retain count will be 1.
     [m_cocoaNSWindow release];

-    wxLogDebug("wxDialog m_cocoaNSWindow retainCount=%d",[m_cocoaNSWindow retainCount]);
+    wxLogDebug(wxT("wxDialog m_cocoaNSWindow retainCount=%d"),[m_cocoaNSWindow retainCount]);
+    [m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];
+    [m_cocoaNSWindow setHidesOnDeactivate:NO];

 
     return true;
 }
 
 wxDialog::~wxDialog()
 {
 
     return true;
 }
 
 wxDialog::~wxDialog()
 {

-    wxLogDebug("Destroying");
+    wxLogDebug(wxT("Destroying"));

     // setReleasedWhenClosed: NO
     [m_cocoaNSWindow close];
     // setReleasedWhenClosed: NO
     [m_cocoaNSWindow close];

-    SetNSPanel(NULL);
+    DisassociateNSPanel(GetNSPanel());

 }
 
 }
 

-void wxDialog::Cocoa_close(void)
+void wxDialog::CocoaDelegate_windowWillClose(void)

 {
     m_closed = true;
     /* Actually, this isn't true anymore */
 {
     m_closed = true;
     /* Actually, this isn't true anymore */

-    wxLogDebug("Woah: Dialogs are not generally closed");
+    wxLogDebug(wxT("Woah: Dialogs are not generally closed"));

 }
 
 void wxDialog::SetModal(bool flag)
 }
 
 void wxDialog::SetModal(bool flag)


@@ -102,24 +113,45 @@ void wxDialog::SetModal(bool flag)
 
 bool wxDialog::Show(bool show)
 {
 
 bool wxDialog::Show(bool show)
 {

+    if(m_isShown == show)
+        return false;

     if(show)
         InitDialog();
     if(IsModal())
     {
     if(show)
         InitDialog();
     if(IsModal())
     {

+        m_isShown = show;

         if(show)
         {
         if(show)
         {

+            wxAutoNSAutoreleasePool pool;

             wxModalDialogs.Append(this);
             wxModalDialogs.Append(this);

-            wxLogDebug("runModal");
+            wxLogDebug(wxT("runModal"));
+            NSApplication *theNSApp = wxTheApp->GetNSApplication();
+            // 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.
+            if(![theNSApp isRunning])
+            {
+                while(NSEvent *event = [theNSApp
+                            nextEventMatchingMask:NSAnyEventMask
+                            untilDate:[NSDate distantPast]
+                            inMode:NSDefaultRunLoopMode
+                            dequeue: YES])
+                {
+                    [theNSApp sendEvent: event];
+                }
+            }

             [wxTheApp->GetNSApplication() runModalForWindow:m_cocoaNSWindow];
             [wxTheApp->GetNSApplication() runModalForWindow:m_cocoaNSWindow];

-            wxLogDebug("runModal END");
+            wxLogDebug(wxT("runModal END"));

         }
         else
         {
         }
         else
         {

-            wxLogDebug("abortModal");
+            wxLogDebug(wxT("abortModal"));

             [wxTheApp->GetNSApplication() abortModal];
             wxModalDialogs.DeleteObject(this);
         }
     }
             [wxTheApp->GetNSApplication() abortModal];
             wxModalDialogs.DeleteObject(this);
         }
     }

+    else
+        return wxTopLevelWindow::Show(show);

     return true;
 }
 
     return true;
 }
 


@@ -166,13 +198,13 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     
     if ( closing.Member(this) )
     {
     
     if ( closing.Member(this) )
     {

-        wxLogDebug("WARNING: Attempting to recursively call Close for dialog");
+        wxLogDebug(wxT("WARNING: Attempting to recursively call Close for dialog"));

         return;
     }
     
     closing.Append(this);
     
         return;
     }
     
     closing.Append(this);
     

-    wxLogDebug("Sending Cancel Event");
+    wxLogDebug(wxT("Sending Cancel Event"));

     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog


@@ -198,7 +230,7 @@ void wxDialog::OnApply(wxCommandEvent& event)
 
 void wxDialog::OnCancel(wxCommandEvent& event)
 {
 
 void wxDialog::OnCancel(wxCommandEvent& event)
 {

-    wxLogDebug("Cancelled!");
+    wxLogDebug(wxT("Cancelled!"));

     EndModal(wxID_CANCEL);
 }
 
     EndModal(wxID_CANCEL);
 }