X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78d14f80e9a72041ede52c30d912ec5cef21b1b3..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/xrc/xh_gauge.cpp?ds=sidebyside

diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index dec1db540e..99ce99a363 100644
--- a/src/xrc/xh_gauge.cpp
+++ b/src/xrc/xh_gauge.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_gauge.cpp
-// Purpose:     XML resource for wxGauge
+// Name:        src/xrc/xh_gauge.cpp
+// Purpose:     XRC resource for wxGauge
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_gauge.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,56 +15,63 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_GAUGE
+
 #include "wx/xrc/xh_gauge.h"
-#include "wx/gauge.h"
 
-#if wxUSE_GAUGE
+#ifndef WX_PRECOMP
+    #include "wx/gauge.h"
+#endif
+
+static const long DEFAULT_RANGE = 100;
+
+IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
 
-wxGaugeXmlHandler::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);
+#if WXWIN_COMPATIBILITY_2_6
+    XRC_ADD_STYLE(wxGA_PROGRESSBAR);
+#endif // WXWIN_COMPATIBILITY_2_6
+    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"), 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
+#endif // wxUSE_XRC && wxUSE_GAUGE