X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76db86e7e18d308dec0b0d6e9ab817775a8ab278..90e572f1e5af1e51fd14e2e1e6f64fa3e258e590:/include/wx/motif/dc.h diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h index fb6316232e..390e63faf6 100644 --- a/include/wx/motif/dc.h +++ b/include/wx/motif/dc.h @@ -12,10 +12,6 @@ #ifndef _WX_DC_H_ #define _WX_DC_H_ -#ifdef __GNUG__ - #pragma interface "dc.h" -#endif - #include "wx/pen.h" #include "wx/brush.h" #include "wx/icon.h" @@ -27,14 +23,14 @@ //----------------------------------------------------------------------------- #ifndef MM_TEXT - #define MM_TEXT 0 - #define MM_ISOTROPIC 1 - #define MM_ANISOTROPIC 2 - #define MM_LOMETRIC 3 - #define MM_HIMETRIC 4 - #define MM_TWIPS 5 - #define MM_POINTS 6 - #define MM_METRIC 7 +#define MM_TEXT 0 +#define MM_ISOTROPIC 1 +#define MM_ANISOTROPIC 2 +#define MM_LOMETRIC 3 +#define MM_HIMETRIC 4 +#define MM_TWIPS 5 +#define MM_POINTS 6 +#define MM_METRIC 7 #endif //----------------------------------------------------------------------------- @@ -52,8 +48,6 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual void DestroyClippingRegion(); - virtual wxSize GetPPI() const; virtual void SetMapMode(int mode); @@ -66,15 +60,15 @@ public: protected: virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = FALSE); + bool useMask = false); virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); + wxCoord width, wxCoord height); virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSizeMM(int* width, int* height) const; public: - void ComputeScaleAndOrigin(); + virtual void ComputeScaleAndOrigin(); wxCoord XDEV2LOG(wxCoord x) const { @@ -162,9 +156,7 @@ public: // recompute scale? bool m_needComputeScaleX, m_needComputeScaleY; - // wxPSDC wants to have this. Will disappear. - float m_scaleFactor; }; #endif - // _WX_DC_H_ +// _WX_DC_H_