Applied patch [ 1381895 ] remove circular include dependendcy in wxchar.h

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

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index 63b20bd8923fed476823c83e721b0b02d98fce5b..b3d0b0b1408a4654d35b9f29e1542159d24e1c3c 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -4,21 +4,17 @@
 // 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_
 #define _WX_XPMDECOD_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_XPMDECOD_H_
 #define _WX_XPMDECOD_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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