X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef344ff86223f1f0961f025c0b249c898529c095..8d38cdb778ed01de8a1e4ada81c6d92255885ffc:/src/mgl/dc.cpp?ds=sidebyside diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp index c37533c8dd..60d8043928 100644 --- a/src/mgl/dc.cpp +++ b/src/mgl/dc.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Created: 2001/03/09 // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -47,6 +47,10 @@ // constants //----------------------------------------------------------------------------- +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + const double mm2inches = 0.0393700787402; const double inches2mm = 25.4; const double mm2twips = 56.6929133859; @@ -182,16 +186,9 @@ void wxDC::SetMGLDC(MGLDevCtx *mgldc, bool OwnsMGLDC) m_MGLDC = mgldc; m_OwnsMGLDC = OwnsMGLDC; m_ok = TRUE; - - if ( mgldc->getDC()->a.clipRegion ) - { - MGLRegion clip; - mgldc->getClipRegion(clip); - m_globalClippingRegion = wxRegion(clip); - // FIXME_MGL -- reuse wxWindows::m_updateRegion ? - m_currentClippingRegion = m_globalClippingRegion; - m_clipping = TRUE; - } + + if ( !m_globalClippingRegion.IsNull() ) + SetClippingRegion(m_globalClippingRegion); InitializeMGLDC(); } @@ -252,6 +249,7 @@ void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region) // check if the DC is scaled or moved, and if yes, then // convert rg to device coordinates: if ( m_deviceOriginX != 0 || m_deviceOriginY != 0 || + m_logicalOriginX != 0 || m_logicalOriginY != 0 || XLOG2DEVREL(500) != 500 || YLOG2DEVREL(500) != 500 ) { region_t *mrg = rg.GetMGLRegion().rgnPointer(); @@ -288,7 +286,7 @@ void wxDC::DestroyClippingRegion() } else { - m_MGLDC->setClipRect(MGLRect(0, 0, m_MGLDC->sizex(), m_MGLDC->sizey())); + m_MGLDC->setClipRect(MGLRect(0, 0, m_MGLDC->sizex()+1, m_MGLDC->sizey()+1)); m_clipping = FALSE; m_currentClippingRegion.Clear(); } @@ -329,7 +327,7 @@ void wxDC::Clear() SetBrush(m_backgroundBrush); SelectBrush(); GetSize(&w, &h); - m_MGLDC->fillRect(0, 0, w-1, h-1); + m_MGLDC->fillRect(0, 0, w, h); SetBrush(oldb); } } @@ -344,7 +342,7 @@ bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxCHECK_MSG( col, FALSE, _T("NULL colour parameter in wxDC::GetPixel")); uchar r, g, b; - m_MGLDC->unpackColorFast(m_MGLDC->getPixel(XLOG2DEV(x), XLOG2DEV(y)), + m_MGLDC->unpackColorFast(m_MGLDC->getPixel(XLOG2DEV(x), YLOG2DEV(y)), r, g, b); col->Set(r, g, b); return TRUE; @@ -380,8 +378,8 @@ void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) m_MGLDC->makeCurrent(); // will go away with MGL6.0 if ( !m_penSelected ) SelectPen(); - m_MGLDC->line(XLOG2DEV(x1) + m_penOfsX, XLOG2DEV(y1) + m_penOfsY, - XLOG2DEV(x2) + m_penOfsX, XLOG2DEV(y2) + m_penOfsY); + m_MGLDC->lineExt(XLOG2DEV(x1) + m_penOfsX, YLOG2DEV(y1) + m_penOfsY, + XLOG2DEV(x2) + m_penOfsX, YLOG2DEV(y2) + m_penOfsY,FALSE); CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); } @@ -560,6 +558,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { if ( !m_penSelected ) SelectPen(); + m_MGLDC->rect(xx + m_penOfsX, yy + m_penOfsY, xx + ww + m_penOfsX, yy + hh + m_penOfsY); } @@ -751,25 +750,42 @@ void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y) SelectMGLFont(); - m_MGLDC->setColor(m_MGLDC->packColorFast(m_textForegroundColour.Red(), - m_textForegroundColour.Green(), m_textForegroundColour.Blue())); - m_MGLDC->setBackColor(m_MGLDC->packColorFast(m_textBackgroundColour.Red(), - m_textBackgroundColour.Green(), m_textBackgroundColour.Blue())); - // Render the text: wxCoord xx = XLOG2DEV(x); wxCoord yy = YLOG2DEV(y); - + m_MGLDC->setLineStyle(MGL_LINE_STIPPLE); m_MGLDC->setLineStipple(0xFFFF); m_MGLDC->setPenSize(1, 1); m_MGLDC->setPenStyle(MGL_BITMAP_SOLID); - + #if wxUSE_UNICODE const wchar_t *c_text = text.c_str(); #else const char *c_text = text.c_str(); #endif + +#if 1 + // FIXME_MGL - this is a temporary hack in absence of proper + // implementation of solid text background in MGL. Once + // the bug in MGL is fixed, this code should be nuked + // immediately. Note that the code is not 100% correct; + // it only works with wxCOPY logical function + if ( m_backgroundMode == wxSOLID ) + { + int w = m_MGLDC->textWidth(c_text); + int h = m_MGLDC->textHeight(); + m_MGLDC->setColor(m_MGLDC->packColorFast(m_textBackgroundColour.Red(), + m_textBackgroundColour.Green(), m_textBackgroundColour.Blue())); + m_MGLDC->fillRect(xx, yy, xx+w, yy+h); + } +#endif + + m_MGLDC->setColor(m_MGLDC->packColorFast(m_textForegroundColour.Red(), + m_textForegroundColour.Green(), m_textForegroundColour.Blue())); + m_MGLDC->setBackColor(m_MGLDC->packColorFast(m_textBackgroundColour.Red(), + m_textBackgroundColour.Green(), m_textBackgroundColour.Blue())); + m_MGLDC->drawStr(xx, yy, c_text); // Render underline: @@ -1087,7 +1103,8 @@ void wxDC::SetPalette(const wxPalette& palette) if ( palette == wxNullPalette ) { - SetPalette(m_oldPalette); + if ( m_oldPalette.Ok() ) + SetPalette(m_oldPalette); return; } @@ -1104,9 +1121,11 @@ void wxDC::SetPalette(const wxPalette& palette) void wxDC::SetFont(const wxFont& font) { - wxCHECK_RET( font.Ok(), wxT("invalid font") ); - m_font = font; - m_mglFont = NULL; + if ( font.Ok() ) + { + m_font = font; + m_mglFont = NULL; + } } void wxDC::SetBackground(const wxBrush& brush) @@ -1234,7 +1253,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, *descent = YDEV2LOGREL(m_mglFont->descent); if ( externalLeading ) *externalLeading = YDEV2LOGREL(m_mglFont->leading); - + if ( theFont != NULL ) wxConstCast(this, wxDC)->SetFont(oldFont); } @@ -1370,8 +1389,8 @@ wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const void wxDC::DoGetSize(int *w, int *h) const { - if (w) *w = m_MGLDC->sizex(); - if (h) *h = m_MGLDC->sizey(); + if (w) *w = m_MGLDC->sizex()+1; + if (h) *h = m_MGLDC->sizey()+1; } void wxDC::DoGetSizeMM(int *width, int *height) const