X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544fee32eeac1a4f6ca3e0c7c1b13ee24f1d1c1c..6a205442c40cd6e22efab15fd7170a0aeab99cae:/contrib/src/xrc/xh_frame.cpp diff --git a/contrib/src/xrc/xh_frame.cpp b/contrib/src/xrc/xh_frame.cpp index d4e47c1fff..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,6 +24,7 @@ #include "wx/log.h" #include "wx/intl.h" +IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler) wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler() { @@ -35,6 +36,7 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler() 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); @@ -51,11 +53,9 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler() } 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(wxT("title")), @@ -71,10 +71,10 @@ wxObject *wxFrameXmlHandler::DoCreateResource() SetupWindow(frame); CreateChildren(frame); - + if (GetBool(wxT("centered"), FALSE)) frame->Centre(); - + return frame; }