diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-21 14:17:00 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-21 14:17:00 +0000 |
| commit | 128526fc282b69b2abcd0c24e6d042c9dea8c862 (patch) | |
| tree | 7cdfe7b5a70a0e434493d5a9669c1e1c777b9196 | |
| parent | e9bf41eb098a0f9aeea1dc6eca4e63e4642a682f (diff) | |
Fixed browser @ symbol prefix handling...
OS/2 fixes (makeinclude update and filename_isdir needed
#include <sys/types.h>)
MingW fix (makeinclude update)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1886 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | makefiles/makeinclude.mingw | 6 | ||||
| -rw-r--r-- | makefiles/makeinclude.os2x | 9 | ||||
| -rw-r--r-- | src/filename_isdir.cxx | 5 | ||||
| -rw-r--r-- | src/fl_draw.cxx | 8 |
5 files changed, 19 insertions, 12 deletions
@@ -1,5 +1,8 @@ CHANGES IN FLTK 1.1.0b8 + - OS/2 build fixes. + - fl_draw() didn't ignore symbol escapes properly for + the browsers... - New Fl::scheme() methods from FLTK 2.0; currently only the standard ("") and plastic ("plastic") methods are supported. Schemes can be set on the command-line diff --git a/makefiles/makeinclude.mingw b/makefiles/makeinclude.mingw index 4120ef5a7..fde731ba7 100644 --- a/makefiles/makeinclude.mingw +++ b/makefiles/makeinclude.mingw @@ -1,5 +1,5 @@ # -# "$Id: makeinclude.mingw,v 1.1.2.3.2.2 2001/10/27 03:33:25 easysw Exp $" +# "$Id: makeinclude.mingw,v 1.1.2.3.2.3 2001/12/21 14:17:00 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). # @@ -56,6 +56,8 @@ srcdir = . # compiler names: CXX = g++ CC = gcc +MAKEDEPEND = $(CXX) -M +POSTBUILD = echo # flags for C++ compiler: CFLAGS = -Wall -O2 -DWIN32 @@ -96,5 +98,5 @@ IMAGELIBS = $(CXX) -I.. $(CXXFLAGS) $< -c # -# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.2 2001/10/27 03:33:25 easysw Exp $". +# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.3 2001/12/21 14:17:00 easysw Exp $". # diff --git a/makefiles/makeinclude.os2x b/makefiles/makeinclude.os2x index 038d3b6cd..126e37238 100644 --- a/makefiles/makeinclude.os2x +++ b/makefiles/makeinclude.os2x @@ -1,5 +1,5 @@ # -# "$Id: makeinclude.os2x,v 1.1.2.4.2.2 2001/10/27 03:33:25 easysw Exp $" +# "$Id: makeinclude.os2x,v 1.1.2.4.2.3 2001/12/21 14:17:00 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). # Generated automatically from makeinclude.in by configure. @@ -42,6 +42,7 @@ RM =del CXX =gcc.exe CC =gcc.exe MAKEDEPEND =$(CXX) -M +POSTBUILD =echo # flags for C++ compiler: CFLAGS =-Wall -O4 -mpentium -Zmt -fno-exceptions @@ -57,8 +58,8 @@ DSONAME = DSOCOMMAND =echo # libraries to link with: -LDLIBS =-lX11 -lXext -lsocket -lshm -lm -GLDLIBS =-lX11 -lXext -lsocket -lshm -lm +LDLIBS =-lX11 -lXext -lsocket +GLDLIBS =-lX11 -lXext -lsocket LINKFLTK =-L../lib -lfltk LINKFLTKGL =-L../lib -lfltk_gl IMAGELIBS = @@ -98,5 +99,5 @@ CAT3EXT =3 mv t.z $@ # -# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.2 2001/10/27 03:33:25 easysw Exp $". +# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.3 2001/12/21 14:17:00 easysw Exp $". # diff --git a/src/filename_isdir.cxx b/src/filename_isdir.cxx index 069cf8d23..81d52913d 100644 --- a/src/filename_isdir.cxx +++ b/src/filename_isdir.cxx @@ -1,5 +1,5 @@ // -// "$Id: filename_isdir.cxx,v 1.4.2.5.2.4 2001/12/20 19:43:17 easysw Exp $" +// "$Id: filename_isdir.cxx,v 1.4.2.5.2.5 2001/12/21 14:17:00 easysw Exp $" // // Directory detection routines for the Fast Light Tool Kit (FLTK). // @@ -26,6 +26,7 @@ // Used by fl_file_chooser #include "flstring.h" +#include <sys/types.h> #include <sys/stat.h> #include <ctype.h> #include <FL/filename.H> @@ -67,5 +68,5 @@ int filename_isdir(const char* n) { } // -// End of "$Id: filename_isdir.cxx,v 1.4.2.5.2.4 2001/12/20 19:43:17 easysw Exp $". +// End of "$Id: filename_isdir.cxx,v 1.4.2.5.2.5 2001/12/21 14:17:00 easysw Exp $". // diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx index 107ea08ee..a8f722bdc 100644 --- a/src/fl_draw.cxx +++ b/src/fl_draw.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_draw.cxx,v 1.6.2.4.2.7 2001/11/19 20:59:59 easysw Exp $" +// "$Id: fl_draw.cxx,v 1.6.2.4.2.8 2001/12/21 14:17:00 easysw Exp $" // // Label drawing code for the Fast Light Tool Kit (FLTK). // @@ -94,8 +94,8 @@ expand(const char* from, char* buf, double maxw, int& n, double &width, *o++ = c ^ 0x40; } else if (c == 0xA0) { // non-breaking space *o++ = ' '; - } else if (c == '@') { // Symbol??? - if (p[1] && p[1] != '@' && draw_symbols) break; + } else if (c == '@' && draw_symbols) { // Symbol??? + if (p[1] && p[1] != '@') break; *o++ = c; if (p[1]) p++; } else { @@ -327,5 +327,5 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) { } // -// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.7 2001/11/19 20:59:59 easysw Exp $". +// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.8 2001/12/21 14:17:00 easysw Exp $". // |