Added more makefiles; fixed some samples for Cygwin

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-09 16:00:23 +00:00
parent fed485e094
commit dbda9e86f0
84 changed files with 1997 additions and 1578 deletions

View File

@@ -14,7 +14,8 @@
WXDIR = $(WXWIN)
TARGET=dialoged
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtable.obj winstyle.obj
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj\
edtree.obj edlist.obj symbtabl.obj winstyle.obj
!include $(WXDIR)\src\makeb32.env
!include $(WXDIR)\src\makeprog.b32

View File

@@ -1,61 +1,17 @@
#
# File: makefile.g95
# Author: Julian Smart
# Created: 1996
# Updated:
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# "%W% %G%"
#
# Makefile for Dialog Editor (GNU-WIN32)
# Makefile for wxWindows Dialog Editor (Cygwin/Mingw32).
WXDIR = ../../..
# All common UNIX compiler flags and options are now in
# this central makefile.
include $(WXDIR)/src/makeg95.env
TARGET=dialoged
OBJECTS = $(TARGET).o reseditr.o dlghndlr.o reswrite.o\
winprop.o edtree.o edlist.o symbtabl.o winstyle.o
OBJECTS = $(OBJDIR)/dialoged.$(OBJSUFF) $(OBJDIR)/reseditr.$(OBJSUFF)\
$(OBJDIR)/dlghndlr.$(OBJSUFF) $(OBJDIR)/reswrite.$(OBJSUFF) $(OBJDIR)/winprop.$(OBJSUFF)\
$(OBJDIR)/edlist.$(OBJSUFF) $(OBJDIR)/edtree.$(OBJSUFF) $(OBJDIR)/winstyle.$(OBJSUFF) $(OBJDIR)/symbtabl.$(OBJSUFF)\
$(OBJDIR)/dialoged_resources.$(OBJSUFF)
include $(WXDIR)/src/makeprog.g95
all: $(OBJDIR) dialoged$(GUISUFFIX)$(EXESUFF)
$(OBJDIR):
mkdir $(OBJDIR)
dialoged$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB)
$(CC) $(LDFLAGS) -o dialoged$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(XVIEW_LINK) $(LDLIBS)
$(OBJDIR)/dialoged.$(OBJSUFF): dialoged.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ dialoged.$(SRCSUFF)
$(OBJDIR)/winprop.$(OBJSUFF): winprop.h reseditr.h winprop.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ winprop.$(SRCSUFF)
$(OBJDIR)/reswrite.$(OBJSUFF): winprop.h reseditr.h reswrite.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ reswrite.$(SRCSUFF)
$(OBJDIR)/reseditr.$(OBJSUFF): winprop.h reseditr.h reseditr.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ reseditr.$(SRCSUFF)
$(OBJDIR)/dlghndlr.$(OBJSUFF): winprop.h reseditr.h dlghndlr.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ dlghndlr.$(SRCSUFF)
$(OBJDIR)/edlist.$(OBJSUFF): winprop.h edlist.h edlist.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ edlist.$(SRCSUFF)
$(OBJDIR)/edtree.$(OBJSUFF): winprop.h edtree.h edtree.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
$(OBJDIR)/winstyle.$(OBJSUFF): winstyle.h winstyle.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ winstyle.$(SRCSUFF)
$(OBJDIR)/symbtabl.$(OBJSUFF): symbtabl.h symbtabl.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ symbtabl.$(SRCSUFF)
$(OBJDIR)/dialoged_resources.o: dialoged.rc
$(RESCOMP) -i dialoged.rc -o $(OBJDIR)/dialoged_resources.o $(RESFLAGS)
clean:
rm -f $(OBJECTS) dialoged$(GUISUFFIX).exe core *.rsc *.res

View File

@@ -0,0 +1,18 @@
#
# File: makefile.b32
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright:
#
# Makefile : Builds sample for 32-bit BC++
WXDIR = $(WXWIN)
TARGET=cube
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win
OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.b32

View File

@@ -0,0 +1,21 @@
#
# File: makefile.bcc
# Author: Julian Smart
# Created: 1998
# Updated:
#
# Builds a BC++ 16-bit sample
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
WXDIR = $(WXWIN)
TARGET=cube
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win
OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.bcc

View File

