Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/xrc/xh_scwin.h b/include/wx/xrc/xh_scwin.h
index 1befc4121583889225db0c6f018c731807e92be7..64723dc446a1fbcada503e864f331faa96caa1fc 100644 (file)
--- a/include/wx/xrc/xh_scwin.h
+++ b/include/wx/xrc/xh_scwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     XML resource handler for wxScrolledWindow
 // Author:      Vaclav Slavik
 // Created:     2002/10/18
 // Purpose:     XML resource handler for wxScrolledWindow
 // Author:      Vaclav Slavik
 // Created:     2002/10/18


@@ -11,22 +11,20 @@
 #ifndef _WX_XH_SCWIN_H_
 #define _WX_XH_SCWIN_H_
 
 #ifndef _WX_XH_SCWIN_H_
 #define _WX_XH_SCWIN_H_
 

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

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

-#include "wx/defs.h"
-

 
 

+#if wxUSE_XRC

 
 

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

 {
 {

+    DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler)
+

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

+#endif // wxUSE_XRC

 
 #endif // _WX_XH_SCWIN_H_
 
 #endif // _WX_XH_SCWIN_H_