Rename wxEllipsizeFlags elements to avoid confusion with wxEllipsizeMode.

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

diff --git a/include/wx/xrc/xh_scrol.h b/include/wx/xrc/xh_scrol.h
index ef1d3861d8e2ef384b9b898c535d7ccad1eeb2fb..64f4230842e82dec988638bbedfadeecebf2f22c 100644 (file)
--- a/include/wx/xrc/xh_scrol.h
+++ b/include/wx/xrc/xh_scrol.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_scrol.h
+// Name:        wx/xrc/xh_scrol.h
 // Purpose:     XML resource handler for wxScrollBar
 // Author:      Brian Gavin
 // Created:     2000/09/09
@@ -11,30 +11,20 @@
 #ifndef _WX_XH_SCROL_H_
 #define _WX_XH_SCROL_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_scrol.h"
-#endif
-
 #include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
-
 
+#if wxUSE_XRC && wxUSE_SCROLLBAR
 
 class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
 {
-       DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
-    enum
-    {
-        wxSL_DEFAULT_VALUE = 0,
-        wxSL_DEFAULT_MIN = 0,
-        wxSL_DEFAULT_MAX = 100
-    };
-
 public:
     wxScrollBarXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
+    DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
 };
 
+#endif // wxUSE_XRC && wxUSE_SCROLLBAR
 
 #endif // _WX_XH_SCROL_H_