Remove defined(__WXMAC__) && defined(__APPLE__) case from the OS if/elif block.

[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 0fd54323744f3344f4a683a97feb70d67abb5c9c..ec72f2670abc9596fa6aad5a14c1a7b5cf0cf84f 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,25 +11,20 @@
 #ifndef _WX_XH_BMPBT_H_
 #define _WX_XH_BMPBT_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "xh_bmpbt.h"
-#endif
-
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_XRC
-
+#if wxUSE_XRC && wxUSE_BMPBUTTON
 
 class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
+
 public:
     wxBitmapButtonXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif // wxUSE_XRC
-
+#endif // wxUSE_XRC && wxUSE_BMPBUTTON
 
 #endif // _WX_XH_BMPBT_H_