(blind) fix for gcc 3.4 warning for an always true comparison in an assert

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

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index 8a77e6ae7b56c79c7087d7121fa254a54494b09e..3e89a272ced29e6342a07953c1058ac534f56749 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -22,42 +22,49 @@
 #include "wx/xrc/xh_text.h"
 #include "wx/textctrl.h"
 
 #include "wx/xrc/xh_text.h"
 #include "wx/textctrl.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler)
+

 wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler() 
 {
 wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler() 
 {

-    ADD_STYLE(wxTE_PROCESS_ENTER);
-    ADD_STYLE(wxTE_PROCESS_TAB);
-    ADD_STYLE(wxTE_MULTILINE);
-    ADD_STYLE(wxTE_PASSWORD);
-    ADD_STYLE(wxTE_READONLY);
-    ADD_STYLE(wxHSCROLL);
+    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_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()
 { 

-   wxTextCtrl *text = wxStaticCast(m_instance, wxTextCtrl);
-
-   if ( !text )
-       text = new wxTextCtrl;
+    XRC_MAKE_INSTANCE(text, wxTextCtrl)

 
 

-   text->Create( m_parentAsWindow,
-                GetID(),
-                GetText(wxT("value")),
-                GetPosition(), GetSize(),
-                GetStyle(),
-                wxDefaultValidator,
-                GetName() );
+    text->Create(m_parentAsWindow,
+                 GetID(),
+                 GetText(wxT("value")),
+                 GetPosition(), GetSize(),
+                 GetStyle(),
+                 wxDefaultValidator,
+                 GetName());

 
     SetupWindow(text);
     
     return text;
 }
 
 
     SetupWindow(text);
     
     return text;
 }
 

-
-

 bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTextCtrl"));
 }
 bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTextCtrl"));
 }

-
-