Better fix

[wxWidgets.git] / include / wx / xrc / xh_slidr.h

diff --git a/include/wx/xrc/xh_slidr.h b/include/wx/xrc/xh_slidr.h
index 8e425b42949112a87cdb0d89440b423c3bc87070..345c03b6a5b23ce3f4710f721e3778eed4c6cca8 100644 (file)
--- a/include/wx/xrc/xh_slidr.h
+++ b/include/wx/xrc/xh_slidr.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_slidr.h
+// Name:        wx/xrc/xh_slidr.h

 // Purpose:     XML resource handler for wxSlider
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // Purpose:     XML resource handler for wxSlider
 // Author:      Bob Mitchell
 // Created:     2000/03/21


@@ -11,18 +11,13 @@
 #ifndef _WX_XH_SLIDR_H_
 #define _WX_XH_SLIDR_H_
 
 #ifndef _WX_XH_SLIDR_H_
 #define _WX_XH_SLIDR_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_slidr.h"
-#endif
-

 #include "wx/xrc/xmlres.h"
 #include "wx/xrc/xmlres.h"

-#include "wx/defs.h"

 
 

-#if wxUSE_SLIDER
+#if wxUSE_XRC && wxUSE_SLIDER

 
 class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
 {

-       DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)

     enum
     {
         wxSL_DEFAULT_VALUE = 0,
     enum
     {
         wxSL_DEFAULT_VALUE = 0,


@@ -36,6 +31,6 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
     virtual bool CanHandle(wxXmlNode *node);
 };
 

-#endif
+#endif // wxUSE_XRC && wxUSE_SLIDER

 
 

-#endif // _WX_XH_SLIDER_H_
+#endif // _WX_XH_SLIDR_H_