applied fixes for CodeWarrior compilation

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

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index 71b4812e7901c4424151bd31cce2fe8b49380fc8..249a514c2ac34793d53635c5019102963fd072e9 100644 (file)
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -10,7 +10,7 @@
 #ifndef _WX_ENCCONV_H_
 #define _WX_ENCCONV_H_
 
 #ifndef _WX_ENCCONV_H_
 #define _WX_ENCCONV_H_
 

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

 #pragma interface "encconv.h"
 #endif
 
 #pragma interface "encconv.h"
 #endif
 


@@ -55,7 +55,7 @@ WX_DEFINE_ARRAY_INT(wxFontEncoding, wxFontEncodingArray);
 //                  8bit encodings/charsets. It can also convert from/to Unicode
 //--------------------------------------------------------------------------------
 
 //                  8bit encodings/charsets. It can also convert from/to Unicode
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxEncodingConverter : public wxObject
+class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject

 {
     public:
 
 {
     public: