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 9418de0f3aca7571243e06a217144cd47c314b91..9d49226eab0fc327dc1730c710f8d16bc8831f93 100644 (file)
--- a/contrib/src/xrc/xh_stlin.cpp
+++ b/contrib/src/xrc/xh_stlin.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp

-// Purpose:     XML resource for wxStaticLine
+// Purpose:     XRC resource for wxStaticLine

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_stlin.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_stlin.h"
 #endif


@@ -24,29 +24,31 @@
 
 #if wxUSE_STATLINE
 
 
 #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()
     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);
     SetupWindow(line);

-    
+

     return line;
 }
 
     return line;
 }
 

-
-

 bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticLine"));
 bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticLine"));