fixed wxImage->wxBitmap conversion for images with alpha channel

[wxWidgets.git] / include / wx / iconbndl.h

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index e70715ff7a19779ed9d6f4c49259849149929b9e..001530f0085eb776ddb92034a30c43ae428f701a 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "iconbndl.h"
 #endif
 
@@ -20,8 +20,8 @@
 // for wxSize
 #include "wx/gdicmn.h"
 
-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxString;
+class WXDLLIMPEXP_CORE wxIcon;
+class WXDLLIMPEXP_BASE wxString;
 
 WX_DECLARE_EXPORTED_OBJARRAY( wxIcon, wxIconArray );