fixing focus, fixes #11911

[wxWidgets.git] / src / univ / dialog.cpp

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index dfb4a5b279c055bb960093e26a043950a496a610..f0f3d659c228c50bff92c392ada6356fce8a08e4 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -6,14 +6,29 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "univdialog.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
 #endif
 
 #include "wx/dialog.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/app.h"
+#endif
+
 #include "wx/evtloop.h"
-#include "wx/app.h"
 
 //-----------------------------------------------------------------------------
 // wxDialog
@@ -33,11 +48,14 @@ void wxDialog::Init()
     m_returnCode = 0;
     m_windowDisabler = NULL;
     m_eventLoop = NULL;
-    m_isShowingModal = FALSE;
+    m_isShowingModal = false;
 }
 
 wxDialog::~wxDialog()
 {
+    // if the dialog is modal, this will end its event loop
+    Show(false);
+
     delete m_eventLoop;
 }
 
@@ -56,7 +74,7 @@ bool wxDialog::Create(wxWindow *parent,
 
 void wxDialog::OnApply(wxCommandEvent &WXUNUSED(event))
 {
-    if ( Validate() ) 
+    if ( Validate() )
         TransferDataFromWindow();
 }
 
@@ -69,7 +87,7 @@ void wxDialog::OnCancel(wxCommandEvent &WXUNUSED(event))
     else
     {
         SetReturnCode(wxID_CANCEL);
-        Show(FALSE);
+        Show(false);
     }
 }
 
@@ -84,7 +102,7 @@ void wxDialog::OnOK(wxCommandEvent &WXUNUSED(event))
         else
         {
             SetReturnCode(wxID_OK);
-            Show(FALSE);
+            Show(false);
         }
     }
 }
@@ -135,9 +153,12 @@ bool wxDialog::Show(bool show)
             EndModal(wxID_CANCEL);
     }
 
+    if (show && CanDoLayoutAdaptation())
+        DoLayoutAdaptation();
+
     bool ret = wxDialogBase::Show(show);
 
-    if ( show ) 
+    if ( show )
         InitDialog();
 
     return ret;
@@ -148,11 +169,6 @@ bool wxDialog::IsModal() const
     return m_isShowingModal;
 }
 
-void wxDialog::SetModal(bool WXUNUSED(flag))
-{
-    wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
-}
-
 int wxDialog::ShowModal()
 {
     if ( IsModal() )
@@ -165,20 +181,23 @@ int wxDialog::ShowModal()
     // forbidden
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {
-        wxWindow *parent = wxTheApp->GetTopWindow();
+        wxWindow * const parent = GetParentForModalDialog();
         if ( parent && parent != this )
         {
             m_parent = parent;
         }
     }
 
-    wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
+    Show(true);
 
-    Show(TRUE);
+    m_isShowingModal = true;
 
-    m_isShowingModal = TRUE;
+    wxASSERT_MSG( !m_windowDisabler, wxT("disabling windows twice?") );
 
-    wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
+#if defined(__WXGTK__) || defined(__WXMGL__)
+    wxBusyCursorSuspender suspender;
+    // FIXME (FIXME_MGL) - make sure busy cursor disappears under MSW too
+#endif
 
     m_windowDisabler = new wxWindowDisabler(this);
     if ( !m_eventLoop )
@@ -191,7 +210,7 @@ int wxDialog::ShowModal()
 
 void wxDialog::EndModal(int retCode)
 {
-    wxASSERT_MSG( m_eventLoop, _T("wxDialog is not modal") );
+    wxASSERT_MSG( m_eventLoop, wxT("wxDialog is not modal") );
 
     SetReturnCode(retCode);
 
@@ -201,9 +220,9 @@ void wxDialog::EndModal(int retCode)
         return;
     }
 
-    m_isShowingModal = FALSE;
-    
+    m_isShowingModal = false;
+
     m_eventLoop->Exit();
 
-    Show(FALSE);
+    Show(false);
 }