X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ab8b6ddfa26fbabeadad36966a21a42fe649b1..d863389f773348f5b6e06243050d4379d66de05d:/src/mgl/dc.cpp diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp index 7ec1cb6030..81a69d8c58 100644 --- a/src/mgl/dc.cpp +++ b/src/mgl/dc.cpp @@ -220,7 +220,7 @@ void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch) DO_SET_CLIPPING_BOX(m_currentClippingRegion) } -void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region) +void wxDC::DoSetDeviceClippingRegion(const wxRegion& region) { wxCHECK_RET( Ok(), wxT("invalid dc") ); @@ -1237,7 +1237,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, if ( x ) // VS: YDEV is corrent, it should *not* be XDEV, because font's are // only scaled according to m_scaleY - *x = YDEV2LOGREL(m_MGLDC->textWidth(string.c_str())); + *x = YDEV2LOGREL(m_MGLDC->textWidth(string.wc_str())); if ( y ) *y = YDEV2LOGREL(m_MGLDC->textHeight()); if ( descent )