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 26f0a2fcc4c9efb63b083ed5ea262bf4fbcf7ec8..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_
 
 #ifndef _MFUTILS_H_
 #define _MFUTILS_H_
 

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

 #pragma interface "mfutils.h"
 #endif
 
 #pragma interface "mfutils.h"
 #endif
 

+

 #include <wx/metafile.h>
 
 #ifndef GetRValue
 #include <wx/metafile.h>
 
 #ifndef GetRValue


@@ -157,7 +158,7 @@
 
 #endif // metafile functions
 
 
 #endif // metafile functions
 

-class wxMetaRecord: public wxObject
+class WXDLLIMPEXP_OGL wxMetaRecord: public wxObject

 {
   public:
   int metaFunction;
 {
   public:
   int metaFunction;


@@ -180,7 +181,7 @@ class wxMetaRecord: public wxObject
   ~wxMetaRecord(void);
 };
 
   ~wxMetaRecord(void);
 };
 

-class wxXMetaFile: public wxObject
+class WXDLLIMPEXP_OGL wxXMetaFile: public wxObject

 {
  public:
   double lastX;
 {
  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
   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
   ~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 Play(wxDC *dc);
   inline bool Ok(void) const { return ok; }

-  bool ReadFile(char *file);
+  bool ReadFile(const wxChar *file);

 };
 
 #endif
 };
 
 #endif