no significant changes

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

diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index dec1db540e1cac5bec961e332d56c608e74bec3b..a52b8075aafa79c0a3bc38482b3778b400c2c795 100644 (file)
--- a/src/xrc/xh_gauge.cpp
+++ b/src/xrc/xh_gauge.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_gauge.cpp
-// Purpose:     XML resource for wxGauge
+// Purpose:     XRC resource for wxGauge
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
@@ -27,48 +27,46 @@
 wxGaugeXmlHandler::wxGaugeXmlHandler() 
 : wxXmlResourceHandler() 
 {
-    ADD_STYLE( wxGA_HORIZONTAL );
-    ADD_STYLE( wxGA_VERTICAL );
-    ADD_STYLE( wxGA_PROGRESSBAR );
-    ADD_STYLE( wxGA_SMOOTH );   // windows only
+    XRC_ADD_STYLE(wxGA_HORIZONTAL);
+    XRC_ADD_STYLE(wxGA_VERTICAL);
+    XRC_ADD_STYLE(wxGA_PROGRESSBAR);
+    XRC_ADD_STYLE(wxGA_SMOOTH);   // windows only
     AddWindowStyles();
 }
 
 wxObject *wxGaugeXmlHandler::DoCreateResource()
 { 
-    wxGauge *control = new wxGauge(m_parentAsWindow,
-                                    GetID(),
-                                    GetLong( wxT("range"), wxGAUGE_DEFAULT_RANGE), 
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
+    XRC_MAKE_INSTANCE(control, wxGauge)
 
-    if( HasParam( wxT("value") ))
+    control->Create(m_parentAsWindow,
+                    GetID(),
+                    GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE), 
+                    GetPosition(), GetSize(),
+                    GetStyle(),
+                    wxDefaultValidator,
+                    GetName());
+
+    if( HasParam(wxT("value")))
     {
-        control->SetValue( GetLong( wxT("value") ));
+        control->SetValue(GetLong(wxT("value")));
     }
-    if( HasParam( wxT("shadow") ))
+    if( HasParam(wxT("shadow")))
     {
-        control->SetShadowWidth( GetDimension( wxT("shadow") ));
+        control->SetShadowWidth(GetDimension(wxT("shadow")));
     }
-    if( HasParam( wxT("bezel") ))
+    if( HasParam(wxT("bezel")))
     {
-        control->SetBezelFace( GetDimension( wxT("bezel") ));
+        control->SetBezelFace(GetDimension(wxT("bezel")));
     }
 
     SetupWindow(control);
-    
+
     return control;
 }
 
-
-
 bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxGauge"));
 }
 
-
 #endif // wxUSE_GAUGE