renamed wxRect::Inside() to wxRect::Contains(), wxRect::Inside(wxRect) is too confusing

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

diff --git a/include/wx/xrc/xh_bmpbt.h b/include/wx/xrc/xh_bmpbt.h
index 3be9eb5e0e9ced234bd09dfd040dfa66b98e1497..c44c9ea571d1e718c21712c9fcefd117f1150c63 100644 (file)
--- a/include/wx/xrc/xh_bmpbt.h
+++ b/include/wx/xrc/xh_bmpbt.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmpbt.h
+// Name:        wx/xrc/xh_bmpbt.h
 // Purpose:     XML resource handler for bitmap buttons
 // Author:      Brian Gavin
 // Created:     2000/03/05
@@ -11,14 +11,13 @@
 #ifndef _WX_XH_BMPBT_H_
 #define _WX_XH_BMPBT_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_bmpbt.h"
-#endif
+#include "wx/defs.h"
 
-#include "wx/xrc/xmlres.h"
+#if wxUSE_XRC
 
+#include "wx/xrc/xmlres.h"
 
-class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {
 DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
 public:
@@ -27,5 +26,7 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC
+
 
 #endif // _WX_XH_BMPBT_H_