Compilation fix for STL build in wxGtkCollatableString code.

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

diff --git a/include/wx/xrc/xh_bmp.h b/include/wx/xrc/xh_bmp.h
index eda67ffd506efe8186a60f407a6f73a39dfdd422..da40ac9426a744977df325e461c930d4bc0aa5d9 100644 (file)
--- a/include/wx/xrc/xh_bmp.h
+++ b/include/wx/xrc/xh_bmp.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmp.h
+// Name:        wx/xrc/xh_bmp.h
 // Purpose:     XML resource handler for wxBitmap and wxIcon
 // Author:      Vaclav Slavik
 // Created:     2000/09/00
@@ -11,30 +11,30 @@
 #ifndef _WX_XH_BMP_H_
 #define _WX_XH_BMP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_bmp.h"
-#endif
-
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC
 
-class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
+
 public:
     wxBitmapXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
+
 public:
     wxIconXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_BMP_H_