declare wxEntry() as taking char **Argv, not char *argv[]

[wxWidgets.git] / include / wx / mac / dcmemory.h

diff --git a/include/wx/mac/dcmemory.h b/include/wx/mac/dcmemory.h
index 642ae88afd1942acdb6fbf8880eec871bebe7649..c72e4017b7ff7392fe9175000bbc80e32e4ef434 100644 (file)
--- a/include/wx/mac/dcmemory.h
+++ b/include/wx/mac/dcmemory.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dcmemory.h"
 #endif
 
@@ -27,7 +27,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height ) const;
+    virtual void DoGetSize( int *width, int *height ) const;
                wxBitmap        GetSelectedObject() { return m_selected ; }
   private: 
     wxBitmap  m_selected;