X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da86e1776517d2403a687de08947698f5a608219..5d2be7cc55d83b6e5a7597add2fef248ab3c558f:/src/xrc/xh_gauge.cpp

diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index d10a958a7b..99ce99a363 100644
--- 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
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_gauge.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,19 +15,26 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_GAUGE
+#if wxUSE_XRC && wxUSE_GAUGE
 
 #include "wx/xrc/xh_gauge.h"
-#include "wx/gauge.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gauge.h"
+#endif
+
+static const long DEFAULT_RANGE = 100;
 
 IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
 
 wxGaugeXmlHandler::wxGaugeXmlHandler()
-: wxXmlResourceHandler()
+                  :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();
 }
@@ -42,7 +45,7 @@ wxObject *wxGaugeXmlHandler::DoCreateResource()
 
     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_XML && wxUSE_XRC && wxUSE_GAUGE
+#endif // wxUSE_XRC && wxUSE_GAUGE