reverted Robert's over-optimisation, correct fix coming soon

[wxWidgets.git] / src / xrc / xh_text.cpp

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index 4d4e88413a50f0252bb3d94f59908703e8523439..745189008dec2f598a113873fa6f2e1eddaf6e7f 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
+
 #ifdef __GNUG__
 #pragma implementation "xh_text.h"
 #endif
@@ -19,13 +19,17 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_text.h"
 #include "wx/textctrl.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler)
 
-wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler() 
+wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
 {
+    XRC_ADD_STYLE(wxTE_NO_VSCROLL);
+    XRC_ADD_STYLE(wxTE_AUTO_SCROLL);
     XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
     XRC_ADD_STYLE(wxTE_PROCESS_TAB);
     XRC_ADD_STYLE(wxTE_MULTILINE);
@@ -46,7 +50,7 @@ wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
 }
 
 wxObject *wxTextCtrlXmlHandler::DoCreateResource()
-{ 
+{
     XRC_MAKE_INSTANCE(text, wxTextCtrl)
 
     text->Create(m_parentAsWindow,
@@ -58,7 +62,7 @@ wxObject *wxTextCtrlXmlHandler::DoCreateResource()
                  GetName());
 
     SetupWindow(text);
-    
+
     return text;
 }
 
@@ -66,3 +70,5 @@ bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTextCtrl"));
 }
+
+#endif // wxUSE_XRC