X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d78aa51b17c8d218d6392c7a4985a60d4a596c46..5bac960d404f6fc82f6d7c4c697dd018657d24ab:/src/msw/textmeasure.cpp diff --git a/src/msw/textmeasure.cpp b/src/msw/textmeasure.cpp index 48af0cf499..d03a5f369a 100644 --- a/src/msw/textmeasure.cpp +++ b/src/msw/textmeasure.cpp @@ -3,7 +3,6 @@ // Purpose: wxTextMeasure implementation for wxMSW // Author: Manuel Martin // Created: 2012-10-05 -// RCS-ID: $Id: // Copyright: (c) 1997-2012 wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -150,8 +149,11 @@ void wxTextMeasure::DoGetTextExtent(const wxString& string, bool wxTextMeasure::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths, - double WXUNUSED(scaleX)) + double scaleX) { + if ( !m_hdc ) + return wxTextMeasureBase::DoGetPartialTextExtents(text, widths, scaleX); + static int maxLenText = -1; static int maxWidth = -1;