resource stack structure that sets up correct resource, new entry points for shared...

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

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index 8a77e6ae7b56c79c7087d7121fa254a54494b09e..a2d360643cb29166c9b1da0216402212ec53c389 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -24,40 +24,33 @@
 
 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_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);
     AddWindowStyles();
 }
 
 wxObject *wxTextCtrlXmlHandler::DoCreateResource()
 { 
-   wxTextCtrl *text = wxStaticCast(m_instance, wxTextCtrl);
+    XRC_MAKE_INSTANCE(text, wxTextCtrl)
 
-   if ( !text )
-       text = new 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;
 }
 
-
-
 bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTextCtrl"));
 }
-
-