X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1e4ec87317aa33fae6dbd8c55fbc699432d0026..a766986f6d443ba1d50e3af25f3306fa56e4518e:/src/xrc/xh_statbar.cpp?ds=sidebyside diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp index 5dead981da..fe14c250d7 100644 --- a/src/xrc/xh_statbar.cpp +++ b/src/xrc/xh_statbar.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_statbar.cpp +// Name: src/xrc/xh_statbar.cpp // Purpose: XRC resource for wxStatusBar // Author: Brian Ravnsgaard Riis // Created: 2004/01/21 @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "xh_statbar.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -21,17 +17,19 @@ #if wxUSE_XRC && wxUSE_STATUSBAR -#include "wx/frame.h" -#include "wx/string.h" -#include "wx/log.h" - #include "wx/xrc/xh_statbar.h" -#include "wx/statusbr.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/statusbr.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler) -wxStatusBarXmlHandler::wxStatusBarXmlHandler() : - wxXmlResourceHandler() +wxStatusBarXmlHandler::wxStatusBarXmlHandler() + :wxXmlResourceHandler() { XRC_ADD_STYLE(wxST_SIZEGRIP); AddWindowStyles(); @@ -66,7 +64,7 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource() else statbar->SetFieldsCount(fields); - if (!styles.IsEmpty()) + if (!styles.empty()) { int *style = new int[fields]; for (int i = 0; i < fields; ++i) @@ -80,9 +78,9 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource() style[i] = wxSB_FLAT; else if (first == wxT("wxSB_RAISED")) style[i] = wxSB_RAISED; - - if (!first.IsEmpty()) + else 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 +88,8 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource() delete [] style; } + CreateChildren(statbar); + if (m_parentAsWindow) { wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame); @@ -106,4 +106,3 @@ bool wxStatusBarXmlHandler::CanHandle(wxXmlNode *node) } #endif // wxUSE_XRC && wxUSE_STATUSBAR -