diff options
| author | Fabien Costantini <fabien@onepost.net> | 2008-12-11 14:38:04 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2008-12-11 14:38:04 +0000 |
| commit | 7b49e892b88414d692736a310dc615fc0f9b9acf (patch) | |
| tree | 6321aa1112231687b5e41de563ef9a5881ea21dd /src/fl_font.cxx | |
| parent | 26c643740789d87ec14dce4f3892dbbf84ab558a (diff) | |
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
Diffstat (limited to 'src/fl_font.cxx')
| -rw-r--r-- | src/fl_font.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
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 |
