add a radio box to select the combobox type (#9845)

[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 a13e56ad0b5658d0b56a264fb8bc17a50c8ded6e..3f2899045e6cb9b5a385243f97589fcf0fefd160 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
 // Purpose:     XML resource handler for wxScrollBar
 // Author:      Brian Gavin
 // Created:     2000/09/09


@@ -11,18 +11,13 @@
 #ifndef _WX_XH_SCROL_H_
 #define _WX_XH_SCROL_H_
 
 #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/xrc/xmlres.h"

-#include "wx/defs.h"
-

 
 

+#if wxUSE_XRC && wxUSE_SCROLLBAR

 
 

-class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler

 {
 {

-       DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)

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


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

+#endif // wxUSE_XRC && wxUSE_SCROLLBAR

 
 #endif // _WX_XH_SCROL_H_
 
 #endif // _WX_XH_SCROL_H_