X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/xrc/xh_dlg.cpp?ds=sidebyside diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp index ab40e6da07..4cab711187 100644 --- a/src/xrc/xh_dlg.cpp +++ b/src/xrc/xh_dlg.cpp @@ -7,8 +7,8 @@ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "xh_dlg.h" #endif @@ -19,64 +19,72 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_dlg.h" #include "wx/dialog.h" +#include "wx/frame.h" #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(wxDIALOG_NO_PARENT); + XRC_ADD_STYLE(wxNO_3D); + XRC_ADD_STYLE(wxTAB_TRAVERSAL); + XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); + XRC_ADD_STYLE(wxDIALOG_EX_METAL); + XRC_ADD_STYLE(wxMAXIMIZE_BOX); + XRC_ADD_STYLE(wxMINIMIZE_BOX); + XRC_ADD_STYLE(wxFRAME_SHAPED); + 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()); + if (HasParam(wxT("size"))) - dlg->SetClientSize(GetSize()); + dlg->SetClientSize(GetSize(wxT("size"), dlg)); if (HasParam(wxT("pos"))) dlg->Move(GetPosition()); + if (HasParam(wxT("icon"))) + dlg->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON)); + SetupWindow(dlg); CreateChildren(dlg); - - if (GetBool(wxT("centered"), FALSE)) + + if (GetBool(wxT("centered"), false)) dlg->Centre(); - + return dlg; } - - bool wxDialogXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxDialog")); } - +#endif // wxUSE_XRC