Warning fixes, source cleaning.

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

diff --git a/contrib/src/xrc/xh_gauge.cpp b/contrib/src/xrc/xh_gauge.cpp
index 4c692b9cbfd9e6a2c5db39d212ad78e4b72dc4b5..2f3dad0c44076d5515ba27ebc6722ece16c3c512 100644 (file)
--- a/contrib/src/xrc/xh_gauge.cpp
+++ b/contrib/src/xrc/xh_gauge.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

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


@@ -24,55 +24,51 @@
 
 #if wxUSE_GAUGE
 
 
 #if wxUSE_GAUGE
 

-wxGaugeXmlHandler::wxGaugeXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
+
+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()
     AddWindowStyles();
 }
 
 wxObject *wxGaugeXmlHandler::DoCreateResource()

-{ 
-    wxGauge *control = wxStaticCast(m_instance, wxGauge);
-
-    if (!control)
-       control = new wxGauge;
+{
+    XRC_MAKE_INSTANCE(control, wxGauge)

 
     control->Create(m_parentAsWindow,
                     GetID(),
 
     control->Create(m_parentAsWindow,
                     GetID(),

-                    GetLong( wxT("range"), wxGAUGE_DEFAULT_RANGE), 
+                    GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE),

                     GetPosition(), GetSize(),
                     GetStyle(),
                     wxDefaultValidator,
                     GetName());
 
                     GetPosition(), GetSize(),
                     GetStyle(),
                     wxDefaultValidator,
                     GetName());
 

-    if( HasParam( wxT("value") ))
+    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);
     }
 
     SetupWindow(control);

-    
+

     return control;
 }
 
     return control;
 }
 

-
-

 bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxGauge"));
 }
 
 bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxGauge"));
 }
 

-

 #endif // wxUSE_GAUGE
 #endif // wxUSE_GAUGE