X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c70155b8ee6cdf24966de6bf24370b0454a045ab..c33abc075b86b9b132fc44e5d130481b18182179:/src/msw/textmeasure.cpp

diff --git a/src/msw/textmeasure.cpp b/src/msw/textmeasure.cpp
index 189fc7737f..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
 ///////////////////////////////////////////////////////////////////////////////
@@ -24,7 +23,6 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/dc.h"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
@@ -33,6 +31,8 @@
 
 #include "wx/private/textmeasure.h"
 
+#include "wx/msw/dc.h"
+
 // ============================================================================
 // wxTextMeasure implementation
 // ============================================================================
@@ -41,6 +41,16 @@ void wxTextMeasure::Init()
 {
     m_hdc = NULL;
     m_hfontOld = NULL;
+
+    if ( m_dc )
+    {
+        wxClassInfo* const ci = m_dc->GetImpl()->GetClassInfo();
+
+        if ( ci->IsKindOf(wxCLASSINFO(wxMSWDCImpl)))
+        {
+            m_useDCImpl = false;
+        }
+    }
 }
 
 void wxTextMeasure::BeginMeasuring()
@@ -58,8 +68,12 @@ void wxTextMeasure::BeginMeasuring()
         m_hdc = ::GetDC(GetHwndOf(m_win));
     }
 
-    if ( m_font )
-        m_hfontOld = (HFONT)::SelectObject(m_hdc, GetHfontOf(*m_font));
+    // We need to set the font if it's explicitly specified, of course, but
+    // also if we're associated with a window because the window HDC created
+    // above has the default font selected into it and not the font of the
+    // window.
+    if ( m_font || m_win )
+        m_hfontOld = (HFONT)::SelectObject(m_hdc, GetHfontOf(GetFont()));
 }
 
 void wxTextMeasure::EndMeasuring()
@@ -135,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;