X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1fa2fda3c72886f62def1e650a7306c82e72f2f..30bfc425744ec3b797a956a9b78b902ff248bf3b:/contrib/include/wx/ogl/mfutils.h diff --git a/contrib/include/wx/ogl/mfutils.h b/contrib/include/wx/ogl/mfutils.h index 26f0a2fcc4..45a62fe5be 100644 --- a/contrib/include/wx/ogl/mfutils.h +++ b/contrib/include/wx/ogl/mfutils.h @@ -13,10 +13,11 @@ #ifndef _MFUTILS_H_ #define _MFUTILS_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "mfutils.h" #endif + #include #ifndef GetRValue @@ -157,7 +158,7 @@ #endif // metafile functions -class wxMetaRecord: public wxObject +class WXDLLIMPEXP_OGL wxMetaRecord: public wxObject { public: int metaFunction; @@ -180,7 +181,7 @@ class wxMetaRecord: public wxObject ~wxMetaRecord(void); }; -class wxXMetaFile: public wxObject +class WXDLLIMPEXP_OGL wxXMetaFile: public wxObject { public: double lastX; @@ -195,7 +196,7 @@ class wxXMetaFile: public wxObject wxList metaRecords; wxList gdiObjects; // List of wxMetaRecord objects created with Create..., // referenced by position in list by SelectObject - wxXMetaFile(char *file = NULL); + wxXMetaFile(const wxChar* file = NULL); ~wxXMetaFile(void); // After this is called, the metafile cannot be used for anything @@ -204,7 +205,7 @@ class wxXMetaFile: public wxObject bool Play(wxDC *dc); inline bool Ok(void) const { return ok; } - bool ReadFile(char *file); + bool ReadFile(const wxChar *file); }; #endif