X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1408104d04fdea106c8ec288866c4143078ae71b..4cb122de97b40f0b6c8896f40847a7aaf762abb5:/src/os2/dc.cpp?ds=sidebyside diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp index c32e0528d4..7a95c3ab97 100644 --- a/src/os2/dc.cpp +++ b/src/os2/dc.cpp @@ -36,42 +36,70 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) long wxDCBase::DeviceToLogicalX(long x) const { - return XDEV2LOG(x); + long new_x = x - m_deviceOriginX; + if (new_x > 0) + return (long)((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; }; long wxDCBase::DeviceToLogicalY(long y) const { - return YDEV2LOG(y); + long new_y = y - m_deviceOriginY; + if (new_y > 0) + return (long)((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; }; long wxDCBase::DeviceToLogicalXRel(long x) const { - return XDEV2LOGREL(x); + if (x > 0) + return (long)((double)(x) / m_scaleX + 0.5); + else + return (long)((double)(x) / m_scaleX - 0.5); }; long wxDCBase::DeviceToLogicalYRel(long y) const { - return YDEV2LOGREL(y); + if (y > 0) + return (long)((double)(y) / m_scaleY + 0.5); + else + return (long)((double)(y) / m_scaleY - 0.5); }; long wxDCBase::LogicalToDeviceX(long x) const { - return XLOG2DEV(x); + long new_x = x - m_logicalOriginX; + if (new_x > 0) + return (long)((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; }; long wxDCBase::LogicalToDeviceY(long y) const { - return YLOG2DEV(y); + long new_y = y - m_logicalOriginY; + if (new_y > 0) + return (long)((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; }; long wxDCBase::LogicalToDeviceXRel(long x) const { - return XLOG2DEVREL(x); + if (x > 0) + return (long)((double)(x) * m_scaleX + 0.5); + else + return (long)((double)(x) * m_scaleX - 0.5); }; long wxDCBase::LogicalToDeviceYRel(long y) const { - return YLOG2DEVREL(y); + if (y > 0) + return (long)((double)(y) * m_scaleY + 0.5); + else + return (long)((double)(y) * m_scaleY - 0.5); }; //----------------------------------------------------------------------------- @@ -80,161 +108,79 @@ long wxDCBase::LogicalToDeviceYRel(long y) const wxDC::wxDC(void) { - m_ok = FALSE; - m_optimize = FALSE; - m_autoSetting = FALSE; - m_colour = TRUE; - m_clipping = FALSE; - - m_mm_to_pix_x = 1.0; - m_mm_to_pix_y = 1.0; - - m_logicalOriginX = 0; - m_logicalOriginY = 0; - m_deviceOriginX = 0; - m_deviceOriginY = 0; - m_internalDeviceOriginX = 0; - m_internalDeviceOriginY = 0; - m_externalDeviceOriginX = 0; - m_externalDeviceOriginY = 0; - - m_logicalScaleX = 1.0; - m_logicalScaleY = 1.0; - m_userScaleX = 1.0; - m_userScaleY = 1.0; - m_scaleX = 1.0; - m_scaleY = 1.0; - - m_mappingMode = wxMM_TEXT; - m_needComputeScaleX = FALSE; - m_needComputeScaleY = FALSE; - - m_signX = 1; // default x-axis left to right - m_signY = 1; // default y-axis top down - - m_maxX = m_maxY = -100000; - m_minY = m_minY = 100000; - - m_logicalFunction = wxCOPY; -// m_textAlignment = wxALIGN_TOP_LEFT; - m_backgroundMode = wxTRANSPARENT; - - m_textForegroundColour = *wxBLACK; - m_textBackgroundColour = *wxWHITE; - m_pen = *wxBLACK_PEN; - m_font = *wxNORMAL_FONT; - m_brush = *wxTRANSPARENT_BRUSH; - m_backgroundBrush = *wxWHITE_BRUSH; - -// m_palette = wxAPP_COLOURMAP; + m_owner = NULL; + m_bitmap = NULL; + + m_oldBitmap = 0; + m_oldPen = 0; + m_oldBrush = 0; + m_oldFont = 0; + m_oldPalette = 0; + m_hDC = 0; + m_hDCCount = 0; }; wxDC::~wxDC(void) { + // TODO: }; void wxDC::DestroyClippingRegion(void) { - m_clipping = FALSE; + // TODO: }; -void wxDC::GetSize( int* width, int* height ) const +void wxDC::DoGetSize( int* width, int* height ) const { - *width = m_maxX-m_minX; - *height = m_maxY-m_minY; + // TODO: }; -void wxDC::GetSizeMM( long* width, long* height ) const +void wxDC::DoGetSizeMM( int* width, int* height ) const { - int w = 0; - int h = 0; - GetSize( &w, &h ); - *width = long( double(w) / (m_scaleX*m_mm_to_pix_x) ); - *height = long( double(h) / (m_scaleY*m_mm_to_pix_y) ); + // TODO: }; void wxDC::SetMapMode( int mode ) { - switch (mode) - { - case wxMM_TWIPS: - SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y ); - break; - case wxMM_POINTS: - SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y ); - break; - case wxMM_METRIC: - SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y ); - break; - case wxMM_LOMETRIC: - SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 ); - break; - default: - case wxMM_TEXT: - SetLogicalScale( 1.0, 1.0 ); - break; - }; - if (mode != wxMM_TEXT) - { - m_needComputeScaleX = TRUE; - m_needComputeScaleY = TRUE; - }; + // TODO: }; void wxDC::SetUserScale( double x, double y ) { - // allow negative ? -> no - m_userScaleX = x; - m_userScaleY = y; - ComputeScaleAndOrigin(); -}; + m_userScaleX = x; + m_userScaleY = y; -void wxDC::GetUserScale( double *x, double *y ) -{ - if (x) *x = m_userScaleX; - if (y) *y = m_userScaleY; + SetMapMode(m_mappingMode); }; void wxDC::SetLogicalScale( double x, double y ) { - // allow negative ? - m_logicalScaleX = x; - m_logicalScaleY = y; - ComputeScaleAndOrigin(); + // TODO: }; void wxDC::SetLogicalOrigin( long x, long y ) { - m_logicalOriginX = x * m_signX; // is this still correct ? - m_logicalOriginY = y * m_signY; - ComputeScaleAndOrigin(); + // TODO: }; void wxDC::SetDeviceOrigin( long x, long y ) { - m_externalDeviceOriginX = x; - m_externalDeviceOriginY = y; - ComputeScaleAndOrigin(); + // TODO: }; void wxDC::SetInternalDeviceOrigin( long x, long y ) { - m_internalDeviceOriginX = x; - m_internalDeviceOriginY = y; - ComputeScaleAndOrigin(); + // TODO: }; void wxDC::GetInternalDeviceOrigin( long *x, long *y ) { - if (x) *x = m_internalDeviceOriginX; - if (y) *y = m_internalDeviceOriginY; + // TODO: }; void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) { - m_signX = (xLeftRight ? 1 : -1); - m_signY = (yBottomUp ? -1 : 1); - ComputeScaleAndOrigin(); + // TODO: }; @@ -246,8 +192,10 @@ int wxDC::GetDepth() const wxSize wxDC::GetPPI() const { + int x = 1; + int y = 1; // TODO: - return (1); + return (wxSize(x,y)); } void wxDC::GetTextExtent( const wxString& string ,long* x @@ -260,13 +208,13 @@ void wxDC::GetTextExtent( const wxString& string // TODO: } -void wxDC::GetCharWidth() const +long wxDC::GetCharWidth() const { // TODO return(1); } -void wxDC::GetCharHeight() const +long wxDC::GetCharHeight() const { // TODO return(1); @@ -314,7 +262,7 @@ void wxDC::SetPalette(const wxPalette& palette) void wxDC::DoFloodFill( long x ,long y ,const wxColour& col - ,int style = wxFLOOD_SURFACE + ,int style ) { // TODO @@ -385,7 +333,7 @@ void wxDC::DoDrawIcon(const wxIcon& icon, long x, long y) void wxDC::DoDrawBitmap( const wxBitmap &bmp ,long x, long y - ,bool useMask = FALSE + ,bool useMask ) { // TODO @@ -403,24 +351,14 @@ bool wxDC::DoBlit( long xdest ,wxDC *source ,long xsrc ,long ysrc - ,int rop = wxCOPY - ,bool useMask = FALSE + ,int rop + ,bool useMask ) { // TODO return(TRUE); } -void wxDC::DoGetSize(int *width, int *height) const -{ - // TODO -} - -void wxDC::DoGetSizeMM(int* width, int* height) const -{ - // TODO -} - void wxDC::DoDrawLines( int n, wxPoint points[] ,long xoffset, long yoffset ) @@ -430,7 +368,7 @@ void wxDC::DoDrawLines( int n, wxPoint points[] void wxDC::DoDrawPolygon(int n, wxPoint points[] ,long xoffset, long yoffset - ,int fillStyle = wxODDEVEN_RULE + ,int fillStyle ) { // TODO @@ -458,95 +396,5 @@ void wxDC::DoDrawSpline(wxList *points) // // Private functions // -long wxDC::XDEV2LOG(long x) const -{ - long new_x = x - m_deviceOriginX; - if (new_x > 0) - return (long)((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; -} - -long wxDC::XDEV2LOGREL(long x) const -{ - if (x > 0) - return (long)((double)(x) / m_scaleX + 0.5); - else - return (long)((double)(x) / m_scaleX - 0.5); -} - -long wxDC::YDEV2LOG(long y) const -{ - long new_y = y - m_deviceOriginY; - if (new_y > 0) - return (long)((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; -} - -long wxDC::YDEV2LOGREL(long y) const -{ - if (y > 0) - return (long)((double)(y) / m_scaleY + 0.5); - else - return (long)((double)(y) / m_scaleY - 0.5); -} - -long wxDC::XLOG2DEV(long x) const -{ - long new_x = x - m_logicalOriginX; - if (new_x > 0) - return (long)((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; -} - -long wxDC::XLOG2DEVREL(long x) const -{ - if (x > 0) - return (long)((double)(x) * m_scaleX + 0.5); - else - return (long)((double)(x) * m_scaleX - 0.5); -} - -long wxDC::YLOG2DEV(long y) const -{ - long new_y = y - m_logicalOriginY; - if (new_y > 0) - return (long)((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; -} - -long wxDC::YLOG2DEVREL(long y) const -{ - if (y > 0) - return (long)((double)(y) * m_scaleY + 0.5); - else - return (long)((double)(y) * m_scaleY - 0.5); -} - -void wxDC::ComputeScaleAndOrigin(void) -{ - // CMB: copy scale to see if it changes - double origScaleX = m_scaleX; - double origScaleY = m_scaleY; - m_scaleX = m_logicalScaleX * m_userScaleX; - m_scaleY = m_logicalScaleY * m_userScaleY; - - m_deviceOriginX = m_internalDeviceOriginX + m_externalDeviceOriginX; - m_deviceOriginY = m_internalDeviceOriginY + m_externalDeviceOriginY; - - // CMB: if scale has changed call SetPen to recalulate the line width - if (m_scaleX != origScaleX || m_scaleY != origScaleY) - { - // this is a bit artificial, but we need to force wxDC to think - // the pen has changed - wxPen* pen = & GetPen(); - wxPen tempPen; - m_pen = tempPen; - SetPen(* pen); - } -};