Fix wxRegKey::GetKeyInfo() output parameters in 64 bit builds.

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

diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp
index acf894537d0409bef6c3bd1b3c84a7b1dd3b411e..b888d71de995c48c738b0e44ecd4aaa3ae420207 100644 (file)
--- a/src/xrc/xh_slidr.cpp
+++ b/src/xrc/xh_slidr.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_slidr.cpp
+// Name:        src/xrc/xh_slidr.cpp
 // Purpose:     XRC resource for wxSlider
 // 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_slidr.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,13 +15,23 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_SLIDER
+
 #include "wx/xrc/xh_slidr.h"
-#include "wx/slider.h"
 
-#if wxUSE_SLIDER
+#ifndef WX_PRECOMP
+    #include "wx/slider.h"
+#endif
+
+static const long DEFAULT_VALUE = 0;
+static const long DEFAULT_MIN = 0;
+static const long DEFAULT_MAX = 100;
+
 
-wxSliderXmlHandler::wxSliderXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
+
+wxSliderXmlHandler::wxSliderXmlHandler()
+                   :wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxSL_HORIZONTAL);
     XRC_ADD_STYLE(wxSL_VERTICAL);
@@ -37,18 +43,19 @@ wxSliderXmlHandler::wxSliderXmlHandler()
     XRC_ADD_STYLE(wxSL_BOTTOM);
     XRC_ADD_STYLE(wxSL_BOTH);
     XRC_ADD_STYLE(wxSL_SELRANGE);
+    XRC_ADD_STYLE(wxSL_INVERSE);
     AddWindowStyles();
 }
 
 wxObject *wxSliderXmlHandler::DoCreateResource()
-{ 
+{
     XRC_MAKE_INSTANCE(control, wxSlider)
 
     control->Create(m_parentAsWindow,
                     GetID(),
-                    GetLong(wxT("value"), wxSL_DEFAULT_VALUE), 
-                    GetLong(wxT("min"), wxSL_DEFAULT_MIN),
-                    GetLong(wxT("max"), wxSL_DEFAULT_MAX),
+                    GetLong(wxT("value"), DEFAULT_VALUE),
+                    GetLong(wxT("min"), DEFAULT_MIN),
+                    GetLong(wxT("max"), DEFAULT_MAX),
                     GetPosition(), GetSize(),
                     GetStyle(),
                     wxDefaultValidator,
@@ -56,7 +63,7 @@ wxObject *wxSliderXmlHandler::DoCreateResource()
 
     if( HasParam(wxT("tickfreq")))
     {
-        control->SetTickFreq(GetLong(wxT("tickfreq")), 0);
+        control->SetTickFreq(GetLong(wxT("tickfreq")));
     }
     if( HasParam(wxT("pagesize")))
     {
@@ -80,7 +87,7 @@ wxObject *wxSliderXmlHandler::DoCreateResource()
     }
 
     SetupWindow(control);
-    
+
     return control;
 }
 
@@ -89,4 +96,4 @@ bool wxSliderXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxSlider"));
 }
 
-#endif
+#endif // wxUSE_XRC && wxUSE_SLIDER