@@ -1,37 +1,18 @@
#
# File: makefile.unx
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# "%W% %G%"
#
# Makefile for cube example (UNIX).
# Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../..
WXDIR = ../../../..
# All common UNIX compiler flags and options are now in
# this central makefile.
include $(WXDIR)/src/makeg95.env
TARGET=cube
EXTRACPPFLAGS=-I../../win
EXTRALIBS=-lglcanvas -lopengl32 -lglu32
OBJECTS = $(TARGET).o
OBJECTS = $(OBJDIR)/cube.$(OBJSUFF)
include $(WXDIR)/src/makeprog.g95
all: $(OBJDIR) cube$(GUISUFFIX)$(EXESUFF)
wx:
$(OBJDIR):
mkdir $(OBJDIR)
cube$(GUISUFFIX)$(EXESUFF): $(OBJDIR)/cube.$(OBJSUFF) cube.res $(WXLIB)
$(CC) $(LDFLAGS) -o cube$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/cube.$(OBJSUFF) $(LDLIBS)
$(RSRC) cube.$(RESSUFF) cube.exe
$(OBJDIR)/cube.$(OBJSUFF): cube.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ cube.$(SRCSUFF)
cube.res: cube.rc
clean:
rm -f $(OBJECTS) cube$(GUISUFFIX).exe core *.rsc *.res

View File

@@ -0,0 +1,17 @@
#
# Makefile for WATCOM
#
# Created by Julian Smart, January 1999
#
#
WXDIR = $(%WXWIN)
PROGRAM = cube
OBJECTS = $(PROGRAM).obj
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win
!include $(WXDIR)\src\makeprog.wat

View File

@@ -0,0 +1,22 @@
#
# File: makefile.b32
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright:
#
# Makefile : Builds sample for 32-bit BC++
WXDIR = $(WXWIN)
TARGET=isosurf
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win
OBJECTS = $(TARGET).obj
EXTRATARGETS=isosurf.dat
!include $(WXDIR)\src\makeprog.b32
isosurf.dat: isosurf.dat.gz
gzip -c -d isosurf.dat.gz > isosurf.dat

View File

@@ -0,0 +1,25 @@
#
# File: makefile.bcc
# Author: Julian Smart
# Created: 1998
# Updated:
#
# Builds a BC++ 16-bit sample
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
WXDIR = $(WXWIN)
TARGET=isosurf
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win
OBJECTS = $(TARGET).obj
EXTRATARGETS=isosurf.dat
!include $(WXDIR)\src\makeprog.bcc
isosurf.dat: isosurf.dat.gz
gzip -c -d isosurf.dat.gz > isosurf.dat

View File

@@ -0,0 +1,20 @@
#
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../../../..
TARGET=isosurf
EXTRACPPFLAGS=-I../../win
EXTRALIBS=-lglcanvas -lopengl32 -lglu32
OBJECTS = $(TARGET).o
include $(WXDIR)/src/makeprog.g95
isosurf.dat: isosurf.dat.gz
gzip -c -d isosurf.dat.gz > isosurf.dat

View File

@@ -0,0 +1,20 @@
#
# Makefile for WATCOM
#
# Created by Julian Smart, January 1999
#
#
WXDIR = $(%WXWIN)
PROGRAM = isosurf
OBJECTS = $(PROGRAM).obj
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win
EXTRATARGETS=isosurf.dat
!include $(WXDIR)\src\makeprog.wat
isosurf.dat: isosurf.dat.gz
gzip -c -d isosurf.dat.gz > isosurf.dat

View File

@@ -0,0 +1,18 @@
#
# File: makefile.b32
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright:
#
# Makefile : Builds sample for 32-bit BC++
WXDIR = $(WXWIN)
TARGET=penguin
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win
OBJECTS = $(TARGET).obj lw.obj trackball.obj
!include $(WXDIR)\src\makeprog.b32

View File

@@ -0,0 +1,21 @@
#
# File: makefile.bcc
# Author: Julian Smart
# Created: 1998
# Updated:
#
# Builds a BC++ 16-bit sample
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
WXDIR = $(WXWIN)
TARGET=cube
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win
OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.bcc

View File

@@ -0,0 +1,18 @@
#
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../../../..
TARGET=penguin
EXTRACPPFLAGS=-I../../win
EXTRALIBS=-lglcanvas -lopengl32 -lglu32
OBJECTS = $(TARGET).o lw.o trackball.o
include $(WXDIR)/src/makeprog.g95

View File

@@ -0,0 +1,17 @@
#
# Makefile for WATCOM
#
# Created by Julian Smart, January 1999
#
#
WXDIR = $(%WXWIN)
PROGRAM = cube
OBJECTS = $(PROGRAM).obj
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win
!include $(WXDIR)\src\makeprog.wat

View File

@@ -0,0 +1,17 @@
#
# File: makefile.b32
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright:
#
# Makefile : Builds wxGLCanvas library for 32-bit BC++
WXDIR = $(WXWIN)
LIBTARGET=$(WXDIR)\lib\glcanvas.lib
OBJECTS = glcanvas.obj
!include $(WXDIR)\src\makelib.b32

