added CreateSeparatedButtonSizer(), changed signature and semantics of CreateButtonSi...

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

diff --git a/include/wx/xrc/xh_bmpcbox.h b/include/wx/xrc/xh_bmpcbox.h
index 4772ac5937ed2d7fb535d520a11a19fb2a54d592..5b5e0624ef404b73c637d8f9cf27ebb4f51e5476 100644 (file)
--- a/include/wx/xrc/xh_bmpcbox.h
+++ b/include/wx/xrc/xh_bmpcbox.h
@@ -13,22 +13,24 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_BITMAPCOMBOBOX
+#if wxUSE_XRC && wxUSE_BITMAPCOMBOBOX

 
 class WXDLLIMPEXP_ADV wxBitmapComboBox;
 
 class WXDLLIMPEXP_XRC wxBitmapComboBoxXmlHandler : public wxXmlResourceHandler
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler)
 
 class WXDLLIMPEXP_ADV wxBitmapComboBox;
 
 class WXDLLIMPEXP_XRC wxBitmapComboBoxXmlHandler : public wxXmlResourceHandler
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler)

+

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

+

 private:
     wxBitmapComboBox*    m_combobox;
     bool                m_isInside;
 };
 
 private:
     wxBitmapComboBox*    m_combobox;
     bool                m_isInside;
 };
 

-#endif
+#endif // wxUSE_XRC && wxUSE_BITMAPCOMBOBOX

 
 #endif // _WX_XH_BMPCBOX_H_
 
 #endif // _WX_XH_BMPCBOX_H_