X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..8c9f8f91cd62335261ee29762747218f28d129de:/include/wx/gtk1/dc.h diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h index 78c421c9c4..6022c4d728 100644 --- a/include/wx/gtk1/dc.h +++ b/include/wx/gtk1/dc.h @@ -11,7 +11,7 @@ #ifndef __GTKDCH__ #define __GTKDCH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -25,6 +25,7 @@ class wxDC; // constants //----------------------------------------------------------------------------- +#ifndef MM_TEXT #define MM_TEXT 0 #define MM_ISOTROPIC 1 #define MM_ANISOTROPIC 2 @@ -33,6 +34,7 @@ class wxDC; #define MM_TWIPS 5 #define MM_POINTS 6 #define MM_METRIC 7 +#endif //----------------------------------------------------------------------------- // wxDC @@ -46,13 +48,10 @@ public: void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; - // the first two must be overridden and called - virtual void DestroyClippingRegion(); - // Resolution in pixels per logical inch virtual wxSize GetPPI() const; - virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; } + virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; } virtual void EndDoc() { } virtual void StartPage() { } virtual void EndPage() { } @@ -134,7 +133,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 +146,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__