X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adb0baf7d47585a654ffdde0a3fcb68999b51577..a766986f6d443ba1d50e3af25f3306fa56e4518e:/src/xrc/xh_statbar.cpp?ds=sidebyside diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp index a5e04452ef..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" @@ -19,18 +15,21 @@ #pragma hdrstop #endif -#include "wx/frame.h" -#include "wx/string.h" - -#if wxUSE_STATUSBAR +#if wxUSE_XRC && wxUSE_STATUSBAR #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(); @@ -47,6 +46,7 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource() int fields = GetLong(wxT("fields"), 1); wxString widths = GetParamValue(wxT("widths")); + wxString styles = GetParamValue(wxT("styles")); if (fields > 1 && !widths.IsEmpty()) { @@ -64,6 +64,32 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource() else statbar->SetFieldsCount(fields); + if (!styles.empty()) + { + int *style = new int[fields]; + for (int i = 0; i < fields; ++i) + { + style[i] = wxSB_NORMAL; + + wxString first = styles.BeforeFirst(wxT(',')); + if (first == wxT("wxSB_NORMAL")) + style[i] = wxSB_NORMAL; + else if (first == wxT("wxSB_FLAT")) + style[i] = wxSB_FLAT; + else if (first == wxT("wxSB_RAISED")) + style[i] = wxSB_RAISED; + 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); + } + statbar->SetStatusStyles(fields, style); + delete [] style; + } + + CreateChildren(statbar); + if (m_parentAsWindow) { wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame); @@ -79,5 +105,4 @@ bool wxStatusBarXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("wxStatusBar")); } -#endif - +#endif // wxUSE_XRC && wxUSE_STATUSBAR