projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implemented clipping for controls via callback (classic only)
[wxWidgets.git]
/
src
/
xrc
/
xh_sttxt.cpp
diff --git
a/src/xrc/xh_sttxt.cpp
b/src/xrc/xh_sttxt.cpp
index 7aba85fda8432d0bae72e358b4167f9031758ec1..955642ed64a8176b519ca63c1fa8ab042191b522 100644
(file)
--- a/
src/xrc/xh_sttxt.cpp
+++ b/
src/xrc/xh_sttxt.cpp
@@
-25,19
+25,16
@@
wxStaticTextXmlHandler::wxStaticTextXmlHandler()
: wxXmlResourceHandler()
{
wxStaticTextXmlHandler::wxStaticTextXmlHandler()
: wxXmlResourceHandler()
{
- ADD_STYLE(wxST_NO_AUTORESIZE);
- ADD_STYLE(wxALIGN_LEFT);
- ADD_STYLE(wxALIGN_RIGHT);
- ADD_STYLE(wxALIGN_CENTRE);
+
XRC_
ADD_STYLE(wxST_NO_AUTORESIZE);
+
XRC_
ADD_STYLE(wxALIGN_LEFT);
+
XRC_
ADD_STYLE(wxALIGN_RIGHT);
+
XRC_
ADD_STYLE(wxALIGN_CENTRE);
AddWindowStyles();
}
wxObject *wxStaticTextXmlHandler::DoCreateResource()
{
AddWindowStyles();
}
wxObject *wxStaticTextXmlHandler::DoCreateResource()
{
- wxStaticText *text = wxStaticCast(m_instance, wxStaticText);
-
- if (!text)
- text = new wxStaticText;
+ XRC_MAKE_INSTANCE(text, wxStaticText)
text->Create(m_parentAsWindow,
GetID(),
text->Create(m_parentAsWindow,
GetID(),
@@
-51,11
+48,7
@@
wxObject *wxStaticTextXmlHandler::DoCreateResource()
return text;
}
return text;
}
-
-
bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, wxT("wxStaticText"));
}
bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, wxT("wxStaticText"));
}
-
-