Refactor wxStyledTextCtrl to share common file save/load code.

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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index d87d7ce8af2928d289c16ec2fe06635e2234d0b5..f0f3d659c228c50bff92c392ada6356fce8a08e4 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -14,10 +14,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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


@@ -46,33 +43,19 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 

-wxDialog::wxDialog()
-{
-    Init();
-}
-
-wxDialog::wxDialog(wxWindow *parent,
-                   wxWindowID id,
-                   const wxString& title,
-                   const wxPoint& pos,
-                   const wxSize& size,
-                   long style,
-                   const wxString& name)
-{
-    Init();
-    Create(parent, id, title, pos, size, style, name);
-}
-

 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;
 }
 


@@ -91,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();
 }
 


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

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

     }
 }
 
     }
 }
 


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

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

         }
     }
 }
         }
     }
 }


@@ -170,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;


@@ -195,18 +181,18 @@ 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;
         }
     }
 

-    Show(TRUE);
+    Show(true);

 
 

-    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;


@@ -224,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);
 


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

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

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

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

 }
 }