wxUSE_EXTENDED_RTTI as name

[wxWidgets.git] / contrib / include / wx / ogl / mfutils.h

diff --git a/contrib/include/wx/ogl/mfutils.h b/contrib/include/wx/ogl/mfutils.h
index b070e1781db683d0afe1e9172fe89818d7f0c05d..45a62fe5be56741d489d3e3c858390516a271ff9 100644 (file)
--- 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 <wx/metafile.h>
 
 #ifndef GetRValue
@@ -157,7 +158,7 @@
 
 #endif // metafile functions
 
-class wxMetaRecord: public wxObject
+class WXDLLIMPEXP_OGL wxMetaRecord: public wxObject
 {
   public:
   int metaFunction;
@@ -169,9 +170,9 @@ class wxMetaRecord: public wxObject
   long param6;
   long param7;
   long param8;
-  char *stringParam;
+  wxChar *stringParam;
   wxRealPoint *points;
-  
+
   wxMetaRecord(int fun)
   {
     metaFunction = fun; points = NULL; stringParam = NULL;
@@ -180,7 +181,7 @@ class wxMetaRecord: public wxObject
   ~wxMetaRecord(void);
 };
 
-class wxXMetaFile: public wxObject
+class WXDLLIMPEXP_OGL wxXMetaFile: public wxObject
 {
  public:
   double lastX;
@@ -195,16 +196,16 @@ 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
   // since it is now owned by the clipboard.
   bool SetClipboard(int width = 0, int height = 0);
 
   bool Play(wxDC *dc);
   inline bool Ok(void) const { return ok; }
-  bool ReadFile(char *file);
+  bool ReadFile(const wxChar *file);
 };
 
 #endif