Added Property List classes to main library; added proplist sample; merged

changes.txt files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-31 16:15:45 +00:00
parent 8973fbec7e
commit e3a43801df
76 changed files with 9575 additions and 2686 deletions

View File

@@ -17,12 +17,10 @@ BIN_OBJ=dialoged.o dlghndlr.o edlist.o edtree.o \
reseditr.o reswrite.o symbtabl.o winprop.o winstyle.o
# additional things needed to link
BIN_LINK= \
-lwx_prop_gtk
BIN_LINK=
# additional things needed to compile
ADD_COMPILE= \
-I../../../wxprop/src
ADD_COMPILE=
# include the definitions now
include ../../../../template.mak

View File

@@ -149,6 +149,20 @@ void wxResourceEditorDialogHandler::OnLeftClick(int x, int y, int keys)
return;
}
// Round down to take account of dialog units
wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(handlerDialog);
if (resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxPoint pt = handlerDialog->ConvertPixelsToDialog(wxPoint(x, y));
// Convert back so we've rounded down
pt = handlerDialog->ConvertDialogToPixels(pt);
pt = handlerDialog->ConvertPixelsToDialog(pt);
pt = handlerDialog->ConvertDialogToPixels(pt);
x = pt.x;
y = pt.y;
}
switch (wxResourceManager::GetCurrentResourceManager()->GetEditorControlList()->GetSelection())
{
case RESED_BUTTON:
@@ -1000,34 +1014,66 @@ void wxResourceEditorControlHandler::OnDragEnd(int x, int y, int WXUNUSED(keys),
height1 = (ypos + height) - y;
break;
}
handlerControl->SetSize(x1, y1, width1, height1);
// Also update the associated resource
// Update the associated resource
// We need to convert to dialog units if this is not a dialog or panel, but
// the parent resource specifies dialog units.
int resourceX = x1;
int resourceY = y1;
int resourceWidth = width1;
int resourceHeight = height1;
if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxPoint pt = handlerControl->GetParent()->ConvertPixelsToDialog(wxPoint(x1, y1));
x1 = pt.x; y1 = pt.y;
wxSize sz = handlerControl->GetParent()->ConvertPixelsToDialog(wxSize(width1, height1));
width1 = sz.x; height1 = sz.y;
// Convert back so we've rounded down
sz = handlerControl->GetParent()->ConvertDialogToPixels(sz);
sz = handlerControl->GetParent()->ConvertPixelsToDialog(sz);
resourceWidth = sz.x; resourceHeight = sz.y;
sz = handlerControl->GetParent()->ConvertDialogToPixels(sz);
width1 = sz.x;
height1 = sz.y;
pt = handlerControl->GetParent()->ConvertDialogToPixels(pt);
pt = handlerControl->GetParent()->ConvertPixelsToDialog(pt);
resourceX = pt.x; resourceY = pt.y;
pt = handlerControl->GetParent()->ConvertDialogToPixels(pt);
x1 = pt.x;
y1 = pt.y;
}
resource->SetSize(x1, y1, width1, height1);
handlerControl->SetSize(x1, y1, width1, height1);
resource->SetSize(resourceX, resourceY, resourceWidth, resourceHeight);
}
else
{
// Correction 31/12/98. We need to round down the values to take into account
// the fact that several pixels map to the same dialog unit.
int newX = (int)(x - dragOffsetX);
int newY = (int)(y - dragOffsetY);
handlerControl->Move(newX, newY);
OldOnMove(newX, newY);
int resourceX = newX;
int resourceY = newY;
// Also update the associated resource
// Update the associated resource
if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxPoint pt = handlerControl->GetParent()->ConvertPixelsToDialog(wxPoint(newX, newY));
newX = pt.x; newY = pt.y;
pt = handlerControl->GetParent()->ConvertDialogToPixels(pt);
pt = handlerControl->GetParent()->ConvertPixelsToDialog(pt);
resourceX = pt.x; resourceY = pt.y;
pt = handlerControl->GetParent()->ConvertDialogToPixels(pt);
// Having converted it several times, we know it'll map to dialog units exactly.
newX = pt.x;
newY = pt.y;
}
resource->SetSize(newX, newY, resource->GetWidth(), resource->GetHeight());
handlerControl->Move(newX, newY);
OldOnMove(newX, newY);
resource->SetSize(resourceX, resourceY, resource->GetWidth(), resource->GetHeight());
// Also move other selected items
wxNode *node = panel->GetChildren().First();
@@ -1044,18 +1090,28 @@ void wxResourceEditorControlHandler::OnDragEnd(int x, int y, int WXUNUSED(keys),
item->GetPosition(&x1, &y1);
int x2 = (int)(x1 + (x - dragOffsetX) - xpos);
int y2 = (int)(y1 + (y - dragOffsetY) - ypos);
// Update the associated resource
resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item);
if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxPoint pt = item->GetParent()->ConvertPixelsToDialog(wxPoint(x2, y2));
pt = item->GetParent()->ConvertDialogToPixels(pt);
pt = item->GetParent()->ConvertPixelsToDialog(pt);
resourceX = pt.x; resourceY = pt.y;
pt = handlerControl->GetParent()->ConvertDialogToPixels(pt);
// Having converted it several times, we know it'll map to dialog units exactly
x2 = pt.x;
y2 = pt.y;
}
item->Move(x2, y2);
((wxResourceEditorControlHandler *)item->GetEventHandler())->OldOnMove(x2, y2);
((wxResourceEditorControlHandler *)item->GetEventHandler())->DrawSelectionHandles(dc);
// Also update the associated resource
resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item);
if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxPoint pt = item->GetParent()->ConvertPixelsToDialog(wxPoint(newX, newY));
x2 = pt.x; y2 = pt.y;
}
resource->SetSize(x2, y2, resource->GetWidth(), resource->GetHeight());
resource->SetSize(resourceX, resourceY, resource->GetWidth(), resource->GetHeight());
}
}

