X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82a306b72844333fcb67d3381669a365d4f96e5c..908f91bce9bfe08204447ed7217a38625ecacc64:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 6c8aa17100..22e2455e0a 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -29,6 +29,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/image.h" #include "wx/window.h" #include "wx/dc.h" #include "wx/utils.h" @@ -40,8 +41,6 @@ #include "wx/icon.h" #endif -#include "wx/msw/private.h" // needs to be before #include - #include "wx/sysopt.h" #include "wx/dcprint.h" #include "wx/module.h" @@ -52,12 +51,8 @@ #endif #include -#include - -#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__) - #include -#endif +#include "wx/msw/wrapcdlg.h" #ifndef __WIN32__ #include #endif @@ -92,11 +87,6 @@ static const int VIEWPORT_EXTENT = 1000; static const int MM_POINTS = 9; static const int MM_METRIC = 10; -// usually this is defined in math.h -#ifndef M_PI - static const double M_PI = 3.14159265358979323846; -#endif // M_PI - // ROPs which don't have standard names (see "Ternary Raster Operations" in the // MSDN docs for how this and other numbers in wxDC::Blit() are obtained) #define DSTCOPY 0x00AA0029 // a.k.a. NOP operation @@ -112,13 +102,17 @@ static const int MM_METRIC = 10; coordinates used. */ -// logical to device -#define XLOG2DEV(x) (x) -#define YLOG2DEV(y) (y) - -// device to logical -#define XDEV2LOG(x) (x) -#define YDEV2LOG(y) (y) +#ifdef __WXWINCE__ + #define XLOG2DEV(x) ((x-m_logicalOriginX)*m_signX+m_deviceOriginX) + #define YLOG2DEV(y) ((y-m_logicalOriginY)*m_signY+m_deviceOriginY) + #define XDEV2LOG(x) ((x-m_deviceOriginX)*m_signX+m_logicalOriginX) + #define YDEV2LOG(y) ((y-m_deviceOriginY)*m_signY+m_logicalOriginY) +#else + #define XLOG2DEV(x) (x) + #define YLOG2DEV(y) (y) + #define XDEV2LOG(x) (x) + #define YDEV2LOG(y) (y) +#endif // --------------------------------------------------------------------------- // private functions @@ -183,6 +177,8 @@ public: m_modeOld = ::SetStretchBltMode(m_hdc, mode); if ( !m_modeOld ) wxLogLastError(_T("SetStretchBltMode")); +#else + wxUnusedVar(mode); #endif } @@ -219,7 +215,7 @@ wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc) m_colFgOld = ::GetTextColor(hdc); m_colBgOld = ::GetBkColor(hdc); - // note that Windows convention is opposite to wxWindows one, this is + // note that Windows convention is opposite to wxWidgets one, this is // why text colour becomes the background one and vice versa const wxColour& colFg = dc.GetTextForeground(); if ( colFg.Ok() ) @@ -238,12 +234,12 @@ wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc) : OPAQUE); // flag which telsl us to undo changes in the dtor - m_changed = TRUE; + m_changed = true; } else { // nothing done, nothing to undo - m_changed = FALSE; + m_changed = false; } } @@ -277,7 +273,7 @@ wxDC::wxDC() m_oldPalette = 0; #endif // wxUSE_PALETTE - m_bOwnsDC = FALSE; + m_bOwnsDC = false; m_hDC = 0; } @@ -378,6 +374,24 @@ void wxDC::UpdateClipBox() m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom); } +void +wxDC::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const +{ + // check if we should try to retrieve the clipping region possibly not set + // by our SetClippingRegion() but preset by Windows:this can only happen + // when we're associated with an existing HDC usign SetHDC(), see there + if ( m_clipping && !m_clipX1 && !m_clipX2 ) + { + wxDC *self = wxConstCast(this, wxDC); + self->UpdateClipBox(); + + if ( !m_clipX1 && !m_clipX2 ) + self->m_clipping = false; + } + + wxDCBase::DoGetClippingBox(x, y, w, h); +} + // common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion() void wxDC::SetClippingHrgn(WXHRGN hrgn) { @@ -388,7 +402,7 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn) // note that we combine the new clipping region with the existing one: this // is compatible with what the other ports do and is the documented // behaviour now (starting with 2.3.3) -#if defined(__WIN16__) || defined(__WXWINCE__) +#if defined(__WXWINCE__) RECT rectClip; if ( !::GetClipBox(GetHdc(), &rectClip) ) return; @@ -404,16 +418,16 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn) ::DeleteObject(hrgnClipOld); ::DeleteObject(hrgnDest); -#else // Win32 +#else // !WinCE if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR ) { wxLogLastError(_T("ExtSelectClipRgn")); return; } -#endif // Win16/32 +#endif // WinCE/!WinCE - m_clipping = TRUE; + m_clipping = true; UpdateClipBox(); } @@ -460,7 +474,7 @@ void wxDC::DestroyClippingRegion() ::DeleteObject(rgn); } - m_clipping = FALSE; + wxDCBase::DestroyClippingRegion(); } // --------------------------------------------------------------------------- @@ -469,14 +483,14 @@ void wxDC::DestroyClippingRegion() bool wxDC::CanDrawBitmap() const { - return TRUE; + return true; } bool wxDC::CanGetTextExtent() const { #ifdef __WXMICROWIN__ // TODO Extend MicroWindows' GetDeviceCaps function - return TRUE; + return true; #else // What sort of display is it? int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY); @@ -527,10 +541,10 @@ void wxDC::Clear() ::FillRect(GetHdc(), &rect, brush); ::DeleteObject(brush); +#ifndef __WXWINCE__ int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX, height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY; -#ifndef __WXWINCE__ ::SetMapMode(GetHdc(), MM_ANISOTROPIC); ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL); @@ -543,10 +557,14 @@ void wxDC::Clear() bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style) { #ifdef __WXWINCE__ - return FALSE; + wxUnusedVar(x); + wxUnusedVar(y); + wxUnusedVar(col); + wxUnusedVar(style); + return false; #else - WXMICROWIN_CHECK_HDC_RET(FALSE) + WXMICROWIN_CHECK_HDC_RET(false) bool success = (0 != ::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), col.GetPixel(), @@ -577,16 +595,16 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style) bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const { - WXMICROWIN_CHECK_HDC_RET(FALSE) + WXMICROWIN_CHECK_HDC_RET(false) - wxCHECK_MSG( col, FALSE, _T("NULL colour parameter in wxDC::GetPixel") ); + wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel") ); // get the color of the pixel COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)); wxRGBToColour(*col, pixelcolor); - return TRUE; + return true; } void wxDC::DoCrossHair(wxCoord x, wxCoord y) @@ -698,8 +716,8 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, #else DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK); #endif -#else // Win16 - // In WIN16, draw a cross +#else // Symantec-MicroWin + // draw a cross HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0)); HPEN whiteBrush = (HPEN)::GetStockObject(WHITE_BRUSH); HPEN hPenOld = (HPEN)::SelectObject(GetHdc(), blackPen); @@ -713,7 +731,7 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, ::SelectObject(GetHdc(), hPenOld); ::SelectObject(GetHdc(), hBrushOld); ::DeleteObject(blackPen); -#endif // Win32/16 +#endif // Win32/Symantec-MicroWin CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); @@ -754,6 +772,8 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs } #ifndef __WXWINCE__ int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING); +#else + wxUnusedVar(fillStyle); #endif (void)Polygon(GetHdc(), cpoints, n); #ifndef __WXWINCE__ @@ -779,18 +799,21 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs void wxDC::DoDrawPolyPolygon(int n, - int start[], + int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) { +#ifdef __WXWINCE__ + wxDCBase::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); +#else WXMICROWIN_CHECK_HDC wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling int i, cnt; for (i = cnt = 0; i < n; i++) - cnt += start[i]; + cnt += count[i]; // Do things less efficiently if we have offsets if (xoffset != 0 || yoffset != 0) @@ -803,9 +826,13 @@ wxDC::DoDrawPolyPolygon(int n, CalcBoundingBox(cpoints[i].x, cpoints[i].y); } +#ifndef __WXWINCE__ int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING); - (void)PolyPolygon(GetHdc(), cpoints, start, n); +#endif + (void)PolyPolygon(GetHdc(), cpoints, count, n); +#ifndef __WXWINCE__ SetPolyFillMode(GetHdc(),prev); +#endif delete[] cpoints; } else @@ -813,10 +840,16 @@ wxDC::DoDrawPolyPolygon(int n, for (i = 0; i < cnt; i++) CalcBoundingBox(points[i].x, points[i].y); +#ifndef __WXWINCE__ int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING); - (void)PolyPolygon(GetHdc(), (POINT*) points, start, n); +#endif + (void)PolyPolygon(GetHdc(), (POINT*) points, count, n); +#ifndef __WXWINCE__ SetPolyFillMode(GetHdc(),prev); +#endif } +#endif + // __WXWINCE__ } void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) @@ -875,8 +908,11 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR. if ( m_pen.GetStyle() == wxTRANSPARENT ) { + // Apparently not needed for WinCE (see e.g. Life! demo) +#ifndef __WXWINCE__ x2++; y2++; +#endif } (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); @@ -1037,7 +1073,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask { // don't give assert here because this would break existing // programs - just silently ignore useMask parameter - useMask = FALSE; + useMask = false; } } if ( useMask ) @@ -1046,9 +1082,9 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask // use MaskBlt() with ROP which doesn't do anything to dst in the mask // points // On some systems, MaskBlt succeeds yet is much much slower - // than the wxWindows fall-back implementation. So we need + // than the wxWidgets fall-back implementation. So we need // to be able to switch this on and off at runtime. - bool ok = FALSE; + bool ok = false; #if wxUSE_SYSTEM_OPTIONS if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0) #endif @@ -1248,13 +1284,13 @@ void wxDC::DoDrawRotatedText(const wxString& text, // "upper left" and "upper right" CalcBoundingBox(x, y); - CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(h*sin(rad))); + CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad))); // "bottom left" and "bottom right" x += (wxCoord)(h*sin(rad)); y += (wxCoord)(h*cos(rad)); CalcBoundingBox(x, y); - CalcBoundingBox(x + wxCoord(h*sin(rad)), y + wxCoord(h*cos(rad))); + CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad))); } #endif } @@ -1281,7 +1317,7 @@ void wxDC::DoSelectPalette(bool realize) { HPALETTE oldPal = ::SelectPalette(GetHdc(), GetHpaletteOf(m_palette), - FALSE); + false); if (!m_oldPalette) m_oldPalette = (WXHPALETTE) oldPal; @@ -1295,7 +1331,7 @@ void wxDC::SetPalette(const wxPalette& palette) if ( palette.Ok() ) { m_palette = palette; - DoSelectPalette(TRUE); + DoSelectPalette(true); } } @@ -1320,36 +1356,44 @@ void wxDC::InitializePalette() #endif // wxUSE_PALETTE -void wxDC::SetFont(const wxFont& the_font) +// SetFont/Pen/Brush() really ask to be implemented as a single template +// function... but doing it is not worth breaking OpenWatcom build + +void wxDC::SetFont(const wxFont& font) { WXMICROWIN_CHECK_HDC - // Set the old object temporarily, in case the assignment deletes an object - // that's not yet selected out. - if (m_oldFont) - { - ::SelectObject(GetHdc(), (HFONT) m_oldFont); - m_oldFont = 0; - } - - m_font = the_font; + if ( font == m_font ) + return; - if (!the_font.Ok()) + if ( font.Ok() ) { - if (m_oldFont) - ::SelectObject(GetHdc(), (HFONT) m_oldFont); - m_oldFont = 0; - } + HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font)); + if ( hfont == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(font)")); + } + else // selected ok + { + if ( !m_oldFont ) + m_oldFont = (WXHPEN)hfont; - if (m_font.Ok() && m_font.GetResourceHandle()) + m_font = font; + } + } + else // invalid font, reset the current font { - HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle()); - if (f == (HFONT) NULL) + if ( m_oldFont ) { - wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont.")); + if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(old font)")); + } + + m_oldFont = 0; } - if (!m_oldFont) - m_oldFont = (WXHFONT) f; + + m_font = wxNullFont; } } @@ -1357,31 +1401,37 @@ void wxDC::SetPen(const wxPen& pen) { WXMICROWIN_CHECK_HDC - // Set the old object temporarily, in case the assignment deletes an object - // that's not yet selected out. - if (m_oldPen) - { - ::SelectObject(GetHdc(), (HPEN) m_oldPen); - m_oldPen = 0; - } - - m_pen = pen; + if ( pen == m_pen ) + return; - if (!m_pen.Ok()) + if ( pen.Ok() ) { - if (m_oldPen) - ::SelectObject(GetHdc(), (HPEN) m_oldPen); - m_oldPen = 0; - } + HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen)); + if ( hpen == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(pen)")); + } + else // selected ok + { + if ( !m_oldPen ) + m_oldPen = (WXHPEN)hpen; - if (m_pen.Ok()) + m_pen = pen; + } + } + else // invalid pen, reset the current pen { - if (m_pen.GetResourceHandle()) + if ( m_oldPen ) { - HPEN p = (HPEN) ::SelectObject(GetHdc(), (HPEN)m_pen.GetResourceHandle()); - if (!m_oldPen) - m_oldPen = (WXHPEN) p; + if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(old pen)")); + } + + m_oldPen = 0; } + + m_pen = wxNullPen; } } @@ -1389,48 +1439,55 @@ void wxDC::SetBrush(const wxBrush& brush) { WXMICROWIN_CHECK_HDC - // Set the old object temporarily, in case the assignment deletes an object - // that's not yet selected out. - if (m_oldBrush) - { - ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush); - m_oldBrush = 0; - } - - m_brush = brush; - - if (!m_brush.Ok()) - { - if (m_oldBrush) - ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush); - m_oldBrush = 0; - } + if ( brush == m_brush ) + return; - if (m_brush.Ok()) + if ( brush.Ok() ) { - // to make sure the brush is alligned with the logical coordinates - wxBitmap *stipple = m_brush.GetStipple(); + // we must make sure the brush is aligned with the logical coordinates + // before selecting it + wxBitmap *stipple = brush.GetStipple(); if ( stipple && stipple->Ok() ) { -#ifdef __WIN32__ - ::SetBrushOrgEx(GetHdc(), - m_deviceOriginX % stipple->GetWidth(), - m_deviceOriginY % stipple->GetHeight(), - NULL); // don't need previous brush origin -#else - ::SetBrushOrg(GetHdc(), - m_deviceOriginX % stipple->GetWidth(), - m_deviceOriginY % stipple->GetHeight()); -#endif + if ( !::SetBrushOrgEx + ( + GetHdc(), + m_deviceOriginX % stipple->GetWidth(), + m_deviceOriginY % stipple->GetHeight(), + NULL // [out] previous brush origin + ) ) + { + wxLogLastError(_T("SetBrushOrgEx()")); + } } - if ( m_brush.GetResourceHandle() ) + HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush)); + if ( hbrush == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(brush)")); + } + else // selected ok { - HBRUSH b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle()); - if (!m_oldBrush) - m_oldBrush = (WXHBRUSH) b; + if ( !m_oldBrush ) + m_oldBrush = (WXHPEN)hbrush; + + m_brush = brush; } } + else // invalid brush, reset the current brush + { + if ( m_oldBrush ) + { + if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR ) + { + wxLogLastError(_T("SelectObject(old brush)")); + } + + m_oldBrush = 0; + } + + m_brush = wxNullBrush; + } } void wxDC::SetBackground(const wxBrush& brush) @@ -1500,8 +1557,8 @@ void wxDC::SetRop(WXHDC dc) bool wxDC::StartDoc(const wxString& WXUNUSED(message)) { - // We might be previewing, so return TRUE to let it continue. - return TRUE; + // We might be previewing, so return true to let it continue. + return true; } void wxDC::EndDoc() @@ -1590,6 +1647,49 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, } } + +// Each element of the array will be the width of the string up to and +// including the coresoponding character in text. + +bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const +{ + static int maxLenText = -1; + static int maxWidth = -1; + int fit = 0; + SIZE sz = {0,0}; + int stlen = text.Length(); + + if (maxLenText == -1) + { + // Win9x and WinNT+ have different limits + int version = wxGetOsVersion(); + maxLenText = version == wxWINDOWS_NT ? 65535 : 8192; + maxWidth = version == wxWINDOWS_NT ? INT_MAX : 32767; + } + + widths.Empty(); + widths.Add(0, stlen); // fill the array with zeros + + if (!::GetTextExtentExPoint(GetHdc(), + text.c_str(), // string to check + wxMin(stlen, maxLenText), + maxWidth, + &fit, // [out] count of chars + // that will fit + &widths[0], // array to fill + &sz)) + { + // API failed + wxLogLastError(wxT("GetTextExtentExPoint")); + return false; + } + + return true; +} + + + + void wxDC::SetMapMode(int mode) { WXMICROWIN_CHECK_HDC @@ -1665,15 +1765,13 @@ void wxDC::SetUserScale(double x, double y) { WXMICROWIN_CHECK_HDC -#ifndef __WXWINCE__ if ( x == m_userScaleX && y == m_userScaleY ) return; m_userScaleX = x; m_userScaleY = y; - SetMapMode(m_mappingMode); -#endif + this->SetMapMode(m_mappingMode); } void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp) @@ -1691,6 +1789,9 @@ void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp) SetMapMode(m_mappingMode); } +#else + wxUnusedVar(xLeftRight); + wxUnusedVar(yBottomUp); #endif } @@ -1698,13 +1799,13 @@ void wxDC::SetSystemScale(double x, double y) { WXMICROWIN_CHECK_HDC -#ifndef __WXWINCE__ if ( x == m_scaleX && y == m_scaleY ) return; m_scaleX = x; m_scaleY = y; +#ifndef __WXWINCE__ SetMapMode(m_mappingMode); #endif } @@ -1713,13 +1814,13 @@ void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y) { WXMICROWIN_CHECK_HDC -#ifndef __WXWINCE__ if ( x == m_logicalOriginX && y == m_logicalOriginY ) return; m_logicalOriginX = x; m_logicalOriginY = y; +#ifndef __WXWINCE__ ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); #endif } @@ -1728,13 +1829,13 @@ void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y) { WXMICROWIN_CHECK_HDC -#ifndef __WXWINCE__ if ( x == m_deviceOriginX && y == m_deviceOriginY ) return; m_deviceOriginX = x; m_deviceOriginY = y; +#ifndef __WXWINCE__ ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL); #endif } @@ -1797,16 +1898,19 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, int rop, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask) { - wxCHECK_MSG( source, FALSE, _T("wxDC::Blit(): NULL wxDC pointer") ); + wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") ); - WXMICROWIN_CHECK_HDC_RET(FALSE) + WXMICROWIN_CHECK_HDC_RET(false) + // if either the source or destination has alpha channel, we must use + // AlphaBlt() as other function don't handle it correctly const wxBitmap& bmpSrc = source->m_selectedBitmap; - if ( bmpSrc.Ok() && bmpSrc.HasAlpha() ) + if ( bmpSrc.Ok() && (bmpSrc.HasAlpha() || + (m_selectedBitmap.Ok() && m_selectedBitmap.HasAlpha())) ) { if ( AlphaBlt(GetHdc(), xdest, ydest, width, height, GetHdcOf(*source), bmpSrc) ) - return TRUE; + return true; } wxMask *mask = NULL; @@ -1818,7 +1922,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, { // don't give assert here because this would break existing // programs - just silently ignore useMask parameter - useMask = FALSE; + useMask = false; } } @@ -1859,10 +1963,10 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, case wxNOR: dwRop = NOTSRCCOPY; break; default: wxFAIL_MSG( wxT("unsupported logical function") ); - return FALSE; + return false; } - bool success = FALSE; + bool success = false; if (useMask) { @@ -1873,7 +1977,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, // of the mask which is also contrary to the Windows one) // On some systems, MaskBlt succeeds yet is much much slower - // than the wxWindows fall-back implementation. So we need + // than the wxWidgets fall-back implementation. So we need // to be able to switch this on and off at runtime. #if wxUSE_SYSTEM_OPTIONS if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0) @@ -2015,11 +2119,15 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, SRCCOPY ) == (int)GDI_ERROR ) { - wxLogLastError(wxT("StretchDIBits")); + // On Win9x this API fails most (all?) of the time, so + // logging it becomes quite distracting. Since it falls + // back to the code below this is not really serious, so + // don't log it. + //wxLogLastError(wxT("StretchDIBits")); } else { - success = TRUE; + success = true; } } } @@ -2045,7 +2153,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, } else { - success = TRUE; + success = true; } } @@ -2065,7 +2173,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, } else { - success = TRUE; + success = true; } } } @@ -2116,7 +2224,7 @@ void wxDC::DoGetSizeMM(int *w, int *h) const wxSize wxDC::GetPPI() const { - WXMICROWIN_CHECK_HDC_RET(wxSize()) + WXMICROWIN_CHECK_HDC_RET(wxSize(0,0)) int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX); int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY); @@ -2124,7 +2232,7 @@ wxSize wxDC::GetPPI() const return wxSize(x, y); } -// For use by wxWindows only, unless custom units are required. +// For use by wxWidgets only, unless custom units are required. void wxDC::SetLogicalScale(double x, double y) { WXMICROWIN_CHECK_HDC @@ -2259,7 +2367,7 @@ void wxDC::ClearCache() class wxDCModule : public wxModule { public: - virtual bool OnInit() { return TRUE; } + virtual bool OnInit() { return true; } virtual void OnExit() { wxDC::ClearCache(); } private: @@ -2291,11 +2399,11 @@ static bool AlphaBlt(HDC hdcDst, // bitmaps can be drawn only from GUI thread so there is no need to // protect this static variable from multiple threads - static bool s_triedToLoad = FALSE; + static bool s_triedToLoad = false; static AlphaBlend_t pfnAlphaBlend = NULL; if ( !s_triedToLoad ) { - s_triedToLoad = TRUE; + s_triedToLoad = true; // don't give errors about the DLL being unavailable, we're // prepared to handle this @@ -2328,7 +2436,7 @@ static bool AlphaBlt(HDC hdcDst, bf) ) { // skip wxAlphaBlend() call below - return TRUE; + return true; } wxLogLastError(_T("AlphaBlend")); @@ -2340,11 +2448,12 @@ static bool AlphaBlt(HDC hdcDst, #ifdef wxHAVE_RAW_BITMAP wxAlphaBlend(hdcDst, x, y, width, height, bmp); - return TRUE; + return true; #else // !wxHAVE_RAW_BITMAP // no wxAlphaBlend() neither, fall back to using simple BitBlt() (we lose // alpha but at least something will be shown like this) - return FALSE; + wxUnusedVar(bmp); + return false; #endif // wxHAVE_RAW_BITMAP }