X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..b3fcfa4d89d44425ed28050462c6064100fe7b05:/include/wx/fs_mem.h diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index be005401ed..a941c894f8 100644 --- a/include/wx/fs_mem.h +++ b/include/wx/fs_mem.h @@ -9,7 +9,14 @@ #ifndef _WX_FS_MEM_H_ #define _WX_FS_MEM_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__) +// Some older compilers (such as EMX) cannot handle +// #pragma interface/implementation correctly, iff +// #pragma implementation is used in _two_ translation +// units (as created by e.g. event.cpp compiled for +// libwx_base and event.cpp compiled for libwx_gui_core). +// So we must not use those pragmas for those compilers in +// such files. #pragma interface "fs_mem.h" #endif @@ -84,11 +91,12 @@ public: #if wxUSE_IMAGE static void AddFile(const wxString& filename, wxImage& image, long type); -#endif // wxUSE_IMAGE static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type); +#endif // wxUSE_IMAGE + }; #else // !wxUSE_GUI