X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..fe947a6116844e23acf8458512f452904a4f08f9:/contrib/src/xrc/xh_frame.cpp diff --git a/contrib/src/xrc/xh_frame.cpp b/contrib/src/xrc/xh_frame.cpp index c8168e6e2b..2fcbbd357f 100644 --- a/contrib/src/xrc/xh_frame.cpp +++ b/contrib/src/xrc/xh_frame.cpp @@ -7,7 +7,7 @@ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - + #ifdef __GNUG__ #pragma implementation "xh_frame.h" #endif @@ -24,62 +24,61 @@ #include "wx/log.h" #include "wx/intl.h" +IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler) wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE(wxSTAY_ON_TOP); - ADD_STYLE(wxCAPTION); - ADD_STYLE(wxDEFAULT_DIALOG_STYLE); - ADD_STYLE(wxDEFAULT_FRAME_STYLE); - ADD_STYLE(wxTHICK_FRAME); - ADD_STYLE(wxSYSTEM_MENU); - ADD_STYLE(wxRESIZE_BORDER); - ADD_STYLE(wxRESIZE_BOX); - - ADD_STYLE(wxFRAME_TOOL_WINDOW); - ADD_STYLE(wxFRAME_FLOAT_ON_PARENT); - ADD_STYLE(wxMAXIMIZE_BOX); - ADD_STYLE(wxMINIMIZE_BOX); - ADD_STYLE(wxSTAY_ON_TOP); - - ADD_STYLE(wxNO_3D); - ADD_STYLE(wxTAB_TRAVERSAL); - ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); - ADD_STYLE(wxCLIP_CHILDREN); + XRC_ADD_STYLE(wxSTAY_ON_TOP); + XRC_ADD_STYLE(wxCAPTION); + XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE); + XRC_ADD_STYLE(wxDEFAULT_FRAME_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(wxFRAME_TOOL_WINDOW); + XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT); + XRC_ADD_STYLE(wxMAXIMIZE_BOX); + XRC_ADD_STYLE(wxMINIMIZE_BOX); + XRC_ADD_STYLE(wxSTAY_ON_TOP); + + XRC_ADD_STYLE(wxNO_3D); + XRC_ADD_STYLE(wxTAB_TRAVERSAL); + XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); + XRC_ADD_STYLE(wxCLIP_CHILDREN); + AddWindowStyles(); } - - wxObject *wxFrameXmlHandler::DoCreateResource() -{ - wxFrame *frame = wxDynamicCast(m_instance, wxFrame); - - wxASSERT_MSG(frame, _("XRC resource: Cannot create dialog without instance.")); - +{ + XRC_MAKE_INSTANCE(frame, wxFrame); + frame->Create(m_parentAsWindow, - GetID(), - GetText(_T("title")), - wxDefaultPosition, wxDefaultSize, - GetStyle(_T("style"), wxDEFAULT_FRAME_STYLE), - GetName()); - frame->SetClientSize(GetSize()); - frame->Move(GetPosition()); + GetID(), + GetText(wxT("title")), + wxDefaultPosition, wxDefaultSize, + GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE), + GetName()); + + if (HasParam(wxT("size"))) + frame->SetClientSize(GetSize()); + if (HasParam(wxT("pos"))) + frame->Move(GetPosition()); + SetupWindow(frame); CreateChildren(frame); - - if (GetBool(_("centered"), FALSE)) + + if (GetBool(wxT("centered"), FALSE)) frame->Centre(); - + return frame; } - - bool wxFrameXmlHandler::CanHandle(wxXmlNode *node) { - return IsOfClass(node, _T("wxFrame")); + return IsOfClass(node, wxT("wxFrame")); } - -