Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/xrc/xh_bttn.h b/include/wx/xrc/xh_bttn.h
index c6c89c34a195d89ab7cc72f8e16e484def98dca2..88018268b6703d88e723ea273ca75cfadcd8180b 100644 (file)
--- a/include/wx/xrc/xh_bttn.h
+++ b/include/wx/xrc/xh_bttn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     XML resource handler for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // Purpose:     XML resource handler for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05


@@ -11,19 +11,20 @@
 #ifndef _WX_XH_BTTN_H_
 #define _WX_XH_BTTN_H_
 
 #ifndef _WX_XH_BTTN_H_
 #define _WX_XH_BTTN_H_
 

-#ifdef __GNUG__
-#pragma interface "xh_bttn.h"
-#endif
-

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

-class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
+#if wxUSE_XRC && wxUSE_BUTTON
+
+class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler

 {
 {

+    DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler)
+

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

+#endif // wxUSE_XRC && wxUSE_BUTTON

 
 #endif // _WX_XH_BTTN_H_
 
 #endif // _WX_XH_BTTN_H_