Fix menu drawing...

src/fl_draw.cxx:
    - fl_measure(): use "h" instead of "min(w,h)", since "w" is
      usually 0.

src/Fl_Menu.cxx:
    - Revert previous "fix" in Fl_Menu_Item::measure()


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4070 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 2 insertions, 2 deletions

diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx
index 6ff90a914..98d1b997a 100644
--- a/src/fl_draw.cxx
+++ b/src/fl_draw.cxx
@@ -295,12 +295,12 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) {
          *symptr++ = *str++);
     *symptr = '\0';
     if (isspace(*str)) str++;
-    symwidth[0] = min(w,h);
+    symwidth[0] = h;
   }
 
   if (str && (p = strrchr(str, '@')) != NULL && p > (str + 1)) {
     strlcpy(symbol[1], p, sizeof(symbol[1]));
-    symwidth[1] = min(w,h);
+    symwidth[1] = h;
   }
 
   symtotal = symwidth[0] + symwidth[1];