No real changes, just some minor cleanup of wxDirTraverserSumSize.

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

diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index 852f7bbd654afa35e4650505b4116e7a6f05df9f..99ce99a3637530936c2708365459f0638e2cce01 100644 (file)
--- a/src/xrc/xh_gauge.cpp
+++ b/src/xrc/xh_gauge.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_gauge.cpp
+// Name:        src/xrc/xh_gauge.cpp
 // Purpose:     XRC resource for wxGauge
 // Author:      Bob Mitchell
 // Created:     2000/03/21
@@ -7,10 +7,6 @@
 // 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,30 +15,37 @@
     #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()
 {
     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()
-{ 
+{
     XRC_MAKE_INSTANCE(control, wxGauge)
 
     control->Create(m_parentAsWindow,
                     GetID(),
-                    GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE), 
+                    GetLong(wxT("range"), DEFAULT_RANGE),
                     GetPosition(), GetSize(),
                     GetStyle(),
                     wxDefaultValidator,
@@ -71,4 +74,4 @@ bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxGauge"));
 }
 
-#endif // wxUSE_GAUGE
+#endif // wxUSE_XRC && wxUSE_GAUGE