View File

@@ -16,13 +16,9 @@ WXDIR = $(WXWIN)
WXLIBDIR = $(WXDIR)\lib
WXINC = $(WXDIR)\include\msw
WXBASESRC = $(WXDIR)\src\base
WXBASEINC = $(WXDIR)\include\base
WXLIB = $(WXLIBDIR)\wx32.lib
WXPROPDIR = $(WXDIR)\utils\wxprop
WXPROPINC = $(WXPROPDIR)\src
WXPROPLIB = $(WXDIR)\lib\wxprop.lib
LIBS=$(WXLIB) $(WXPROPLIB) cw32 import32 ole2w32
LIBS=$(WXLIB) cw32 import32 ole2w32
INCFILE = includes.cfg
TARGET=dialoged
@@ -40,7 +36,7 @@ CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtable.obj winstyle.obj
$(TARGET).exe: wxprop $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
$(TARGET).exe: $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
tlink32 $(LINKFLAGS) @&&!
c0w32.obj $(OBJECTS)
$(TARGET)
@@ -58,11 +54,6 @@ $(INCFILE): $(MAKEFILENAME)
$(TARGET).res : $(TARGET).rc $(WXDIR)\include\msw\wx.rc
brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(TARGET)
wxprop:
cd $(WXPROPDIR)\src
make -f makefile.b32
cd $(WXDIR)\utils\dialoged\src
clean:
-erase *.obj *.exe *.res *.map *.rws

View File

