X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94b4dd54994eeae0e625bca08446f7e8d8d917a8..62354609e69487e1066e1b1129c254c886cfa0fb:/src/common/dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 89880c8262..b0aa664380 100644
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -40,9 +40,9 @@
 #include "wx/statline.h"
 #include "wx/sysopt.h"
 #include "wx/module.h"
-#include "wx/private/stattext.h"
 #include "wx/bookctrl.h"
 #include "wx/scrolwin.h"
+#include "wx/textwrapper.h"
 
 #if wxUSE_DISPLAY
 #include "wx/display.h"
@@ -83,7 +83,7 @@ wxWindow *wxDialogBase::CheckIfCanBeUsedAsParent(wxWindow *parent) const
     if ( !parent )
         return NULL;
 
-    extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
+    extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
     if ( wxPendingDelete.Member(parent) || parent->IsBeingDeleted() )
     {
         // this window is being deleted and we shouldn't create any children
@@ -195,7 +195,7 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
     // the static messages created by CreateTextSizer() (used by wxMessageBox,
     // for example), we don't want this special meaning, so we need to quote it
     wxString text(message);
-    text.Replace(_T("&"), _T("&&"));
+    text.Replace(wxT("&"), wxT("&&"));
 
     wxTextSizerWrapper wrapper(this);
 
@@ -465,11 +465,13 @@ void wxDialogBase::OnButton(wxCommandEvent& event)
 }
 
 // ----------------------------------------------------------------------------
-// compatibility methods for supporting the modality API 
+// compatibility methods for supporting the modality API
 // ----------------------------------------------------------------------------
 
 wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent  );
 
+IMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent)
+
 bool wxDialogBase::ShowWindowModal ()
 {
     ShowModal();
@@ -481,7 +483,7 @@ void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
 {
     wxCommandEvent event ( type, GetId());
     event.SetEventObject(this);
-    
+
     if ( !GetEventHandler()->ProcessEvent(event) )
     {
         // the event is not propagated upwards to the parent automatically
@@ -489,7 +491,7 @@ void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
         // in 9 cases of 10 the message must be processed by the dialog
         // owner and not the dialog itself
         (void)GetParent()->GetEventHandler()->ProcessEvent(event);
-    }    
+    }
 }