projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
let the DefWindowProc() process messages sent to RAS window, otherwise the system...
[wxWidgets.git]
/
src
/
xrc
/
xh_toolb.cpp
diff --git
a/src/xrc/xh_toolb.cpp
b/src/xrc/xh_toolb.cpp
index 526a3a937712b99bad667ad9a60049d16c5a29e0..31513e75b14b231dec35e20b8d5f3c87319e5ef2 100644
(file)
--- a/
src/xrc/xh_toolb.cpp
+++ b/
src/xrc/xh_toolb.cpp
@@
-28,14
+28,12
@@
wxToolBarXmlHandler::wxToolBarXmlHandler()
: wxXmlResourceHandler(), m_isInside(FALSE), m_toolbar(NULL)
{
wxToolBarXmlHandler::wxToolBarXmlHandler()
: wxXmlResourceHandler(), m_isInside(FALSE), m_toolbar(NULL)
{
- ADD_STYLE(wxTB_FLAT);
- ADD_STYLE(wxTB_DOCKABLE);
- ADD_STYLE(wxTB_VERTICAL);
- ADD_STYLE(wxTB_HORIZONTAL);
+
XRC_
ADD_STYLE(wxTB_FLAT);
+
XRC_
ADD_STYLE(wxTB_DOCKABLE);
+
XRC_
ADD_STYLE(wxTB_VERTICAL);
+
XRC_
ADD_STYLE(wxTB_HORIZONTAL);
}
}
-
-
wxObject *wxToolBarXmlHandler::DoCreateResource()
{
if (m_class == wxT("tool"))
wxObject *wxToolBarXmlHandler::DoCreateResource()
{
if (m_class == wxT("tool"))
@@
-67,10
+65,7
@@
wxObject *wxToolBarXmlHandler::DoCreateResource()
if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
#endif
if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
#endif
- wxToolBar *toolbar = wxStaticCast(m_instance, wxToolBar);
-
- if ( !toolbar )
- toolbar = new wxToolBar;
+ XRC_MAKE_INSTANCE(toolbar, wxToolBar)
toolbar->Create(m_parentAsWindow,
GetID(),
toolbar->Create(m_parentAsWindow,
GetID(),
@@
-135,8
+130,6
@@
wxObject *wxToolBarXmlHandler::DoCreateResource()
}
}
}
}
-
-
bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
{
return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) ||
bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
{
return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) ||