X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df91131cb0f90ee8bfb194926a13b1a108ca3c6e..90e10cd1bedc5cac1ce1b5331d6fd2a351014cfa:/src/xrc/xh_statbar.cpp?ds=inline diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp index c49c0c33a4..fbf25f189f 100644 --- a/src/xrc/xh_statbar.cpp +++ b/src/xrc/xh_statbar.cpp @@ -21,19 +21,26 @@ #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/statusbr.h" #endif -#include "wx/frame.h" -#include "wx/log.h" - -#include "wx/statusbr.h" - IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler) -wxStatusBarXmlHandler::wxStatusBarXmlHandler() : - wxXmlResourceHandler() +wxStatusBarXmlHandler::wxStatusBarXmlHandler() + :wxXmlResourceHandler() { + XRC_ADD_STYLE(wxSTB_SIZEGRIP); + XRC_ADD_STYLE(wxSTB_SHOW_TIPS); + XRC_ADD_STYLE(wxSTB_ELLIPSIZE_START); + XRC_ADD_STYLE(wxSTB_ELLIPSIZE_MIDDLE); + XRC_ADD_STYLE(wxSTB_ELLIPSIZE_END); + XRC_ADD_STYLE(wxSTB_DEFAULT_STYLE); + + // compat style name: XRC_ADD_STYLE(wxST_SIZEGRIP); + AddWindowStyles(); } @@ -80,9 +87,19 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource() style[i] = wxSB_FLAT; else if (first == wxT("wxSB_RAISED")) style[i] = wxSB_RAISED; + else if (!first.empty()) + { + ReportParamError + ( + "styles", + wxString::Format + ( + "unknown status bar field style \"%s\"", + first + ) + ); + } - if (!first.empty()) - wxLogError(wxT("Error in resource, unknown statusbar field style: ") + first); if(styles.Find(wxT(','))) styles.Remove(0, styles.Find(wxT(',')) + 1); } @@ -90,6 +107,8 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource() delete [] style; } + CreateChildren(statbar); + if (m_parentAsWindow) { wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);