disable use of #pragma interface under Mac OS X

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

diff --git a/include/wx/mac/dcmemory.h b/include/wx/mac/dcmemory.h
index c6c57376420c83bf866bdbd71898ab7f362a0421..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_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

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

 #pragma interface "dcmemory.h"
 #endif
 
 #pragma interface "dcmemory.h"
 #endif
 


@@ -27,10 +27,9 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );
     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: 
   private: 

-    friend wxPaintDC;

     wxBitmap  m_selected;
 };
 
     wxBitmap  m_selected;
 };