X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..74de91cc974062b9eaddc7c0ccbfb07013bd0611:/contrib/src/xrc/xh_dlg.cpp diff --git a/contrib/src/xrc/xh_dlg.cpp b/contrib/src/xrc/xh_dlg.cpp index c872225abb..ea823db964 100644 --- a/contrib/src/xrc/xh_dlg.cpp +++ b/contrib/src/xrc/xh_dlg.cpp @@ -7,7 +7,7 @@ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - + #ifdef __GNUG__ #pragma implementation "xh_dlg.h" #endif @@ -24,57 +24,58 @@ #include "wx/log.h" #include "wx/intl.h" +IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler) wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE(wxSTAY_ON_TOP); - ADD_STYLE(wxCAPTION); - ADD_STYLE(wxDEFAULT_DIALOG_STYLE); - ADD_STYLE(wxTHICK_FRAME); - ADD_STYLE(wxSYSTEM_MENU); - ADD_STYLE(wxRESIZE_BORDER); - ADD_STYLE(wxRESIZE_BOX); - ADD_STYLE(wxDIALOG_MODAL); - ADD_STYLE(wxDIALOG_MODELESS); - - ADD_STYLE(wxNO_3D); - ADD_STYLE(wxTAB_TRAVERSAL); - ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); - ADD_STYLE(wxCLIP_CHILDREN); - AddWindowStyles(); -} + XRC_ADD_STYLE(wxSTAY_ON_TOP); + XRC_ADD_STYLE(wxCAPTION); + XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE); + XRC_ADD_STYLE(wxTHICK_FRAME); + XRC_ADD_STYLE(wxSYSTEM_MENU); + XRC_ADD_STYLE(wxRESIZE_BORDER); + XRC_ADD_STYLE(wxRESIZE_BOX); + XRC_ADD_STYLE(wxCLOSE_BOX); + XRC_ADD_STYLE(wxDIALOG_MODAL); + XRC_ADD_STYLE(wxDIALOG_MODELESS); + XRC_ADD_STYLE(wxNO_3D); + XRC_ADD_STYLE(wxTAB_TRAVERSAL); + XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); + XRC_ADD_STYLE(wxCLIP_CHILDREN); + XRC_ADD_STYLE(wxMAXIMIZE_BOX); + XRC_ADD_STYLE(wxMINIMIZE_BOX); + AddWindowStyles(); +} wxObject *wxDialogXmlHandler::DoCreateResource() -{ - wxDialog *dlg = wxDynamicCast(m_instance, wxDialog); - - wxASSERT_MSG(dlg, _("XRC resource: Cannot create dialog without instance.")); - +{ + XRC_MAKE_INSTANCE(dlg, wxDialog); + dlg->Create(m_parentAsWindow, GetID(), GetText(wxT("title")), wxDefaultPosition, wxDefaultSize, GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE), GetName()); - dlg->SetClientSize(GetSize()); - dlg->Move(GetPosition()); + + if (HasParam(wxT("size"))) + dlg->SetClientSize(GetSize()); + if (HasParam(wxT("pos"))) + dlg->Move(GetPosition()); + SetupWindow(dlg); CreateChildren(dlg); - - if (GetBool(_("centered"), FALSE)) + + if (GetBool(wxT("centered"), FALSE)) dlg->Centre(); - + return dlg; } - - bool wxDialogXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxDialog")); } - -