X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b65ea1af911e4ba65c47e2ed4f3138367b2bdbb..31eefb998d894e3b566e13714fa53186101829a1:/include/wx/motif/dc.h?ds=sidebyside diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h index a80111b22b..ae62ca7ab8 100644 --- a/include/wx/motif/dc.h +++ b/include/wx/motif/dc.h @@ -12,8 +12,8 @@ #ifndef _WX_DC_H_ #define _WX_DC_H_ -#ifdef __GNUG__ - #pragma interface "dc.h" +#if defined(__GNUG__) && !defined(__APPLE__) +#pragma interface "dc.h" #endif #include "wx/pen.h" @@ -27,14 +27,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 //----------------------------------------------------------------------------- @@ -44,38 +44,38 @@ class WXDLLEXPORT wxDC : public wxDCBase { DECLARE_DYNAMIC_CLASS(wxDC) - + public: wxDC(); ~wxDC() { } - + // implement base class pure virtuals // ---------------------------------- - + virtual void DestroyClippingRegion(); - + virtual wxSize GetPPI() const; - + virtual void SetMapMode(int mode); virtual void SetUserScale(double x, double y); virtual void SetLogicalScale(double x, double y); virtual void SetLogicalOrigin(wxCoord x, wxCoord y); virtual void SetDeviceOrigin(wxCoord x, wxCoord y); virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); - + 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(); - + wxCoord XDEV2LOG(wxCoord x) const { wxCoord new_x = x - m_deviceOriginX; @@ -154,28 +154,15 @@ public: else return (wxCoord)((double)(y) * m_scaleY - 0.5); } - - void SetInternalDeviceOrigin( wxCoord x, wxCoord y ); - void GetInternalDeviceOrigin( wxCoord *x, wxCoord *y ); - + public: // not sure what for, but what is a mm on a screen you don't know the size of? double m_mm_to_pix_x,m_mm_to_pix_y; - - // If un-scrolled is non-zero or d.o. changes with scrolling. Set using - // SetInternalDeviceOrigin(). - wxCoord m_internalDeviceOriginX,m_internalDeviceOriginY; - - // To be set by external classes such as wxScrolledWindow using - // SetDeviceOrigin() - wxCoord m_externalDeviceOriginX,m_externalDeviceOriginY; - + // recompute scale? bool m_needComputeScaleX, m_needComputeScaleY; - - // wxPSDC wants to have this. Will disappear. - float m_scaleFactor; + }; #endif - // _WX_DC_H_ +// _WX_DC_H_