projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.
[wxWidgets.git]
/
src
/
xrc
/
xh_sttxt.cpp
diff --git
a/src/xrc/xh_sttxt.cpp
b/src/xrc/xh_sttxt.cpp
index f3bb578bd69f604aa0cf971e8e48aa5b1e18c92e..9986696777e167084b8f288f924ea82bfde0434e 100644
(file)
--- a/
src/xrc/xh_sttxt.cpp
+++ b/
src/xrc/xh_sttxt.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_sttxt.cpp
+// Name:
src/xrc/
xh_sttxt.cpp
// Purpose: XRC resource for wxStaticText
// Author: Bob Mitchell
// Created: 2000/03/21
// Purpose: XRC resource for wxStaticText
// Author: Bob Mitchell
// Created: 2000/03/21
@@
-15,10
+15,13
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_XRC
+#if wxUSE_XRC
&& wxUSE_STATTEXT
#include "wx/xrc/xh_sttxt.h"
#include "wx/xrc/xh_sttxt.h"
-#include "wx/stattext.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/stattext.h"
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxStaticTextXmlHandler, wxXmlResourceHandler)
IMPLEMENT_DYNAMIC_CLASS(wxStaticTextXmlHandler, wxXmlResourceHandler)
@@
-37,14
+40,18
@@
wxObject *wxStaticTextXmlHandler::DoCreateResource()
XRC_MAKE_INSTANCE(text, wxStaticText)
text->Create(m_parentAsWindow,
XRC_MAKE_INSTANCE(text, wxStaticText)
text->Create(m_parentAsWindow,
-
GetID(),
-
GetText(wxT("label")),
-
GetPosition(), GetSize(),
-
GetStyle(),
-
GetName());
+ GetID(),
+ GetText(wxT("label")),
+ GetPosition(), GetSize(),
+ GetStyle(),
+ GetName());
SetupWindow(text);
SetupWindow(text);
+ long wrap = GetLong(wxT("wrap"), -1);
+ if (wrap != -1)
+ text->Wrap(wrap);
+
return text;
}
return text;
}
@@
-53,4
+60,4
@@
bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxStaticText"));
}
return IsOfClass(node, wxT("wxStaticText"));
}
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC
&& wxUSE_STATTEXT