@@ -1,87 +1,20 @@
#
# File: makefile.bcc
# Author: Julian Smart
# Created: 1993
# Created: 1998
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
#
# "%W% %G%"
#
# Makefile : Builds Dialog Editor (Borland, 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 Dialog Editor
!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\dialoged\src
WXLIB = $(WXDIR)\lib\wx.lib
WXPROPDIR = $(WXDIR)\utils\wxprop
WXPROPINC = $(WXPROPDIR)\src
WXPROPLIB = $(WXPROPDIR)\lib\wxprop.lib
TARGET=dialoged
OBJECTS=dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\
winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
LIBS=$(WXLIB) $(WXPROPLIB) mathwl cwl import
INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
CFG=$(WXDIR)\src\wxwin.cfg
INCFILE = includes.cfg
!include $(WXDIR)\src\makeprog.bcc
!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) @$(INCFILE)
OBJECTS = wx_resed.obj wx_rdlg.obj wx_reswr.obj wx_repal.obj wx_rprop.obj dialoged.obj
all: dialoged.exe
dialoged.exe: $(INCFILE) $(WXLIB) $(OBJECTS) dialoged.def dialoged.res
tlink $(LINKFLAGS) @&&!
c0wl.obj $(OBJECTS)
dialoged
nul
$(LIBS) $(WXPROPLIB)
dialoged.def
!
rc -30 -K dialoged.res
.$(SRCSUFF).obj:
bcc $(CPPFLAGS) -c {$< }
dialoged.obj: dialoged.$(SRCSUFF) wx_resed.h
wx_resed.obj: wx_resed.$(SRCSUFF) wx_resed.h wx_rprop.h
wx_resed.obj: wx_rdlg.$(SRCSUFF) wx_resed.h wx_rprop.h
wx_rprop.obj: wx_rprop.$(SRCSUFF) wx_resed.h wx_rprop.h
wx_reswr.obj: wx_reswr.$(SRCSUFF) wx_resed.h
wx_repal.obj: wx_repal.$(SRCSUFF) wx_repal.h
dialoged.res : dialoged.rc $(WXDIR)\include\msw\wx.rc
rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa dialoged
$(INCFILE): $(MAKEFILENAME)
copy &&!
-I..\..\wxprop\src
! $(INCFILE)
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase *.map
-erase *.rws

View File

@@ -20,23 +20,8 @@ WXLIB = $(WXDIR)\lib\wx.lib
DOCDIR = $(WXDIR)\utils\dialoged\docs
PROPDIR = $(WXDIR)\utils\wxprop
PROPINC = $(PROPDIR)\src
PROPLIB = $(PROPDIR)\lib\wxprop.lib
TREEDIR = $(WXDIR)\utils\wxtree
TREEINC = $(TREEDIR)\src
TREELIB = $(TREEDIR)\lib\wxtree.lib
DIBDIR = $(WXDIR)\utils\dib
DIBLIB = $(DIBDIR)\dib.lib
DIBINC = $(DIBDIR)
RCDIR = $(WXDIR)\utils\rcparser
RCLIB = $(RCDIR)\lib\rcparser.lib
RCINC = $(RCDIR)\src
LIBS=$(WXLIB) $(PROPLIB) oldnames libw llibcew commdlg shell ddeml
LIBS=$(WXLIB) oldnames libw llibcew commdlg shell ddeml
INC=/I$(WXDIR)\include\base /I$(WXDIR)\include\msw /I$(PROPINC)
!ifndef FINAL

View File

