Merge in from trunk r68626 - r68683

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

diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index 2b8a9b97910fe736eb723882a5cab01c5985ba8b..99ce99a3637530936c2708365459f0638e2cce01 100644 (file)
--- a/src/xrc/xh_gauge.cpp
+++ b/src/xrc/xh_gauge.cpp
@@ -18,12 +18,17 @@
 #if wxUSE_XRC && wxUSE_GAUGE
 
 #include "wx/xrc/xh_gauge.h"
 #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()
 
 IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
 
 wxGaugeXmlHandler::wxGaugeXmlHandler()

-: wxXmlResourceHandler()
+                  :wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxGA_HORIZONTAL);
     XRC_ADD_STYLE(wxGA_VERTICAL);
 {
     XRC_ADD_STYLE(wxGA_HORIZONTAL);
     XRC_ADD_STYLE(wxGA_VERTICAL);


@@ -40,7 +45,7 @@ wxObject *wxGaugeXmlHandler::DoCreateResource()
 
     control->Create(m_parentAsWindow,
                     GetID(),
 
     control->Create(m_parentAsWindow,
                     GetID(),

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

                     GetPosition(), GetSize(),
                     GetStyle(),
                     wxDefaultValidator,
                     GetPosition(), GetSize(),
                     GetStyle(),
                     wxDefaultValidator,