added wxTo/FromString() overloads for wxFont (1st part of patch 1760073)

[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 c44c9ea571d1e718c21712c9fcefd117f1150c63..ec72f2670abc9596fa6aad5a14c1a7b5cf0cf84f 100644 (file)
--- a/include/wx/xrc/xh_bmpbt.h
+++ b/include/wx/xrc/xh_bmpbt.h
@@ -11,22 +11,20 @@
 #ifndef _WX_XH_BMPBT_H_
 #define _WX_XH_BMPBT_H_
 
 #ifndef _WX_XH_BMPBT_H_
 #define _WX_XH_BMPBT_H_
 

-#include "wx/defs.h"
-
-#if wxUSE_XRC
-

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

+#if wxUSE_XRC && wxUSE_BMPBUTTON
+

 class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {
 class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
+

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

-#endif // wxUSE_XRC
-
+#endif // wxUSE_XRC && wxUSE_BMPBUTTON

 
 #endif // _WX_XH_BMPBT_H_
 
 #endif // _WX_XH_BMPBT_H_