avoid setting initial position if it was not specified, broken in r70734

[wxWidgets.git] / src / osx / dialog_osx.cpp

diff --git a/src/osx/dialog_osx.cpp b/src/osx/dialog_osx.cpp
index e605e95f3fa511ead9e4b5e98bfefe4a4191b3af..fe870deaed721624462c34758da703f20df0762d 100644 (file)
--- a/src/osx/dialog_osx.cpp
+++ b/src/osx/dialog_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: dialog.cpp 54820 2008-07-29 20:04:11Z SC $

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,6 +12,7 @@
 
 #include "wx/dialog.h"
 #include "wx/evtloop.h"
 
 #include "wx/dialog.h"
 #include "wx/evtloop.h"

+#include "wx/modalhook.h"

 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"


@@ -23,12 +23,22 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-// Lists to keep track of windows, so we can disable/enable them
-// for modal dialogs
+static int s_openDialogs = 0;
+bool wxDialog::OSXHasModalDialogsOpen()
+{
+    return s_openDialogs > 0;
+}

 
 

-wxList wxModalDialogs;
+void wxDialog::OSXBeginModalDialog()
+{
+    s_openDialogs++;
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
+void wxDialog::OSXEndModalDialog()
+{
+    wxASSERT_MSG( s_openDialogs > 0, "incorrect internal modal dialog count");
+    s_openDialogs--;
+}

 
 void wxDialog::Init()
 {
 
 void wxDialog::Init()
 {


@@ -70,7 +80,7 @@ wxDialog::~wxDialog()
 // about it
 bool wxDialog::IsEscapeKey(const wxKeyEvent& event)
 {
 // about it
 bool wxDialog::IsEscapeKey(const wxKeyEvent& event)
 {

-    if ( event.GetKeyCode() == '.' && event.GetModifiers() == wxMOD_CMD )
+    if ( event.GetKeyCode() == '.' && event.GetModifiers() == wxMOD_CONTROL )

         return true;
 
     return wxDialogBase::IsEscapeKey(event);
         return true;
 
     return wxDialogBase::IsEscapeKey(event);


@@ -89,7 +99,7 @@ bool wxDialog::Show(bool show)
             // nothing to do
             return false;
     }
             // nothing to do
             return false;
     }

-    else 
+    else

     {
         if ( !wxDialogBase::Show(show) )
             // nothing to do
     {
         if ( !wxDialogBase::Show(show) )
             // nothing to do


@@ -105,44 +115,52 @@ bool wxDialog::Show(bool show)
 
     if ( !show )
     {
 
     if ( !show )
     {

-        switch( m_modality )
+        const int modalityOrig = m_modality;
+
+        // complete the 'hiding' before we send the event
+        m_modality = wxDIALOG_MODALITY_NONE;
+
+        switch ( modalityOrig )

         {
             case wxDIALOG_MODALITY_WINDOW_MODAL:
                 EndWindowModal(); // OS X implementation method for cleanup
         {
             case wxDIALOG_MODALITY_WINDOW_MODAL:
                 EndWindowModal(); // OS X implementation method for cleanup

-                SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );        
+                SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );

                 break;
             default:
                 break;
         }
                 break;
             default:
                 break;
         }

-        m_modality = wxDIALOG_MODALITY_NONE;

     }
     }

-    
+

     return true;
 }
 
 // Replacement for Show(true) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {
     return true;
 }
 
 // Replacement for Show(true) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     m_modality = wxDIALOG_MODALITY_APP_MODAL;
     m_modality = wxDIALOG_MODALITY_APP_MODAL;

-    
+

     Show();
 
     wxModalEventLoop modalLoop(this);
     m_eventLoop = &modalLoop;
     Show();
 
     wxModalEventLoop modalLoop(this);
     m_eventLoop = &modalLoop;

-    
+
+    wxDialog::OSXBeginModalDialog();

     modalLoop.Run();
     modalLoop.Run();

-    
+    wxDialog::OSXEndModalDialog();
+

     m_eventLoop = NULL;
     m_eventLoop = NULL;

-    
+

     return GetReturnCode();
 }
 
 void wxDialog::ShowWindowModal()
 {
     m_modality = wxDIALOG_MODALITY_WINDOW_MODAL;
     return GetReturnCode();
 }
 
 void wxDialog::ShowWindowModal()
 {
     m_modality = wxDIALOG_MODALITY_WINDOW_MODAL;

-    
+

     Show();
     Show();

-    
+

     DoShowWindowModal();
 }
 
     DoShowWindowModal();
 }
 


@@ -157,7 +175,7 @@ void wxDialog::EndModal(int retCode)
 {
     if ( m_eventLoop )
         m_eventLoop->Exit(retCode);
 {
     if ( m_eventLoop )
         m_eventLoop->Exit(retCode);

-    
+

     SetReturnCode(retCode);
     Show(false);
 }
     SetReturnCode(retCode);
     Show(false);
 }