Incomplete setup build fix.

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

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index a2d360643cb29166c9b1da0216402212ec53c389..550c9e43f691fd8084db81a01f2ce5903926728f 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_text.h"
 #endif
 
 #pragma implementation "xh_text.h"
 #endif
 


@@ -19,22 +19,38 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_text.h"
 #include "wx/textctrl.h"
 
 #include "wx/xrc/xh_text.h"
 #include "wx/textctrl.h"
 

-wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(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);
     XRC_ADD_STYLE(wxTE_PASSWORD);
     XRC_ADD_STYLE(wxTE_READONLY);
     XRC_ADD_STYLE(wxHSCROLL);
     XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
     XRC_ADD_STYLE(wxTE_PROCESS_TAB);
     XRC_ADD_STYLE(wxTE_MULTILINE);
     XRC_ADD_STYLE(wxTE_PASSWORD);
     XRC_ADD_STYLE(wxTE_READONLY);
     XRC_ADD_STYLE(wxHSCROLL);

+    XRC_ADD_STYLE(wxTE_RICH);
+    XRC_ADD_STYLE(wxTE_RICH2);
+    XRC_ADD_STYLE(wxTE_AUTO_URL);
+    XRC_ADD_STYLE(wxTE_NOHIDESEL);
+    XRC_ADD_STYLE(wxTE_LEFT);
+    XRC_ADD_STYLE(wxTE_CENTRE);
+    XRC_ADD_STYLE(wxTE_RIGHT);
+    XRC_ADD_STYLE(wxTE_DONTWRAP);
+    XRC_ADD_STYLE(wxTE_LINEWRAP);
+    XRC_ADD_STYLE(wxTE_WORDWRAP);

     AddWindowStyles();
 }
 
 wxObject *wxTextCtrlXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxTextCtrlXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(text, wxTextCtrl)
 
     text->Create(m_parentAsWindow,
     XRC_MAKE_INSTANCE(text, wxTextCtrl)
 
     text->Create(m_parentAsWindow,


@@ -46,7 +62,7 @@ wxObject *wxTextCtrlXmlHandler::DoCreateResource()
                  GetName());
 
     SetupWindow(text);
                  GetName());
 
     SetupWindow(text);

-    
+

     return text;
 }
 
     return text;
 }
 


@@ -54,3 +70,5 @@ bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTextCtrl"));
 }
 {
     return IsOfClass(node, wxT("wxTextCtrl"));
 }

+
+#endif // wxUSE_XRC