X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af0bb3b161bc687d4a53a83c930c807bfa300a2d..a6c255cbc0a0f6757b9bef432aa30becd1b3da91:/include/wx/motif/dc.h?ds=sidebyside diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h index aa4ffe8a57..f726723241 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(NO_GCC_PRAGMA) +#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 //----------------------------------------------------------------------------- @@ -52,132 +52,115 @@ public: // 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 SetSystemScale(double x, double y); virtual void SetLogicalScale(double x, double y); - virtual void SetLogicalOrigin(long x, long y); - virtual void SetDeviceOrigin(long x, long y); + virtual void SetLogicalOrigin(wxCoord x, wxCoord y); + virtual void SetDeviceOrigin(wxCoord x, wxCoord y); virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); - virtual void SetLogicalFunction(int function); protected: - virtual void DoDrawIcon(const wxIcon& icon, long x, long y); - virtual void DoDrawBitmap(const wxBitmap &bmp, long x, long y, - bool useMask = FALSE); + virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); + virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, + bool useMask = FALSE); - virtual void DoSetClippingRegion(long x, long y, - long width, long height); + 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: void ComputeScaleAndOrigin(); - long XDEV2LOG(long x) const + wxCoord XDEV2LOG(wxCoord x) const { - long new_x = x - m_deviceOriginX; + wxCoord new_x = x - m_deviceOriginX; if (new_x > 0) - return (long)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX; + return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX; else - return (long)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX; + return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX; } - long XDEV2LOGREL(long x) const + wxCoord XDEV2LOGREL(wxCoord x) const { if (x > 0) - return (long)((double)(x) / m_scaleX + 0.5); + return (wxCoord)((double)(x) / m_scaleX + 0.5); else - return (long)((double)(x) / m_scaleX - 0.5); + return (wxCoord)((double)(x) / m_scaleX - 0.5); } - long YDEV2LOG(long y) const + wxCoord YDEV2LOG(wxCoord y) const { - long new_y = y - m_deviceOriginY; + wxCoord new_y = y - m_deviceOriginY; if (new_y > 0) - return (long)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY; + return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY; else - return (long)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY; + return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY; } - long YDEV2LOGREL(long y) const + wxCoord YDEV2LOGREL(wxCoord y) const { if (y > 0) - return (long)((double)(y) / m_scaleY + 0.5); + return (wxCoord)((double)(y) / m_scaleY + 0.5); else - return (long)((double)(y) / m_scaleY - 0.5); + return (wxCoord)((double)(y) / m_scaleY - 0.5); } - long XLOG2DEV(long x) const + wxCoord XLOG2DEV(wxCoord x) const { - long new_x = x - m_logicalOriginX; + wxCoord new_x = x - m_logicalOriginX; if (new_x > 0) - return (long)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX; + return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX; else - return (long)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX; + return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX; } // Without device translation, for backing pixmap purposes - long XLOG2DEV_2(long x) const + wxCoord XLOG2DEV_2(wxCoord x) const { - long new_x = x - m_logicalOriginX; + wxCoord new_x = x - m_logicalOriginX; if (new_x > 0) - return (long)((double)(new_x) * m_scaleX + 0.5) * m_signX; + return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX; else - return (long)((double)(new_x) * m_scaleX - 0.5) * m_signX; + return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX; } - long XLOG2DEVREL(long x) const + wxCoord XLOG2DEVREL(wxCoord x) const { if (x > 0) - return (long)((double)(x) * m_scaleX + 0.5); + return (wxCoord)((double)(x) * m_scaleX + 0.5); else - return (long)((double)(x) * m_scaleX - 0.5); + return (wxCoord)((double)(x) * m_scaleX - 0.5); } - long YLOG2DEV(long y) const + wxCoord YLOG2DEV(wxCoord y) const { - long new_y = y - m_logicalOriginY; + wxCoord new_y = y - m_logicalOriginY; if (new_y > 0) - return (long)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY; + return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY; else - return (long)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY; + return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY; } // Without device translation, for backing pixmap purposes - long YLOG2DEV_2(long y) const + wxCoord YLOG2DEV_2(wxCoord y) const { - long new_y = y - m_logicalOriginY; + wxCoord new_y = y - m_logicalOriginY; if (new_y > 0) - return (long)((double)(new_y) * m_scaleY + 0.5) * m_signY; + return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY; else - return (long)((double)(new_y) * m_scaleY - 0.5) * m_signY; + return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY; } - long YLOG2DEVREL(long y) const + wxCoord YLOG2DEVREL(wxCoord y) const { if (y > 0) - return (long)((double)(y) * m_scaleY + 0.5); + return (wxCoord)((double)(y) * m_scaleY + 0.5); else - return (long)((double)(y) * m_scaleY - 0.5); + return (wxCoord)((double)(y) * m_scaleY - 0.5); } - void SetInternalDeviceOrigin( long x, long y ); - void GetInternalDeviceOrigin( long *x, long *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(). - long m_internalDeviceOriginX,m_internalDeviceOriginY; - - // To be set by external classes such as wxScrolledWindow using - // SetDeviceOrigin() - long 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_