Warning fixes, source cleaning.

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

diff --git a/contrib/src/xrc/xh_stlin.cpp b/contrib/src/xrc/xh_stlin.cpp
index 5f9889a9295cc448aa8e0813e54016b62c989e12..9d49226eab0fc327dc1730c710f8d16bc8831f93 100644 (file)
--- a/contrib/src/xrc/xh_stlin.cpp
+++ b/contrib/src/xrc/xh_stlin.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
+
 #ifdef __GNUG__
 #pragma implementation "xh_stlin.h"
 #endif
@@ -24,20 +24,19 @@
 
 #if wxUSE_STATLINE
 
-wxStaticLineXmlHandler::wxStaticLineXmlHandler() 
-: wxXmlResourceHandler() 
+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 = wxStaticCast(m_instance, wxStaticLine);
-
-    if (!line)
-       line = new wxStaticLine;
+{
+    XRC_MAKE_INSTANCE(line, wxStaticLine)
 
     line->Create(m_parentAsWindow,
                 GetID(),
@@ -46,12 +45,10 @@ wxObject *wxStaticLineXmlHandler::DoCreateResource()
                 GetName());
 
     SetupWindow(line);
-    
+
     return line;
 }
 
-
-
 bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticLine"));