X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5230934a95bf9b3112ec2a7e070e8cbb4cea7f55..45e0dc94770d598a1cc84d83730d470dd1cfbcca:/include/wx/msw/dc.h diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index bdb94b9116..9087250fe7 100644 --- a/include/wx/msw/dc.h +++ b/include/wx/msw/dc.h @@ -23,54 +23,6 @@ // macros // --------------------------------------------------------------------------- -// Logical to device -// Absolute -#define XLOG2DEV(x) (x) -#define YLOG2DEV(y) (y) - -// Relative -#define XLOG2DEVREL(x) (x) -#define YLOG2DEVREL(y) (y) - -// Device to logical -// Absolute -#define XDEV2LOG(x) (x) - -#define YDEV2LOG(y) (y) - -// Relative -#define XDEV2LOGREL(x) (x) -#define YDEV2LOGREL(y) (y) - -/* - * Have the same macros as for XView but not for every operation: - * just for calculating window/viewport extent (a better way of scaling). - */ - -// Logical to device -// Absolute -#define MS_XLOG2DEV(x) LogicalToDevice(x) - -#define MS_YLOG2DEV(y) LogicalToDevice(y) - -// Relative -#define MS_XLOG2DEVREL(x) LogicalToDeviceXRel(x) -#define MS_YLOG2DEVREL(y) LogicalToDeviceYRel(y) - -// Device to logical -// Absolute -#define MS_XDEV2LOG(x) DeviceToLogicalX(x) - -#define MS_YDEV2LOG(y) DeviceToLogicalY(y) - -// Relative -#define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x) -#define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y) - -#define YSCALE(y) (yorigin - (y)) - -#define wx_round(a) (int)((a)+.5) - #if wxUSE_DC_CACHEING /* * Cached blitting, maintaining a cache @@ -239,8 +191,7 @@ protected: void SetClippingHrgn(WXHRGN hrgn); // MSW-specific member variables - int m_windowExtX; - int m_windowExtY; + // ----------------------------- // the window associated with this DC (may be NULL) wxWindow *m_canvas;