Return valid pointers from wxDateTime::ParseXXX() with non-wxString strings.

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


@@ -11,29 +11,20 @@
 #ifndef _WX_XH_SCROL_H_
 #define _WX_XH_SCROL_H_
 
 #ifndef _WX_XH_SCROL_H_
 #define _WX_XH_SCROL_H_
 

-#ifdef __GNUG__
-#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

 {
 {

-    enum
-    {
-        wxSL_DEFAULT_VALUE = 0,
-        wxSL_DEFAULT_MIN = 0,
-        wxSL_DEFAULT_MAX = 100
-    };
-

 public:
     wxScrollBarXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 public:
     wxScrollBarXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);

+
+    DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)

 };
 
 };
 

+#endif // wxUSE_XRC && wxUSE_SCROLLBAR

 
 #endif // _WX_XH_SCROL_H_
 
 #endif // _WX_XH_SCROL_H_