X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..1fa29bdc254c03dd5026a4b72aa8312667178121:/include/wx/intl.h diff --git a/include/wx/intl.h b/include/wx/intl.h index add1baa455..d08acae0c9 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -12,7 +12,7 @@ #ifndef _WX_INTL_H_ #define _WX_INTL_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "intl.h" #endif @@ -45,9 +45,9 @@ // forward decls // ---------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxLocale; -class WXDLLEXPORT_BASE wxMsgCatalog; -class WXDLLEXPORT_BASE wxLanguageInfoArray; +class WXDLLIMPEXP_BASE wxLocale; +class WXDLLIMPEXP_BASE wxMsgCatalog; +class WXDLLIMPEXP_BASE wxLanguageInfoArray; // ============================================================================ // locale support @@ -308,7 +308,7 @@ enum wxLanguage // translation information // ---------------------------------------------------------------------------- -struct WXDLLEXPORT_BASE wxLanguageInfo +struct WXDLLIMPEXP_BASE wxLanguageInfo { int Language; // wxLanguage id wxString CanonicalName; // Canonical name, e.g. fr_FR @@ -362,7 +362,7 @@ enum wxLocaleInitFlags wxLOCALE_CONV_ENCODING = 0x0002 // convert encoding on the fly? }; -class WXDLLEXPORT_BASE wxLocale +class WXDLLIMPEXP_BASE wxLocale { public: // ctor & dtor @@ -522,7 +522,7 @@ private: // ---------------------------------------------------------------------------- // get the current locale object (note that it may be NULL!) -extern WXDLLEXPORT_BASE wxLocale* wxGetLocale(); +extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale(); // get the translation of the string in the current locale inline const wxChar *wxGetTranslation(const wxChar *sz)