Add default constructor to wxGraphicsGradientStop.

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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index 50fa18cacf695e125946afb6e7e58727a9f79129..f0f3d659c228c50bff92c392ada6356fce8a08e4 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -53,6 +53,9 @@ void wxDialog::Init()
 
 wxDialog::~wxDialog()
 {
 
 wxDialog::~wxDialog()
 {

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

     delete m_eventLoop;
 }
 
     delete m_eventLoop;
 }
 


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

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

         TransferDataFromWindow();
 }
 
         TransferDataFromWindow();
 }
 


@@ -150,9 +153,12 @@ bool wxDialog::Show(bool show)
             EndModal(wxID_CANCEL);
     }
 
             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;


@@ -175,7 +181,7 @@ int wxDialog::ShowModal()
     // forbidden
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {
     // forbidden
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {

-        wxWindow *parent = wxTheApp->GetTopWindow();
+        wxWindow * const parent = GetParentForModalDialog();

         if ( parent && parent != this )
         {
             m_parent = parent;
         if ( parent && parent != this )
         {
             m_parent = parent;


@@ -186,7 +192,7 @@ int wxDialog::ShowModal()
 
     m_isShowingModal = true;
 
 
     m_isShowingModal = true;
 

-    wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
+    wxASSERT_MSG( !m_windowDisabler, wxT("disabling windows twice?") );

 
 #if defined(__WXGTK__) || defined(__WXMGL__)
     wxBusyCursorSuspender suspender;
 
 #if defined(__WXGTK__) || defined(__WXMGL__)
     wxBusyCursorSuspender suspender;


@@ -204,7 +210,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);