From a00b52a6760c83414a518a69d91761389d9db322 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sat, 27 Oct 2001 16:38:36 +0000 Subject: [PATCH] Wasn't quoting @label stuff... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1662 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 3 +++ test/symbols.cxx | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index e6ca1ad54..de915855f 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,9 @@ CHANGES IN FLTK 1.1.0b5 - Fl_Help_Func now takes a Fl_Widget pointer as well as a pathname. - Added code to support FL_KEYUP events. + - The symbols demo didn't show the strings needed to + show the corresponding symbol (the label string was + not quoted...) CHANGES IN FLTK 1.1.0b4 diff --git a/test/symbols.cxx b/test/symbols.cxx index 097cb1dd0..e71190ca8 100644 --- a/test/symbols.cxx +++ b/test/symbols.cxx @@ -1,5 +1,5 @@ // -// "$Id: symbols.cxx,v 1.4.2.3 2001/01/22 15:13:41 easysw Exp $" +// "$Id: symbols.cxx,v 1.4.2.3.2.1 2001/10/27 16:38:36 easysw Exp $" // // Symbol test program for the Fast Light Tool Kit (FLTK). // @@ -23,8 +23,9 @@ // Please report all bugs and problems to "fltk-bugs@fltk.org". // -#include #include +#include +#include #include #include #include @@ -41,14 +42,15 @@ Fl_Window *window; void bt(const char *name) { int x = N%COLS; int y = N/COLS; + char buf[255]; N++; x = x*W+10; y = y*H+10; - Fl_Box *a = new Fl_Box(FL_NO_BOX,x,y,W-20,H-20,name); + sprintf(buf, "@%s", name); + Fl_Box *a = new Fl_Box(FL_NO_BOX,x,y,W-20,H-20,strdup(buf)); a->align(FL_ALIGN_BOTTOM); a->labelsize(11); Fl_Box *b = new Fl_Box(FL_UP_BOX,x,y,W-20,H-20,name); - b->labeltype(FL_SYMBOL_LABEL); b->labelcolor(FL_DARK3); } @@ -85,5 +87,5 @@ bt("@DnArrow"); } // -// End of "$Id: symbols.cxx,v 1.4.2.3 2001/01/22 15:13:41 easysw Exp $". +// End of "$Id: symbols.cxx,v 1.4.2.3.2.1 2001/10/27 16:38:36 easysw Exp $". //