View File

@@ -0,0 +1,19 @@
#
# File: makefile.bcc
# Author: Julian Smart
# Created: 1998
# Updated:
#
# Builds a BC++ 16-bit sample
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
WXDIR = $(WXWIN)
TARGET=minimal
OBJECTS=$(TARGET).obj
!include $(WXDIR)\src\makeprog.bcc

View File

@@ -0,0 +1,16 @@
#
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# Makefile for wxWindows wxGLCanvas library Cygwin/Mingw32).
WXDIR = ../../..
LIBTARGET=$(WXDIR)/lib/libglcanvas.a
OBJECTS = glcanvas.o
include $(WXDIR)/src/makelib.g95

View File

@@ -0,0 +1,16 @@
#!/binb/wmake.exe
#
# File: makefile.wat
# Author: Julian Smart
# Created: 1999
#
# Makefile : Builds wxGLCanvas library for Watcom C++, WIN32
WXDIR = $(%WXWIN)
OBJECTS=glcanvas.obj
LIBTARGET=$(WXDIR)\lib\glcanvas.lib
!include $(WXDIR)\src\makelib.wat

View File

@@ -0,0 +1 @@
include ../../../../install/unix/setup/general/makedirs

View File

@@ -0,0 +1,29 @@
# WXXT base directory
WXBASEDIR=@WXBASEDIR@
# set the OS type for compilation
OS=@OS@
# compile a binary only
RULE=bin
# define exexutable name
BIN_TARGET=ogledit
# define library sources
BIN_SRC=\
ogledit.cpp\
doc.cpp\
view.cpp\
palette.cpp
#define library objects
BIN_OBJ=\
$(BIN_CPP_SRC:.cpp=.o)
# additional things needed to link
BIN_LINK=-lwx_ogl_gtk
# additional things needed to compile
ADD_COMPILE=-I../../src
# include the definitions now
include ../../../../../template.mak

View File

@@ -1,88 +1,18 @@
#
# File: makefile.bcc
# File: makefile.b32
# Author: Julian Smart
# Created: 1996
# Created: 1999
# Updated:
# Copyright: (c) 1996
# Copyright:
#
# "%W% %G%"
#
# Makefile : Builds OGL example for BC++, 32-bit.
!if "$(BCCDIR)" == ""
!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
!endif
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
!ifndef FINAL
FINAL=0
!endif
# Makefile : Builds sample for 32-bit BC++
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makeb32.env
THISDIR = $(WXDIR)\utils\ogl\samples\ogledit
TARGET=ogledit
EXTRALIBS=$(WXDIR)\lib\ogl.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
OGLDIR = ..\.. # $(WXDIR)\utils\ogl # Command line too long!
OGLINC = $(OGLDIR)\src
OGLLIB = $(WXDIR)\lib\ogl.lib
!include $(WXDIR)\src\makeprog.b32
WXLIB = $(WXDIR)\lib\wx32.lib
LIBS=$(WXLIB) $(OGLLIB) cw32 import32 ole2w32
INC=/I$(OGLINC)
CFG=$(WXDIR)\src\wxwin32.cfg
!if "$(FINAL)" == "0"
LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
OPT = -Od
DEBUG_FLAGS= -v -DDEBUG=$(DEBUG)
!else
LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
OPT = -O2
DEBUG_FLAGS = -DDEBUG=$(DEBUG)
!endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
OBJECTS = ogledit.obj doc.obj view.obj palette.obj
all: ogl ogledit.exe
ogl:
cd $(OGLDIR)\src
make -f makefile.b32
cd $(THISDIR)
ogledit.exe: $(WXLIB) $(OBJECTS) ogledit.def ogledit.res
tlink32 $(LINKFLAGS) @&&!
c0w32.obj $(OBJECTS)
ogledit
nul
$(LIBS)
ogledit.def
ogledit.res
!
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) $(INC) -c {$< }
ogledit.obj: ogledit.$(SRCSUFF)
doc.obj: doc.$(SRCSUFF)
view.obj: view.$(SRCSUFF)
palette.obj: palette.$(SRCSUFF)
ogledit.res : ogledit.rc $(WXDIR)\include\msw\wx.rc
brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa ogledit
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase *.map
-erase *.rws

View File

