inherit wx_error_mgr from jpeg_error_mgr instead of embedding the latter in the forme...

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

diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp
index e71a5fd41a506ace13cdb00d705141ae3fa128b2..c34926df31ac1273241a871f72f5f1cce4449da5 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
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_slidr.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,15 +15,18 @@
     #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
 
 IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
 
 wxSliderXmlHandler::wxSliderXmlHandler()
-: wxXmlResourceHandler()
+                   :wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxSL_HORIZONTAL);
     XRC_ADD_STYLE(wxSL_VERTICAL);
@@ -39,6 +38,7 @@ wxSliderXmlHandler::wxSliderXmlHandler()
     XRC_ADD_STYLE(wxSL_BOTTOM);
     XRC_ADD_STYLE(wxSL_BOTH);
     XRC_ADD_STYLE(wxSL_SELRANGE);
+    XRC_ADD_STYLE(wxSL_INVERSE);
     AddWindowStyles();
 }
 
@@ -91,4 +91,4 @@ bool wxSliderXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxSlider"));
 }
 
-#endif
+#endif // wxUSE_XRC && wxUSE_SLIDER