projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor wxXRC to allow defining handlers outside of xrc library.
[wxWidgets.git]
/
src
/
xrc
/
xh_statbar.cpp
diff --git
a/src/xrc/xh_statbar.cpp
b/src/xrc/xh_statbar.cpp
index fc701a23f7933e5d54516df636a22f4842dd2bae..fbf25f189f8337b935760f3f9d9c402851fc88a1 100644
(file)
--- a/
src/xrc/xh_statbar.cpp
+++ b/
src/xrc/xh_statbar.cpp
@@
-31,7
+31,16
@@
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);
XRC_ADD_STYLE(wxST_SIZEGRIP);
+
AddWindowStyles();
}
AddWindowStyles();
}
@@
-78,9
+87,19
@@
wxObject *wxStatusBarXmlHandler::DoCreateResource()
style[i] = wxSB_FLAT;
else if (first == wxT("wxSB_RAISED"))
style[i] = wxSB_RAISED;
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);
}
if(styles.Find(wxT(',')))
styles.Remove(0, styles.Find(wxT(',')) + 1);
}
@@
-88,6
+107,8
@@
wxObject *wxStatusBarXmlHandler::DoCreateResource()
delete [] style;
}
delete [] style;
}
+ CreateChildren(statbar);
+
if (m_parentAsWindow)
{
wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
if (m_parentAsWindow)
{
wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);