diff --git a/src/wxwindow/src/msw/wx_dc.cxx b/src/wxwindow/src/msw/wx_dc.cxx
index 00a5dc37e4..80b46aa511 100644
--- a/src/wxwindow/src/msw/wx_dc.cxx
+++ b/src/wxwindow/src/msw/wx_dc.cxx
@@ -2214,14 +2214,14 @@ void wxDC::GetTextExtent(const char *string, double *x, double *y,
     once = 0;
   }
 
-  if (descent || topSpace)
+  if (descent || topSpace || (!len && !ty))
     GetTextMetrics(dc, &tm);
 
   DoneDC(dc);
 
   *x = (double)tx;
   if (!len && !ty) {
-    *y = (double)tm.tmHeight;;
+    *y = (double)tm.tmHeight;
   } else {
     *y = (double)ty;
   }