@@ -14,10 +14,6 @@
# Set WXDIR for your system
WXDIR = $(WXWIN)
THISDIR = $(WXDIR)\utils\dialoged\src
PROPDIR = $(WXDIR)\utils\wxprop
PROPLIB=$(PROPDIR)\lib\wxprop.lib
EXTRALIBS=$(PROPDIR)\lib\wxprop.lib
EXTRAINC=/I$(PROPDIR)\src
DOCDIR=$(WXDIR)\docs
LOCALDOCDIR=$(WXDIR)\utils\dialoged\docs
@@ -28,7 +24,7 @@ PROGRAM=dialoged
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\
winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
all: wxprop dialoged.exe
all: dialoged.exe
wx:
cd $(WXDIR)\src\msw
@@ -40,7 +36,7 @@ wxclean:
nmake -f makefile.nt clean
cd $(THISDIR)
$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROPLIB) $(PROGRAM).res
$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
$(link) @<<
-out:$(PROGRAM).exe
$(LINKFLAGS)
@@ -96,16 +92,6 @@ $(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
$(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
wxprop:
cd $(PROPDIR)\src
nmake -f makefile.nt FINAL=$(FINAL)
cd $(THISDIR)
clean_wxprop:
cd $(PROPDIR)\src
nmake -f makefile.nt clean
cd $(THISDIR)
clean:
-erase *.obj
-erase *.sbr

View File

@@ -1,123 +1,18 @@
#
# File: makefile.unx
# Author: Julian Smart
# Created: 1993
# Created: 1998
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright: (c) 1998 Julian Smart
#
# "%W% %G%"
#
# Makefile for dialoged example (UNIX).
# Makefile for Dialog Editor (Unix)
WXDIR = ../../..
PROGRAM=dialoged
# All common UNIX compiler flags and options are now in
# this central makefile.
include $(WXDIR)/src/make.env
OBJECTS = dialoged.o reseditr.o dlghndlr.o reswrite.o\
winprop.o edtree.o edlist.o symbtabl.o winstyle.o
WXPROPDIR = $(WXDIR)/utils/wxprop
WXPROPINC = $(WXDIR)/utils/wxprop/src
WXPROPLIB = $(WXDIR)/utils/wxprop/lib
include ../../../src/makeprog.env
DIALOGEDDIR = $(WXDIR)/utils/dialoged
OBJECTS = $(OBJDIR)/dialoged.o $(OBJDIR)/wx_repal.o $(OBJDIR)/wx_resed.o $(OBJDIR)/wx_rdlg.o $(OBJDIR)/wx_reswr.o $(OBJDIR)/wx_rprop.o
INC = $(COMPPATHS) -I$(WXDIR)/include/x -I$(WXDIR)/include/base -I$(WXPROPINC)
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 $(HPCOMPLIBS)
# Default
LDLIBS=$(XVIEWLDLIBS)
CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) -DDEBUG='$(DEBUG)' $(DEBUGFLAGS) $(WARN) $(OPT)
LDFLAGS = $(XLIB) -L$(WXDIR)/lib -L$(WXPROPLIB)
.SUFFIXES:
all: $(OBJDIR) dialoged$(GUISUFFIX)
wx_ol:
cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
wx_motif:
cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx motif
motif:
$(MAKE) -f makefile.unx dialoged_motif 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 dialoged_ol 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='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='-w' \
XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
$(OBJDIR):
mkdir $(OBJDIR)
dialoged$(GUISUFFIX): $(OBJECTS) $(WXLIB)
$(CC) $(LDFLAGS) -o dialoged$(GUISUFFIX) $(OBJECTS) $(XVIEW_LINK) $(LDLIBS)
$(OBJDIR)/dialoged.o: dialoged.$(SRCSUFF) dialoged.h
$(CC) -c $(CPPFLAGS) -o $@ dialoged.$(SRCSUFF)
$(OBJDIR)/wx_rprop.o: wx_rprop.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ wx_rprop.$(SRCSUFF)
$(OBJDIR)/wx_resed.o: wx_resed.$(SRCSUFF) wx_resed.h
$(CC) -c $(CPPFLAGS) -o $@ wx_resed.$(SRCSUFF)
$(OBJDIR)/wx_rdlg.o: wx_rdlg.$(SRCSUFF) wx_resed.h
$(CC) -c $(CPPFLAGS) -o $@ wx_rdlg.$(SRCSUFF)
$(OBJDIR)/wx_repal.o: wx_repal.$(SRCSUFF) wx_repal.h
$(CC) -c $(CPPFLAGS) -o $@ wx_repal.$(SRCSUFF)
$(OBJDIR)/wx_reswr.o: wx_reswr.$(SRCSUFF) wx_resed.h
$(CC) -c $(CPPFLAGS) -o $@ wx_reswr.$(SRCSUFF)
wxprop_motif:
cd $(WXPROPDIR)/src; $(MAKE) -f makefile.unx motif OPT='$(OPT)'
wxprop_ol:
cd $(WXPROPDIR)/src
$(MAKE) -f makefile.unx xview OPT='$(OPT)'
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) dialoged$(GUISUFFIX) core
HTMLDIR=/home/hardy/html/wx/manuals
docs: ps xlp
ps: $(DIALOGEDDIR)/docs/dialoged.ps
xlp: $(DIALOGEDDIR)/docs/dialoged.xlp
html: $(HTMLDIR)/dialoged/dialoged_contents.html
$(DIALOGEDDIR)/docs/dialoged.xlp: $(DIALOGEDDIR)/docs/dialoged.tex $(DIALOGEDDIR)/docs/classes.tex $(DIALOGEDDIR)/docs/body.tex $(DIALOGEDDIR)/docs/tech.tex
cd ../docs; tex2rtf dialoged.tex tmp.xlp -xlp -twice
sed -e "s/WXHELPCONTENTS/wxChart Manual/g" < $(DIALOGEDDIR)/docs/tmp.xlp > $(DIALOGEDDIR)/docs/dialoged.xlp
/bin/rm -f $(DIALOGEDDIR)/docs/tmp.xlp
$(HTMLDIR)/dialoged/dialoged_contents.html: $(DIALOGEDDIR)/docs/dialoged.tex $(DIALOGEDDIR)/docs/body.tex $(DIALOGEDDIR)/docs/tech.tex
cd ../docs; tex2rtf dialoged.tex $(HTMLDIR)/dialoged/dialoged.html -html -twice
$(DIALOGEDDIR)/docs/dialoged.dvi: $(DIALOGEDDIR)/docs/dialoged.tex $(DIALOGEDDIR)/docs/classes.tex
cd $(DIALOGEDDIR)/docs; latex dialoged; latex dialoged; makeindex dialoged; latex dialoged; latex dialoged
# makeindex dialoged; bibtex dialoged; latex dialoged; latex dialoged
$(DIALOGEDDIR)/docs/dialoged.ps: $(DIALOGEDDIR)/docs/dialoged.dvi
cd $(DIALOGEDDIR)/docs; dvips -f -r < dialoged.dvi > dialoged.ps

