From 7b49e892b88414d692736a310dc615fc0f9b9acf Mon Sep 17 00:00:00 2001 From: Fabien Costantini Date: Thu, 11 Dec 2008 14:38:04 +0000 Subject: Fixing corelib would not compile under vc6 following fl_text_extents() addons. checked on win32/vc6,macosx. Please on other win32 compilers. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6578 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_font.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/fl_font.cxx') diff --git a/src/fl_font.cxx b/src/fl_font.cxx index 6f9a1e0f6..b451ad170 100644 --- a/src/fl_font.cxx +++ b/src/fl_font.cxx @@ -69,10 +69,11 @@ void fl_draw(const char* str, int x, int y) { } void fl_text_extents(const char *c, int &dx, int &dy, int &w, int &h) { - if (c) return fl_text_extents(c, strlen(c), dx, dy, w, h); - // else - w = 0; h = 0; - dx = 0; dy = 0; + if (c) fl_text_extents(c, strlen(c), dx, dy, w, h); + else { + w = 0; h = 0; + dx = 0; dy = 0; + } } // fl_text_extents -- cgit v1.2.3