X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dbd6262a9ee7d735fb3930707346298f71b2cb7..2d6c58d653b8f61eae0cc439fa7b4511fd1cf477:/include/wx/mac/dcmemory.h diff --git a/include/wx/mac/dcmemory.h b/include/wx/mac/dcmemory.h index c6c5737642..c72e4017b7 100644 --- 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,10 +27,9 @@ 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: - friend wxPaintDC; wxBitmap m_selected; };