#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"
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
// 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);
}
// ----------------------------------------------------------------------------
-// compatibility methods for supporting the modality API
+// compatibility methods for supporting the modality API
// ----------------------------------------------------------------------------
wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent );
-bool wxDialogBase::ShowWindowModal ()
+IMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent)
+
+void wxDialogBase::ShowWindowModal ()
{
ShowModal();
SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED );
- return true;
}
void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
{
- wxCommandEvent event ( type, GetId());
+ wxWindowModalDialogEvent event ( type, GetId());
event.SetEventObject(this);
-
+
if ( !GetEventHandler()->ProcessEvent(event) )
{
// the event is not propagated upwards to the parent automatically
// in 9 cases of 10 the message must be processed by the dialog
// owner and not the dialog itself
(void)GetParent()->GetEventHandler()->ProcessEvent(event);
- }
+ }
}