reverting part of Kevin O's patch, due to incompatibility problems

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

diff --git a/src/xrc/xh_stlin.cpp b/src/xrc/xh_stlin.cpp
index 72955efbaee59b5bf1730ed6ca9ae98100af0c3e..7cc5abc08bbae0bd7c48a8fad59b7e076289374e 100644 (file)
--- a/src/xrc/xh_stlin.cpp
+++ b/src/xrc/xh_stlin.cpp
@@ -24,29 +24,31 @@
 
 #if wxUSE_STATLINE
 
+IMPLEMENT_DYNAMIC_CLASS(wxStaticLineXmlHandler, wxXmlResourceHandler)
+
 wxStaticLineXmlHandler::wxStaticLineXmlHandler() 
 : wxXmlResourceHandler() 
 {
-    ADD_STYLE(wxLI_HORIZONTAL);
-    ADD_STYLE(wxLI_VERTICAL);
+    XRC_ADD_STYLE(wxLI_HORIZONTAL);
+    XRC_ADD_STYLE(wxLI_VERTICAL);
     AddWindowStyles();
 }
 
 wxObject *wxStaticLineXmlHandler::DoCreateResource()
 { 
-    wxStaticLine *line = new wxStaticLine(m_parentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(wxT("style"), wxLI_HORIZONTAL),
-                                    GetName()
-                                    );
+    XRC_MAKE_INSTANCE(line, wxStaticLine)
+
+    line->Create(m_parentAsWindow,
+                GetID(),
+                GetPosition(), GetSize(),
+                GetStyle(wxT("style"), wxLI_HORIZONTAL),
+                GetName());
+
     SetupWindow(line);
     
     return line;
 }
 
-
-
 bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticLine"));