Some code renaming to avoid confusion. Test editable column in sample.

[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 719be7264de43a9e8596c87ca808a567230826b1..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
@@ -11,19 +11,20 @@
 #ifndef _WX_XH_BTTN_H_
 #define _WX_XH_BTTN_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_bttn.h"
-#endif
-
 #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);
 };
 
+#endif // wxUSE_XRC && wxUSE_BUTTON
 
 #endif // _WX_XH_BTTN_H_