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 63b20bd8923fed476823c83e721b0b02d98fce5b..e4663a5b8ff983a0b52f84027c1c6233dee25bd3 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // CVS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
 // Author:      Vaclav Slavik
 // CVS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_XPMDECOD_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_XPMDECOD_H_


@@ -14,11 +14,11 @@
 #pragma interface "xpmdecod.h"
 #endif
 
 #pragma interface "xpmdecod.h"
 #endif
 

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

 
 
 
 

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

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