@@ -1,87 +1,21 @@
#
# File: makefile.bcc
# Author: Julian Smart
# Created: 1996
# Created: 1998
# Updated:
# Copyright: (c) 1996
#
# "%W% %G%"
#
# Makefile : Builds OGL example for BC++, 16-bit.
!if "$(BCCDIR)" == ""
!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
!endif
# Builds a BC++ 16-bit sample
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
!ifndef FINAL
FINAL=0
!endif
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makebcc.env
THISDIR = $(WXDIR)\utils\ogl\samples\ogledit
TARGET=ogledit
EXTRALIBS=$(WXDIR)\lib\ogl.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
OGLDIR = $(WXDIR)\utils\ogl
OGLINC = $(OGLDIR)\src
OGLLIB = $(OGLDIR)\lib\ogl.lib
!include $(WXDIR)\src\makeprog.b32
WXLIB = $(WXDIR)\lib\wx.lib
LIBS=$(WXLIB) $(OGLLIB) mathwl cwl import
INC=/I$(OGLINC)
CFG=$(WXDIR)\src\wxwin.cfg
!if "$(FINAL)" == "0"
LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
OPT = -Od
DEBUG_FLAGS= -v
!else
LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
OPT = -O2
DEBUG_FLAGS =
!endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
OBJECTS = ogledit.obj doc.obj view.obj palette.obj
all: ogl ogledit.exe
ogl:
cd $(OGLDIR)\src
make -f makefile.bcc
cd $(THISDIR)
ogledit.exe: $(WXLIB) $(OBJECTS) ogledit.def ogledit.res
tlink $(LINKFLAGS) @&&!
c0wl.obj $(OBJECTS)
ogledit
nul
$(LIBS)
ogledit.def
!
rc -30 -K ogledit.res
.$(SRCSUFF).obj:
bcc $(CPPFLAGS) $(INC) -c {$< }
ogledit.obj: ogledit.$(SRCSUFF)
doc.obj: doc.$(SRCSUFF)
view.obj: view.$(SRCSUFF)
palette.obj: palette.$(SRCSUFF)
ogledit.res : ogledit.rc $(WXDIR)\include\wx\msw\wx.rc
rc -r /i$(BCCDIR)\include /i$(WXDIR)\include ogledit
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase *.map
-erase *.rws

View File

@@ -0,0 +1,18 @@
#
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../../../..
TARGET=ogledit
EXTRACPPFLAGS=-I../../src
EXTRALIBS=-logl
OBJECTS = $(TARGET).o doc.o view.o palette.o
include $(WXDIR)/src/makeprog.g95

View File

@@ -0,0 +1,19 @@
#
# File: makefile.b32
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright:
#
# Makefile : Builds sample for 32-bit BC++
WXDIR = $(WXWIN)
TARGET=studio
EXTRALIBS=$(WXDIR)\lib\ogl.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
mainfrm.obj project.obj dialogs.obj csprint.obj
!include $(WXDIR)\src\makeprog.b32

View File

@@ -0,0 +1,22 @@
#
# File: makefile.bcc
# Author: Julian Smart
# Created: 1998
# Updated:
#
# Builds a BC++ 16-bit sample
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
WXDIR = $(WXWIN)
TARGET=studio
EXTRALIBS=$(WXDIR)\lib\ogl.lib
EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
mainfrm.obj project.obj dialogs.obj csprint.obj
!include $(WXDIR)\src\makeprog.b32

View File

@@ -0,0 +1,19 @@
#
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../../../..
TARGET=studio
EXTRACPPFLAGS=-I../../src
EXTRALIBS=-logl
OBJECTS = $(TARGET).o doc.o shapes.o symbols.o view.o cspalette.o\
mainfrm.o project.o dialogs.o csprint.o
include $(WXDIR)/src/makeprog.g95

View File

