X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab171e95021482a8a0c0e24ebe050fa0181e7af0..b04237742c51e022af8ca8fe8933437734f392a3:/include/wx/gtk/dc.h?ds=sidebyside diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h index a4136609d6..2e067abc95 100644 --- a/include/wx/gtk/dc.h +++ b/include/wx/gtk/dc.h @@ -7,30 +7,20 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKDCH__ -#define __GTKDCH__ +#ifndef _WX_GTKDC_H_ +#define _WX_GTKDC_H_ +#include "wx/dc.h" //----------------------------------------------------------------------------- // wxDC //----------------------------------------------------------------------------- -#if wxUSE_NEW_DC -class WXDLLIMPEXP_CORE wxGTKImplDC : public wxImplDC -#else -#define wxGTKImplDC wxDC -class WXDLLIMPEXP_CORE wxDC : public wxDCBase -#endif - +class WXDLLIMPEXP_CORE wxGTKDCImpl : public wxDCImpl { public: -#if wxUSE_NEW_DC - wxGTKImplDC( wxDC *owner ); -#else - wxDC(); -#endif - - virtual ~wxGTKImplDC(); + wxGTKDCImpl( wxDC *owner ); + virtual ~wxGTKDCImpl(); #if wxUSE_PALETTE void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; @@ -46,30 +36,18 @@ public: virtual GdkWindow* GetGDKWindow() const { return NULL; } -protected: - // implementation - wxCoord XDEV2LOG(wxCoord x) const { return DeviceToLogicalX(x); } - wxCoord XDEV2LOGREL(wxCoord x) const { return DeviceToLogicalXRel(x); } - wxCoord YDEV2LOG(wxCoord y) const { return DeviceToLogicalY(y); } - wxCoord YDEV2LOGREL(wxCoord y) const { return DeviceToLogicalYRel(y); } - wxCoord XLOG2DEV(wxCoord x) const { return LogicalToDeviceX(x); } - wxCoord XLOG2DEVREL(wxCoord x) const { return LogicalToDeviceXRel(x); } - wxCoord YLOG2DEV(wxCoord y) const { return LogicalToDeviceY(y); } - wxCoord YLOG2DEVREL(wxCoord y) const { return LogicalToDeviceYRel(y); } - // base class pure virtuals implemented here virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); virtual void DoGetSizeMM(int* width, int* height) const; -private: - DECLARE_ABSTRACT_CLASS(wxGTKImplDC) + DECLARE_ABSTRACT_CLASS(wxGTKDCImpl) }; -// this must be defined when wxDC::Blit() honours the DC origian and needed to +// this must be defined when wxDC::Blit() honours the DC origin 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__ +#endif // _WX_GTKDC_H_