fix memory leak in wxScreenDC, fixes #13249

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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index 0f5e47b9a4a4cec6fbda67794b0b6579b8248450..9adf6a99b8daa3cbbc223ffdb290d54d6f404be8 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -14,10 +14,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "univdialog.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -25,8 +21,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dialog.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/dialog.h"

     #include "wx/utils.h"
     #include "wx/app.h"
 #endif
     #include "wx/utils.h"
     #include "wx/app.h"
 #endif


@@ -44,18 +41,19 @@ BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
     EVT_CLOSE   (wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
     EVT_CLOSE   (wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-

 void wxDialog::Init()
 {
     m_returnCode = 0;
     m_windowDisabler = NULL;
     m_eventLoop = NULL;
 void wxDialog::Init()
 {
     m_returnCode = 0;
     m_windowDisabler = NULL;
     m_eventLoop = NULL;

-    m_isShowingModal = FALSE;
+    m_isShowingModal = false;

 }
 
 wxDialog::~wxDialog()
 {
 }
 
 wxDialog::~wxDialog()
 {

+    // if the dialog is modal, this will end its event loop
+    Show(false);
+

     delete m_eventLoop;
 }
 
     delete m_eventLoop;
 }
 


@@ -74,7 +72,7 @@ bool wxDialog::Create(wxWindow *parent,
 
 void wxDialog::OnApply(wxCommandEvent &WXUNUSED(event))
 {
 
 void wxDialog::OnApply(wxCommandEvent &WXUNUSED(event))
 {

-    if ( Validate() ) 
+    if ( Validate() )

         TransferDataFromWindow();
 }
 
         TransferDataFromWindow();
 }
 


@@ -87,7 +85,7 @@ void wxDialog::OnCancel(wxCommandEvent &WXUNUSED(event))
     else
     {
         SetReturnCode(wxID_CANCEL);
     else
     {
         SetReturnCode(wxID_CANCEL);

-        Show(FALSE);
+        Show(false);

     }
 }
 
     }
 }
 


@@ -102,7 +100,7 @@ void wxDialog::OnOK(wxCommandEvent &WXUNUSED(event))
         else
         {
             SetReturnCode(wxID_OK);
         else
         {
             SetReturnCode(wxID_OK);

-            Show(FALSE);
+            Show(false);

         }
     }
 }
         }
     }
 }


@@ -143,19 +141,18 @@ bool wxDialog::Show(bool show)
         // if we had disabled other app windows, reenable them back now because
         // if they stay disabled Windows will activate another window (one
         // which is enabled, anyhow) and we will lose activation
         // if we had disabled other app windows, reenable them back now because
         // if they stay disabled Windows will activate another window (one
         // which is enabled, anyhow) and we will lose activation

-        if ( m_windowDisabler )
-        {
-            delete m_windowDisabler;
-            m_windowDisabler = NULL;
-        }
+        wxDELETE(m_windowDisabler);

 
         if ( IsModal() )
             EndModal(wxID_CANCEL);
     }
 
 
         if ( IsModal() )
             EndModal(wxID_CANCEL);
     }
 

+    if (show && CanDoLayoutAdaptation())
+        DoLayoutAdaptation();
+

     bool ret = wxDialogBase::Show(show);
 
     bool ret = wxDialogBase::Show(show);
 

-    if ( show ) 
+    if ( show )

         InitDialog();
 
     return ret;
         InitDialog();
 
     return ret;


@@ -166,11 +163,6 @@ bool wxDialog::IsModal() const
     return m_isShowingModal;
 }
 
     return m_isShowingModal;
 }
 

-void wxDialog::SetModal(bool WXUNUSED(flag))
-{
-    wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
-}
-

 int wxDialog::ShowModal()
 {
     if ( IsModal() )
 int wxDialog::ShowModal()
 {
     if ( IsModal() )


@@ -181,20 +173,22 @@ int wxDialog::ShowModal()
 
     // use the apps top level window as parent if none given unless explicitly
     // forbidden
 
     // use the apps top level window as parent if none given unless explicitly
     // forbidden

-    if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
+    wxWindow * const parent = GetParentForModalDialog();
+    if ( parent && parent != this )

     {
     {

-        wxWindow *parent = wxTheApp->GetTopWindow();
-        if ( parent && parent != this )
-        {
-            m_parent = parent;
-        }
+        m_parent = parent;

     }
 
     }
 

-    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 )
 
     m_windowDisabler = new wxWindowDisabler(this);
     if ( !m_eventLoop )


@@ -207,7 +201,7 @@ int wxDialog::ShowModal()
 
 void wxDialog::EndModal(int retCode)
 {
 
 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);
 
 
     SetReturnCode(retCode);
 


@@ -217,9 +211,9 @@ void wxDialog::EndModal(int retCode)
         return;
     }
 
         return;
     }
 

-    m_isShowingModal = FALSE;
-    
+    m_isShowingModal = false;
+

     m_eventLoop->Exit();
 
     m_eventLoop->Exit();
 

-    Show(FALSE);
+    Show(false);

 }
 }