@@ -2007,7 +2007,7 @@ void wxShape::ReadAttributes(wxExpr *clause)
if (brush_string == "")
brush_string = "WHITE";
if (pen_string[0] == '#')
if (pen_string.GetChar(0) == '#')
{
wxColour col(oglHexToColour(pen_string.After('#')));
m_pen = wxThePenList->FindOrCreatePen(col, pen_width, pen_style);
@@ -2018,7 +2018,7 @@ void wxShape::ReadAttributes(wxExpr *clause)
if (!m_pen)
m_pen = wxBLACK_PEN;
if (brush_string[0] == '#')
if (brush_string.GetChar(0) == '#')
{
wxColour col(oglHexToColour(brush_string.After('#')));
m_brush = wxTheBrushList->FindOrCreateBrush(col, brush_style);

View File

@@ -1158,16 +1158,16 @@ void wxOpPolyDraw::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
wxString hexString = expr->Nth(2)->StringValue();
while (i < m_noPoints)
{
buf1[0] = hexString[bufPtr];
buf1[1] = hexString[bufPtr + 1];
buf1[2] = hexString[bufPtr + 2];
buf1[3] = hexString[bufPtr + 3];
buf1[0] = hexString[(size_t)bufPtr];
buf1[1] = hexString[(size_t)(bufPtr + 1)];
buf1[2] = hexString[(size_t)(bufPtr + 2)];
buf1[3] = hexString[(size_t)(bufPtr + 3)];
buf1[4] = 0;
buf2[0] = hexString[bufPtr + 4];
buf2[1] = hexString[bufPtr + 5];
buf2[2] = hexString[bufPtr + 6];
buf2[3] = hexString[bufPtr + 7];
buf2[0] = hexString[(size_t)(bufPtr + 4)];
buf2[1] = hexString[(size_t)(bufPtr + 5)];
buf2[2] = hexString[(size_t)(bufPtr + 6)];
buf2[3] = hexString[(size_t)(bufPtr + 7)];
buf2[4] = 0;
bufPtr += 8;

View File

@@ -1,106 +1,18 @@
#
# File: makefile.b32
# Author: Julian Smart
# Created: 1996
# Created: 1999
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#
# Makefile : Builds OGL for BC++, 32-bit.
# Makefile : Builds OGL library for 32-bit BC++
!if "$(BCCDIR)" == ""
!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
!endif
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
# Change WXDIR to wherever wxWindows is found
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makeb32.env
WXLIB = $(WXDIR)\lib\wx32.lib
WXINC = $(WXDIR)\include
CFG=$(WXWIN)\src\wxwin32.cfg
OGLDIR = $(WXDIR)\utils\ogl
OGLLIB = $(WXDIR)\lib\ogl.lib
DOCDIR = $(OGLDIR)\docs
INC=/DPROLOGIO=1 # /I$(WXDIR)\include\base /I$(WXDIR)\include\msw
LIBS=$(WXLIB) $(OGLLIB) mathwl cwl import mathwl
!ifndef FINAL
FINAL=0
!endif
!if "$(FINAL)" == "0"
LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
OPT = -Od
DEBUG_FLAGS= -v -DDEBUG=$(DEBUG)
!else
LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
OPT = -O2
DEBUG_FLAGS = -DDEBUG=$(DEBUG)
!endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
CFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
LIBTARGET=$(WXDIR)\lib\ogl.lib
OBJECTS = basic.obj basic2.obj canvas.obj ogldiag.obj lines.obj misc.obj divided.obj constrnt.obj\
composit.obj drawn.obj bmpshape.obj mfutils.obj
all: $(OGLLIB)
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) $(INC) -c {$< }
$(OGLLIB): $(OBJECTS)
erase $(OGLLIB)
tlib /P128 @&&!
$(OGLLIB) &
+$(OBJECTS:.obj =.obj +)
!
# Making documents
docs: hlp
hlp: $(DOCDIR)/ogl.hlp
hlp32: $(DOCDIR)/hlp32/ogl.hlp
rtf: $(DOCDIR)/ogl.rtf
$(DOCDIR)/ogl.hlp: $(DOCDIR)/ogl.rtf $(DOCDIR)/ogl.hpj
cd $(DOCDIR)
-erase ogl.ph
hc ogl
cd $(THISDIR)
$(DOCDIR)/hlp32/ogl.hlp: $(DOCDIR)/hlp32/ogl.rtf $(DOCDIR)/hlp32/ogl.hpj
cd $(DOCDIR)/hlp32
-erase ogl.ph
start /w hcw /c /e ogl.hpj
cd $(THISDIR)
$(DOCDIR)/ogl.rtf: $(DOCDIR)/classes.tex $(DOCDIR)/intro.tex $(DOCDIR)/ogl.tex
cd $(DOCDIR)
start /w tex2rtf $(DOCDIR)/ogl.tex $(DOCDIR)/ogl.rtf -twice -winhelp
cd $(THISDIR)
$(DOCDIR)/hlp32/ogl.rtf: $(DOCDIR)/classes.tex $(DOCDIR)/intro.tex $(DOCDIR)/ogl.tex
cd $(DOCDIR)
start /w tex2rtf $(DOCDIR)/ogl.tex $(DOCDIR)/hlp32/ogl.rtf -twice -winhelp -macros $(DOCDIR)/t2rtf32.ini
cd $(THISDIR)
wordrtf:
cd $(DOCDIR)
-wx /W tex2rtf $(DOCDIR)/ogl.tex $(DOCDIR)/ogl.rtf -twice -rtf
cd $(THISDIR)
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase ..\lib\*.lib $(OGLLIB)
!include $(WXDIR)\src\makelib.b32

View File

@@ -1,105 +1,21 @@
#
# File: makefile.bcc
# Author: Julian Smart
# Created: 1996
# Created: 1998
# Updated:
# Copyright: (c) 1996
#
# "%W% %G%"
#
# Makefile : Builds OGL for BC++, 16-bit.
!if "$(BCCDIR)" == ""
!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
!endif
# Builds OGL library for BC++, 16-bit
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
# Change WXDIR to wherever wxWindows is found
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makebcc.env
WXLIB = $(WXDIR)\lib\wx.lib
WXINC = $(WXDIR)\include
CFG=$(WXWIN)\src\wxwin.cfg
OGLDIR = $(WXDIR)\utils\ogl
OGLLIB = $(OGLDIR)\lib\ogl.lib
DOCDIR = $(OGLDIR)\docs
INC=/DPROLOGIO=1 # /I$(WXDIR)\include\base /I$(WXDIR)\include\msw
LIBS=$(WXLIB) $(OGLLIB) mathwl cwl import mathwl
!ifndef FINAL
FINAL=0
!endif
!if "$(FINAL)" == "0"
LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
OPT = -Od
DEBUG_FLAGS= -v
!else
LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
OPT = -O2
DEBUG_FLAGS=
!endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
CFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
LIBTARGET=$(WXDIR)\lib\ogl.lib
OBJECTS = basic.obj basic2.obj canvas.obj ogldiag.obj lines.obj misc.obj divided.obj constrnt.obj\
composit.obj drawn.obj bitmap.obj mfutils.obj
composit.obj drawn.obj bmpshape.obj mfutils.obj
all: $(OGLLIB)
.$(SRCSUFF).obj:
bcc $(CPPFLAGS) $(INC) -c {$< }
$(OGLLIB): $(OBJECTS)
erase $(OGLLIB)
tlib /P128 @&&!
$(OGLLIB) &
+$(OBJECTS:.obj =.obj +)
!
# Making documents
docs: hlp
hlp: $(DOCDIR)/ogl.hlp
hlp32: $(DOCDIR)/hlp32/ogl.hlp
rtf: $(DOCDIR)/ogl.rtf
$(DOCDIR)/ogl.hlp: $(DOCDIR)/ogl.rtf $(DOCDIR)/ogl.hpj
cd $(DOCDIR)
-erase ogl.ph
hc ogl
cd $(THISDIR)
$(DOCDIR)/hlp32/ogl.hlp: $(DOCDIR)/hlp32/ogl.rtf $(DOCDIR)/hlp32/ogl.hpj
cd $(DOCDIR)/hlp32
-erase ogl.ph
start /w hcw /c /e ogl.hpj
cd $(THISDIR)
$(DOCDIR)/ogl.rtf: $(DOCDIR)/classes.tex $(DOCDIR)/intro.tex $(DOCDIR)/ogl.tex
cd $(DOCDIR)
start /w tex2rtf $(DOCDIR)/ogl.tex $(DOCDIR)/ogl.rtf -twice -winhelp
cd $(THISDIR)
$(DOCDIR)/hlp32/ogl.rtf: $(DOCDIR)/classes.tex $(DOCDIR)/intro.tex $(DOCDIR)/ogl.tex
cd $(DOCDIR)
start /w tex2rtf $(DOCDIR)/ogl.tex $(DOCDIR)/hlp32/ogl.rtf -twice -winhelp -macros $(DOCDIR)/t2rtf32.ini
cd $(THISDIR)
wordrtf:
cd $(DOCDIR)
-wx /W tex2rtf $(DOCDIR)/ogl.tex $(DOCDIR)/ogl.rtf -twice -rtf
cd $(THISDIR)
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase ..\lib\*.lib
!include $(WXDIR)\src\makelib.bcc

View File

@@ -0,0 +1,17 @@
#
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# Makefile for wxWindows OGL library Cygwin/Mingw32).
WXDIR = ../../..
LIBTARGET=$(WXDIR)/lib/libogl.a
OBJECTS = basic.o basic2.o canvas.o ogldiag.o lines.o misc.o divided.o constrnt.o\
composit.o drawn.o bmpshape.o mfutils.o
include $(WXDIR)/src/makelib.g95

View File

@@ -1,61 +1,16 @@
#
# File: makefile.g95
# Author: Julian Smart
# Created: 1996
# Updated:
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# "%W% %G%"
#
# Makefile for Tex2RTF (GNU-WIN32)
# Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../../..
# All common UNIX compiler flags and options are now in
# this central makefile.
include $(WXDIR)/src/makeg95.env
TARGET=tex2rtf
OBJECTS = $(TARGET).o texutils.o tex2any.o htmlutil.o rtfutils.o xlputils.o table.o readshg.o
OBJECTS = $(OBJDIR)/tex2rtf.$(OBJSUFF) $(OBJDIR)/texutils.$(OBJSUFF) $(OBJDIR)/tex2any.$(OBJSUFF)\
$(OBJDIR)/htmlutil.$(OBJSUFF) $(OBJDIR)/rtfutils.$(OBJSUFF) $(OBJDIR)/xlputils.$(OBJSUFF)\
$(OBJDIR)/table.$(OBJSUFF) $(OBJDIR)/readshg.$(OBJSUFF)\
$(OBJDIR)/tex2rtf_resources.$(OBJSUFF)
include $(WXDIR)/src/makeprog.g95
all: $(OBJDIR) tex2rtf$(GUISUFFIX)$(EXESUFF)
INC = $(COMPPATHS) -I$(WXDIR)/include/msw -I$(WXDIR)/include/base -I../../wxhelp/src
CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) -DDEBUG='$(DEBUG)' $(DEBUGFLAGS) $(WARN) $(OPT)
$(OBJDIR):
mkdir $(OBJDIR)
tex2rtf$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB)
$(CC) $(LDFLAGS) -o tex2rtf$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
$(OBJDIR)/tex2rtf.$(OBJSUFF): tex2rtf.$(SRCSUFF) tex2rtf.h tex2any.h
$(CC) -c $(CPPFLAGS) -o $@ tex2rtf.$(SRCSUFF)
$(OBJDIR)/texutils.$(OBJSUFF): texutils.$(SRCSUFF) tex2rtf.h tex2any.h
$(CC) -c $(CPPFLAGS) -o $@ texutils.$(SRCSUFF)
$(OBJDIR)/tex2any.$(OBJSUFF): tex2any.$(SRCSUFF) tex2any.h
$(CC) -c $(CPPFLAGS) -o $@ tex2any.$(SRCSUFF)
$(OBJDIR)/htmlutil.$(OBJSUFF): htmlutil.$(SRCSUFF) tex2any.h
$(CC) -c $(CPPFLAGS) -o $@ htmlutil.$(SRCSUFF)
$(OBJDIR)/rtfutils.$(OBJSUFF): rtfutils.$(SRCSUFF) tex2any.h
$(CC) -c $(CPPFLAGS) -o $@ rtfutils.$(SRCSUFF)
$(OBJDIR)/xlputils.$(OBJSUFF): xlputils.$(SRCSUFF) tex2any.h
$(CC) -c $(CPPFLAGS) -o $@ xlputils.$(SRCSUFF)
$(OBJDIR)/table.$(OBJSUFF): table.$(SRCSUFF) tex2any.h
$(CC) -c $(CPPFLAGS) -o $@ table.$(SRCSUFF)
$(OBJDIR)/readshg.$(OBJSUFF): readshg.$(SRCSUFF) readshg.h
$(CC) -c $(CPPFLAGS) -o $@ readshg.$(SRCSUFF)
$(OBJDIR)/tex2rtf_resources.o: tex2rtf.rc
$(RESCOMP) -i tex2rtf.rc -o $(OBJDIR)/tex2rtf_resources.o $(RESFLAGS)
clean:
rm -f $(OBJECTS) tex2rtf$(GUISUFFIX).exe core *.rsc *.res

