defs.h corrected (syntax error in wxDELETEA). More unnecessary files removed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -214,9 +214,9 @@ enum ErrCode
|
||||
// (as yet untested) by ensuring that we zero all the bits in a pointer
|
||||
// (which is always the same length as a long (at least with the LP64 standard)
|
||||
// --- offer aug 98
|
||||
#define wxDELETE(p) if ( (p) ) { delete (p); (p) = 0L; }
|
||||
#define wxDELETE(p) if ( (p) ) { delete (p); p = 0L; }
|
||||
#else
|
||||
#define wxDELETE(p) if ( (p) != NULL ) { delete (p); p = NULL; }
|
||||
#define wxDELETE(p) if ( (p) != NULL ) { delete p; p = NULL; }
|
||||
#endif /* __SGI__CC__ */
|
||||
|
||||
// delete an array and NULL it (see comments above)
|
||||
@@ -224,7 +224,7 @@ enum ErrCode
|
||||
// see above comment.
|
||||
#define wxDELETEA(p) if ( (p) ) { delete [] (p); p = 0L; }
|
||||
#else
|
||||
#define wxDELETEA(p) if ( ((void *)) (p) != NULL ) { delete [] (p); (void *) p = NULL; }
|
||||
#define wxDELETEA(p) if ( ((void *) (p)) != NULL ) { delete [] p; p = NULL; }
|
||||
#endif /* __SGI__CC__ */
|
||||
|
||||
/// size of statically declared array
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 766 B |
Binary file not shown.
|
Before Width: | Height: | Size: 766 B |
@@ -1,44 +0,0 @@
|
||||
/* XPM */
|
||||
static char * aiai_xpm[] = {
|
||||
/* width height ncolors chars_per_pixel */
|
||||
"32 32 6 1",
|
||||
/* colors */
|
||||
" s None c None",
|
||||
". c #000000",
|
||||
"+ c #808080",
|
||||
"@ c #c0c0c0",
|
||||
"# c #ffff00",
|
||||
"$ c #ffffff",
|
||||
/* pixels */
|
||||
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$$$$$..$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$$$$$..$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$$$$....$$$$$...$$$$$$",
|
||||
"$$$$$$$$$$$$$.....$$$$.....$$$$$",
|
||||
"$$$$$$$$$$$$$......$$$$...$$$$$$",
|
||||
"$$$$$$$$$$$$.......$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$@+.......$$.....$$$$$",
|
||||
"$$$$$$$$$$$@@+..######.....$$$$$",
|
||||
"$$$$$$#$##@$@@+.$$$$$$.....#####",
|
||||
"#########$$$$@@#######.....#####",
|
||||
"#########$$$$@$$$$$$$$.....#####",
|
||||
"########$@@$@$########.....####$",
|
||||
"$$$$$$$.@$$@$$$$@+.........#$#$$",
|
||||
"$$$$$$$..@@$@$@@$@+........$$$$$",
|
||||
"$$$$$$...+@$@$@@$@$+.......$$$$$",
|
||||
"$$$$$......@$@$$$$@$+......$$$$$",
|
||||
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$.$$$$$.$$$$$.$$$$$.$$$$$",
|
||||
"$$$$$$$...$$$$.$$$$...$$$$.$$$$$",
|
||||
"$$$$$$$.$.$$.$.$.$$.$.$$.$.$$$$$",
|
||||
"$$$$$$.....$$$.$$$.....$$$.$$$$$",
|
||||
"$$$$$$.$$$.$$$.$$$.$$$.$$$.$$$$$",
|
||||
"$$$$$.$$$$$.$$.$$.$$$$$.$$.$$$$$",
|
||||
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
|
||||
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
|
||||
@@ -25,7 +25,6 @@ RADIOBOX_ICON ICON "bitmaps/radiobox.ico"
|
||||
RADIOBTN_ICON ICON "bitmaps/radiobtn.ico"
|
||||
SCROLBAR_ICON ICON "bitmaps/scrolbar.ico"
|
||||
|
||||
aiai_icn ICON "bitmaps/aiai.ico"
|
||||
#include "wx/msw/wx.rc"
|
||||
|
||||
DIALOGBOXTOOL BITMAP "bitmaps/dialog.bmp"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 766 B |
@@ -1,95 +0,0 @@
|
||||
#
|
||||
# File: makefile.bcc
|
||||
# Author: Julian Smart
|
||||
# Created: 1993
|
||||
# Updated:
|
||||
# Copyright: (c) 1993, AIAI, University of Edinburgh
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile : Builds wxProperty library
|
||||
|
||||
# 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
|
||||
BCCDIR = d:\bc4
|
||||
|
||||
WXPROPDIR = $(WXDIR)\utils\wxprop
|
||||
WXPROPINC = $(WXPROPDIR)\src
|
||||
WXPROPLIB = $(WXPROPDIR)\lib\wxprop.lib
|
||||
|
||||
FAFALIB = $(WXDIR)\contrib\fafa\fafa.lib
|
||||
ITSYLIB = $(WXDIR)\contrib\itsybits\itsy.lib
|
||||
|
||||
DOCDIR = $(WXPROPDIR)\docs
|
||||
DOCUTILSDIR = $(WXDIR)\utils\tex2rtf\src
|
||||
THISDIR = $(WXPROPDIR)\src
|
||||
|
||||
# Default is to output RTF for WinHelp
|
||||
!ifndef WINHELP
|
||||
WINHELP=-winhelp
|
||||
!endif
|
||||
|
||||
INC=/I$(WXDIR)\include\base /I$(WXDIR)\include\msw
|
||||
|
||||
LIBS=$(WXLIB) $(WXPROPLIB) mathwl cwl import
|
||||
|
||||
!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
|
||||
CFLAGS=$(DEBUG_FLAGS) $(OPT) /DUSE_DEFINE @$(CFG)
|
||||
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) /DUSE_DEFINE @$(CFG)
|
||||
|
||||
OBJECTS = wx_prop.obj wx_plist.obj wx_pform.obj
|
||||
|
||||
all: $(WXPROPLIB) # test.exe
|
||||
|
||||
.$(SRCSUFF).obj:
|
||||
bcc $(CPPFLAGS) -c {$< }
|
||||
.c.obj:
|
||||
bcc $(CPPFLAGS) -P- -c {$< }
|
||||
|
||||
$(WXPROPLIB): $(OBJECTS)
|
||||
erase $(WXPROPLIB)
|
||||
tlib /P128 @&&!
|
||||
$(WXPROPLIB) &
|
||||
+$(OBJECTS:.obj =.obj +)
|
||||
!
|
||||
|
||||
test.obj: test.h wx_prop.h test.$(SRCSUFF)
|
||||
|
||||
wx_prop.obj: wx_prop.h wx_prop.$(SRCSUFF)
|
||||
|
||||
wx_plist.obj: wx_prop.h wx_plist.h wx_plist.$(SRCSUFF)
|
||||
|
||||
wx_pform.obj: wx_prop.h wx_pform.h wx_pform.$(SRCSUFF)
|
||||
|
||||
test.res : test.rc $(WXDIR)\include\msw\wx.rc $(WXPROPLIB)
|
||||
rc /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa -r test
|
||||
|
||||
test.exe: test.obj test.def test.res $(WXPROPLIB)
|
||||
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
|
||||
|
||||
@@ -1,105 +0,0 @@
|
||||
#
|
||||
# File: makefile.unx
|
||||
# Author: Julian Smart
|
||||
# Created: 1993
|
||||
# Updated:
|
||||
# Copyright: (c) 1993, AIAI, University of Edinburgh
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile for dialoged example (UNIX).
|
||||
|
||||
WXDIR = ../../..
|
||||
|
||||
# All common UNIX compiler flags and options are now in
|
||||
# this central makefile.
|
||||
include $(WXDIR)/src/make.env
|
||||
|
||||
PROPDIR = $(WXDIR)/utils/wxprop
|
||||
PROPLIB = ../lib/libwxprop$(GUISUFFIX).a
|
||||
XVIEWLDLIBS = -lwxprop_ol -lwx_ol -lxview -lolgx -lX11 -lm $(COMPLIBS)
|
||||
MOTIFLDLIBS = -lwxprop_motif -lwx_motif -lXm -lXt -lX11 -lm $(COMPLIBS)
|
||||
HPLDLIBS = -lwxprop_hp -lwx_hp -lXm -lXt -lX11 -lm $(COMPLIBS)
|
||||
LDFLAGS = $(XLIB) -L$(WXDIR)/lib -L../lib
|
||||
|
||||
OBJECTS = $(OBJDIR)/wx_prop.o $(OBJDIR)/wx_pform.o $(OBJDIR)/wx_plist.o
|
||||
TESTOBJECTS = $(OBJDIR)/test.o
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
all: $(OBJDIR) $(PROPLIB)
|
||||
|
||||
demo: test$(GUISUFFIX)
|
||||
|
||||
motifdemo:
|
||||
$(MAKE) -f makefile.unx all test_motif GUI=-Dwx_motif DEBUG='$(DEBUG)' GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' XVIEW_LINK=
|
||||
|
||||
xviewdemo:
|
||||
$(MAKE) -f makefile.unx all test_ol GUI=-Dwx_xview OPT='$(OPT)' DEBUG='$(DEBUG)'
|
||||
|
||||
$(PROPLIB): $(OBJECTS)
|
||||
rm -f $@
|
||||
ar $(AROPTIONS) $@ $(OBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
motif:
|
||||
$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)'\
|
||||
OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
|
||||
|
||||
xview:
|
||||
$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)'\
|
||||
DEBUG='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
|
||||
|
||||
hp:
|
||||
$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='-w' \
|
||||
XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
|
||||
|
||||
$(OBJDIR):
|
||||
mkdir $(OBJDIR)
|
||||
|
||||
test$(GUISUFFIX): $(TESTOBJECTS) $(WXLIB) $(PROPLIB)
|
||||
$(CC) $(LDFLAGS) -o test$(GUISUFFIX) $(TESTOBJECTS) $(XVIEW_LINK) $(LDLIBS)
|
||||
|
||||
$(OBJDIR)/wx_prop.o: wx_prop.$(SRCSUFF) wx_prop.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ wx_prop.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/wx_pform.o: wx_pform.$(SRCSUFF) wx_prop.h wx_pform.h wx_prop.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ wx_pform.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/wx_plist.o: wx_plist.$(SRCSUFF) wx_plist.h wx_prop.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ wx_plist.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/test.o: test.$(SRCSUFF) test.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF)
|
||||
|
||||
HTMLDIR=/home/hardy/html/wx/manuals
|
||||
docs: ps xlp
|
||||
ps: $(PROPDIR)/docs/prop.ps
|
||||
xlp: $(PROPDIR)/docs/prop.xlp
|
||||
html: $(HTMLDIR)/wxprop/prop_contents.html
|
||||
|
||||
$(PROPDIR)/docs/prop.xlp: $(PROPDIR)/docs/prop.tex $(PROPDIR)/docs/classes.tex $(PROPDIR)/docs/body.tex
|
||||
cd ../docs; tex2rtf prop.tex tmp.xlp -xlp -twice
|
||||
sed -e "s/WXHELPCONTENTS/Property Classes Manual/g" < $(PROPDIR)/docs/tmp.xlp > $(PROPDIR)/docs/prop.xlp
|
||||
/bin/rm -f $(PROPDIR)/docs/tmp.xlp
|
||||
|
||||
$(HTMLDIR)/wxprop/prop_contents.html: $(PROPDIR)/docs/prop.tex $(PROPDIR)/docs/classes.tex $(PROPDIR)/docs/body.tex
|
||||
cd ../docs; tex2rtf prop.tex $(HTMLDIR)/wxprop/prop.html -html -twice
|
||||
|
||||
$(PROPDIR)/docs/prop.dvi: $(PROPDIR)/docs/prop.tex $(PROPDIR)/docs/classes.tex $(PROPDIR)/docs/body.tex
|
||||
cd $(PROPDIR)/docs; latex prop; latex prop; makeindex prop; latex prop
|
||||
|
||||
$(PROPDIR)/docs/prop.ps: $(PROPDIR)/docs/prop.dvi
|
||||
cd $(PROPDIR)/docs; dvips -f -r < prop.dvi > prop.ps
|
||||
|
||||
clean_motif:
|
||||
$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
|
||||
|
||||
clean_ol:
|
||||
$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
|
||||
|
||||
clean_hp:
|
||||
$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
|
||||
|
||||
cleanany:
|
||||
rm -f $(OBJECTS) $(TESTOBJECTS) test$(GUISUFFIX) core $(PROPLIB)
|
||||
@@ -1,47 +0,0 @@
|
||||
WXDIR = ..\..\..
|
||||
|
||||
EXTRACPPFLAGS = /DUSE_DEFINE
|
||||
|
||||
!include $(WXDIR)\src\makewat.env
|
||||
|
||||
WXLIB = $(WXDIR)\lib
|
||||
LIBTARGET = ..\lib\wxprop.lib
|
||||
|
||||
OBJECTS = prop.obj proplist.obj propform.obj
|
||||
TESTOBJECTS = test.obj
|
||||
NAME = test
|
||||
LNK = $(name).lnk
|
||||
|
||||
all: erasepch $(OBJECTS) $(LIBTARGET)
|
||||
|
||||
test: test.exe
|
||||
|
||||
test.obj: test.$(SRCSUFF)
|
||||
|
||||
$(LIBTARGET): $(OBJECTS)
|
||||
wlib /b /c /n /P=256 $(LIBTARGET) $(OBJECTS)
|
||||
|
||||
$(name).exe : $(TESTOBJECTS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
|
||||
wlink @$(LNK)
|
||||
$(BINDCOMMAND) $(name).res
|
||||
|
||||
$(name).res : $(name).rc $(WXDIR)\include\msw\wx.rc
|
||||
$(RC) $(RESFLAGS1) $(name).rc
|
||||
|
||||
$(LNK) : makefile.wat
|
||||
%create $(LNK)
|
||||
@%append $(LNK) debug all
|
||||
@%append $(LNK) system $(LINKOPTION)
|
||||
@%append $(LNK) $(MINDATA)
|
||||
@%append $(LNK) $(MAXDATA)
|
||||
@%append $(LNK) $(STACK)
|
||||
@%append $(LNK) name $(name)
|
||||
@%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
|
||||
@%append $(LNK) file $(LIBTARGET)
|
||||
@for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
|
||||
@for %i in ($(TESTOBJECTS)) do @%append $(LNK) file %i
|
||||
|
||||
clean: .SYMBOLIC
|
||||
-erase *.obj *.bak *.err *.pch $(LIBTARGET) *.lbc
|
||||
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
wxSTD_MDIPARENTFRAME ICON "aiai.ico"
|
||||
aiai_icn ICON "aiai.ico"
|
||||
|
||||
tick_bmp BITMAP "tick.bmp"
|
||||
cross_bmp BITMAP "cross.bmp"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user