Support for G_FILENAME_ENCODING=@locale

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

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index 13c1e86b9ee608cad8b786f7bcdd86a070ceaf44..e4663a5b8ff983a0b52f84027c1c6233dee25bd3 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -10,16 +10,15 @@
 #ifndef _WX_XPMDECOD_H_
 #define _WX_XPMDECOD_H_
 
 #ifndef _WX_XPMDECOD_H_
 #define _WX_XPMDECOD_H_
 

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

 #pragma interface "xpmdecod.h"
 #endif
 
 #pragma interface "xpmdecod.h"
 #endif
 

-#include "wx/setup.h"
+#include "wx/defs.h"

 
 

-#if wxUSE_IMAGE && wxUSE_XPM

 
 

-class WXDLLEXPORT wxImage;
-class WXDLLEXPORT wxInputStream;
+class WXDLLIMPEXP_CORE wxImage;
+class WXDLLIMPEXP_BASE wxInputStream;

 
 // --------------------------------------------------------------------------
 // wxXPMDecoder class
 
 // --------------------------------------------------------------------------
 // wxXPMDecoder class


@@ -43,6 +42,5 @@ public:
 };
 
 
 };
 
 

-#endif  // wxUSE_IMAGE && wxUSE_XPM

 #endif  // _WX_GIFDECOD_H_
 
 #endif  // _WX_GIFDECOD_H_