X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk/dc.h diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h index 78c421c9c4..1550c268e7 100644 --- a/include/wx/gtk/dc.h +++ b/include/wx/gtk/dc.h @@ -11,7 +11,7 @@ #ifndef __GTKDCH__ #define __GTKDCH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -134,7 +134,6 @@ public: protected: // base class pure virtuals implemented here virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSizeMM(int* width, int* height) const; public: @@ -148,9 +147,16 @@ public: bool m_needComputeScaleX, m_needComputeScaleY; // not yet used - + private: DECLARE_ABSTRACT_CLASS(wxDC) }; +// this must be defined when wxDC::Blit() honours the DC origian and needed to +// allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK +// 2.3.[23] +#ifndef wxHAS_WORKING_GTK_DC_BLIT + #define wxHAS_WORKING_GTK_DC_BLIT +#endif + #endif // __GTKDCH__