Compilation fix for STL build in wxGtkCollatableString code.

[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..d846717f32ed26a36b8796255920141b059be35e 100644 (file)
--- a/include/wx/xrc/xh_bmpcbox.h
+++ b/include/wx/xrc/xh_bmpcbox.h
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     Sep-10-2006
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2006 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,22 +13,24 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_BITMAPCOMBOBOX
+#if wxUSE_XRC && wxUSE_BITMAPCOMBOBOX
 
-class WXDLLIMPEXP_ADV wxBitmapComboBox;
+class WXDLLIMPEXP_FWD_ADV wxBitmapComboBox;
 
 class WXDLLIMPEXP_XRC wxBitmapComboBoxXmlHandler : public wxXmlResourceHandler
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler)
+
 public:
     wxBitmapComboBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
 private:
     wxBitmapComboBox*    m_combobox;
     bool                m_isInside;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_BITMAPCOMBOBOX
 
 #endif // _WX_XH_BMPCBOX_H_