View File

@@ -402,11 +402,11 @@ void WriteTexReferences(char *filename)
void ReadTexReferences(char *filename)
{
#if !wxUSE_IOSTREAMH && __WXMSW__
if (!wxFileExists(filename))
return;
ifstream istr(filename, ios::in);
#else
ifstream istr(filename, ios::nocreate | ios::in);
#endif
if (istr.bad()) return;
char label[100];
@@ -569,12 +569,11 @@ void BibReadValue(istream& istr, char *buffer, bool ignoreBraces = TRUE,
bool ReadBib(char *filename)
{
if (!wxFileExists(filename))
return FALSE;
char buf[300];
#if !wxUSE_IOSTREAMH && __WXMSW__
ifstream istr(filename, ios::in);
#else
ifstream istr(filename, ios::nocreate | ios::in);
#endif
if (istr.bad()) return FALSE;
BibLine = 1;
@@ -1291,11 +1290,11 @@ char *RegisterSetting(char *settingName, char *settingValue, bool interactive)
bool ReadCustomMacros(char *filename)
{
#if !wxUSE_IOSTREAMH && __WXMSW__
if (!wxFileExists(filename))
return FALSE;
ifstream istr(filename, ios::in);
#else
ifstream istr(filename, ios::nocreate | ios::in);
#endif
if (istr.bad()) return FALSE;
CustomMacroList.Clear();

View File

@@ -1,18 +1,16 @@
#
# File: makefile.b32
# Author: Patrick Halke
# Created: 1995
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
#
# "%W% %G%"
#
# Makefile : Builds 32bit wxtree library for 32-bit BC++
# Makefile : Builds wxTree sample for 32-bit BC++
WXDIR = $(WXWIN)
TARGET=test
OBJECTS=$(TARGET)
OBJECTS=$(TARGET).obj wxtree.obj
!include $(WXDIR)\src\makeprog.b32

View File

@@ -1,96 +1,16 @@
#
# File: makefile.bcc
# Author: Julian Smart
# Created: 1993
# Created: 1999
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
#
# "%W% %G%"
#
# Makefile : Builds tree library and example (DOS).
# Makefile : Builds wxTree sample for 16-bit BC++
!if "$(BCCDIR)" == ""
!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
!endif
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
# Change WXDIR to wherever wxWindows is found
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makebcc.env
WXLIB = $(WXDIR)\lib\wx.lib
WXINC = $(WXDIR)\include
CFG=$(WXWIN)\src\wxwin.cfg
TARGET=test
OBJECTS=$(TARGET).obj wxtree.obj
TREEDIR = $(WXDIR)\utils\wxtree
TREELIB = $(TREEDIR)\lib\wxtree.lib
WXHELPDIR = $(WXDIR)\utils\wxhelp
TEX2RTFDIR = $(WXDIR)\utils\tex2rtf
DOCDIR = $(WXHELPDIR)\docs
# Default is to output RTF for WinHelp
!ifndef WINHELP
WINHELP=-winhelp
!endif
INC=/I$(WXDIR)\include\base /I$(WXDIR)\include\msw
LIBS=$(WXLIB) $(TREELIB) mathwl cwl import mathwl
!ifndef FINAL
FINAL=0
!endif
!if "$(FINAL)" == "0"
LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
OPT = -Od
DEBUG_FLAGS= -v
!else
LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
OPT = -O2
DEBUG_FLAGS=
!endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
CFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
HEADERS = wxtree.h
SOURCES = wxtree.$(SRCSUFF)
OBJECTS = wxtree.obj
all: $(TREELIB)
.$(SRCSUFF).obj:
bcc $(CPPFLAGS) $(INC) -c {$< }
$(TREELIB): $(OBJECTS)
erase $(TREELIB)
tlib /P128 @&&!
$(TREELIB) &
+$(OBJECTS:.obj =.obj +)
!
test.obj: test.$(SRCSUFF)
test.res : test.rc $(WXDIR)\include\msw\wx.rc
rc /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa -r test
test.exe: test.obj test.def test.res $(TREELIB)
tlink $(LINKFLAGS) @&&!
c0wl.obj test.obj
test
nul
$(LIBS)
test.def
!
rc -K test.res
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase ..\lib\*.lib
!include $(WXDIR)\src\makeprog.bcc

View File

@@ -1,48 +1,16 @@
#
# File: makefile.g95
# Author: Julian Smart
# Created: 1996
#
# "%W% %G%"
#
# Makefile : Builds wxTree library and example under GNU-WIN32
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../../..
include $(WXDIR)/src/makeg95.env
PROPDIR = $(WXDIR)/utils/wxtree
TREELIB = $(PROPDIR)/lib/$(LIBPREFIX)wxtree.$(LIBSUFF)
THISDIR = $(PROPDIR)/src
TARGET=test
OBJECTS = $(TARGET).o wxtree.o
OBJECTS = $(OBJDIR)/wxtree.$(OBJSUFF)
TESTOBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF)
include $(WXDIR)/src/makeprog.g95
LDFLAGS = -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib -L../lib
LDLIBS=-lwxtree $(LIBS)
all: $(OBJDIR) $(TREELIB)
test: $(OBJDIR) test.exe
$(OBJDIR):
mkdir $(OBJDIR)
$(TREELIB): $(OBJECTS)
rm -f $@
ar $(AROPTIONS) $@ $(OBJECTS)
$(RANLIB) $@
$(OBJDIR)/test.$(OBJSUFF): test.h test.$(SRCSUFF) $(TREELIB)
$(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF)
test.exe: $(TESTOBJECTS)
$(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(TESTOBJECTS) $(LDLIBS)
$(OBJDIR)/wxtree.$(OBJSUFF): wxtree.h wxtree.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ wxtree.$(SRCSUFF)
$(OBJDIR)/test_resources.o: test.rc
$(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS)
clean:
rm -f *.$(OBJSUFF) $(TREELIB) objects/test.o *.exe *.res *.map *.rsc