View File

@@ -1,62 +1,15 @@
# Dialog Editor makefile for Watcom
#
# Makefile for WATCOM
#
# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
# 8 Nov 1994
#
WXDIR = ..\..\..
WXDIR = $(%WXWIN)
# EXTRACPPFLAGS = $(CLIPSFLAGS)
PROGRAM = dialoged
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
!include $(WXDIR)\src\makewat.env
WXPROPDIR = $(WXDIR)\utils\wxprop
WXPROPLIB = $(WXPROPDIR)\lib\wxprop.lib
WXPROPINC = $(WXPROPDIR)\src
THISDIR = $(WXDIR)\utils\dialoged\src
NAME = dialoged
LNK = $(name).lnk
IFLAGS = -i=$(WXINC) -i=$(WXBASEINC) -i=$(WXPROPINC)
PROGOBJECTS = dialoged.obj wx_resed.obj wx_rdlg.obj wx_reswr.obj wx_repal.obj wx_rprop.obj
all: wx wxprop erasepch $(PROGOBJECTS) dialoged.exe
wx: .SYMBOLIC
cd $(WXDIR)\src\msw
wmake -f makefile.wat all
cd $(THISDIR)
wxprop: .SYMBOLIC
cd $(WXPROPDIR)\src
wmake -f makefile.wat all
cd $(THISDIR)
$(name).exe : $(PROGOBJECTS) $(name).res $(LNK) $(WXDIR)\lib\wx$(LEVEL).lib $(WXPROPLIB)
wlink @$(LNK)
$(BINDCOMMAND) $(name).res
$(name).res : $(name).rc $(WXDIR)\include\msw\wx.rc
$(RC) $(RESFLAGS1) /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(name).rc
$(LNK) : makefile.wat
%create $(LNK)
@%append $(LNK) $(DEBUGINFO)
@%append $(LNK) system $(LINKOPTION)
@%append $(LNK) $(MINDATA)
@%append $(LNK) $(MAXDATA)
@%append $(LNK) $(STACK)
@%append $(LNK) name $(name)
@%append $(LNK) file $(WXDIR)\lib\wx$(LEVEL).lib
@%append $(LNK) file $(WXPROPLIB)
@for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
@for %i in ($(PROGOBJECTS)) do @%append $(LNK) file %i
cleanutils: .SYMBOLIC
cd $(WXPROPDIR)\src
wmake -f makefile.wat clean
cd $(THISDIR)
clean: .SYMBOLIC
-erase *.obj *.bak *.err *.pch *.lbc *.res
!include $(WXDIR)\src\makeprog.wat