fixed virtual function hiding for LoadBitmap()

[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..eb8799aa658e6028c117f0069cdaeeeacfde52f4 100644 (file)
--- a/include/wx/xrc/xh_bmp.h
+++ b/include/wx/xrc/xh_bmp.h
@@ -11,14 +11,14 @@
 #ifndef _WX_XH_BMP_H_
 #define _WX_XH_BMP_H_
 
 #ifndef _WX_XH_BMP_H_
 #define _WX_XH_BMP_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "xh_bmp.h"
 #endif
 
 #include "wx/xrc/xmlres.h"
 
 
 #pragma interface "xh_bmp.h"
 #endif
 
 #include "wx/xrc/xmlres.h"
 
 

-class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler

 {
 DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
 public:


@@ -27,7 +27,7 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
     virtual bool CanHandle(wxXmlNode *node);
 };
 

-class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler

 {
 DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
 public: