Don't use DDEExec registry key in wxMSW wxExecute() if it's empty.

[wxWidgets.git] / src / msw / textmeasure.cpp

diff --git a/src/msw/textmeasure.cpp b/src/msw/textmeasure.cpp
index 48af0cf4991f7abbf967953ed2ed31a1a2a4a864..d03a5f369acdf5d1ae79a4046f7dc92b6f7b0c25 100644 (file)
--- 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;