X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..29c99ad3597ad722ed540b1e600f3ae3afe0f872:/include/wx/x11/dcmemory.h?ds=sidebyside diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h index 5d85ded03e..aec644d440 100644 --- a/include/wx/x11/dcmemory.h +++ b/include/wx/x11/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 @@ -20,23 +20,18 @@ class wxMemoryDC : public wxWindowDC { - DECLARE_DYNAMIC_CLASS(wxMemoryDC) - public: wxMemoryDC(); wxMemoryDC( wxDC *dc ); // Create compatible DC ~wxMemoryDC(); - virtual void SelectObject( const wxBitmap& bitmap ); - void DoGetSize( int *width, int *height ) const; - - wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; } - + + // implementation + wxBitmap m_selected; + private: - friend class wxPaintDC; - - wxBitmap m_bitmap; + DECLARE_DYNAMIC_CLASS(wxMemoryDC) }; #endif