From 31f02e194dc1fdab0d6c6ab53c888d8c19d9e83f Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 17 Jun 2007 00:00:19 +0000 Subject: [PATCH] adjust get-text-extent on empty string for Windows svn: r6678 --- src/wxwindow/src/msw/wx_dc.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/wxwindow/src/msw/wx_dc.cxx b/src/wxwindow/src/msw/wx_dc.cxx index 46e8553546..00a5dc37e4 100644 --- a/src/wxwindow/src/msw/wx_dc.cxx +++ b/src/wxwindow/src/msw/wx_dc.cxx @@ -2220,7 +2220,11 @@ void wxDC::GetTextExtent(const char *string, double *x, double *y, DoneDC(dc); *x = (double)tx; - *y = (double)ty; + if (!len && !ty) { + *y = (double)tm.tmHeight;; + } else { + *y = (double)ty; + } if (descent) *descent = (double)tm.tmDescent; if (topSpace) *topSpace = (double)tm.tmInternalLeading;