mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed browser @ symbol prefix handling...

Browse Source 
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
This commit is contained in:
Michael R Sweet 2001-12-21 14:17:00 +00:00
parent e9bf41eb09
commit 128526fc28
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -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

6
makefiles/makeinclude.mingw
View File

@ -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 $".
#

9
makefiles/makeinclude.os2x
View File

@ -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 $".
#

5
src/filename_isdir.cxx
View File

@ -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 $".
//

8
src/fl_draw.cxx
View File

@ -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 $".
//