wxPaintDC -> wxDC in wxListCtrl; fixed compile problems in wxTreeCtrl (return

types in wxCHECK_MSG); compiles again for 16-bit Windows, though dialogs don't work;
added generic notebook implementation (copied from wxMotif); fixed event handler
arg in wxDirDialog; added preliminary wxImage reference; removed some constructors from documentation; fixed wxIniConfig compilation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-20 23:49:21 +00:00
parent 23fd5130c7
commit 1e6d94998f
75 changed files with 1987 additions and 1812 deletions

View File

@@ -1,65 +1,17 @@
#
# File: makefile.dos
# Author: Julian Smart
# Created: 1993
# Created: 1998
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
#
# "%W% %G%"
#
# Makefile : Builds controls example (DOS).
# Makefile : Builds 16-bit sample, VC++ 1.5
# Use FINAL=1 argument to nmake to build final version with no debugging
# info
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makemsc.env
TARGET=controls
OBJECTS=$(TARGET).obj
THISDIR = $(WXDIR)\samples\controls
!include $(WXDIR)\src\makeprog.msc
!ifndef FINAL
FINAL=0
!endif
HEADERS =
SOURCES = controls.$(SRCSUFF)
OBJECTS = controls.obj
all: controls.exe
wx:
cd $(WXDIR)\src\msw
nmake -f makefile.dos FINAL=$(FINAL)
cd $(THISDIR)
wxclean:
cd $(WXDIR)\src\msw
nmake -f makefile.dos clean
cd $(THISDIR)
controls.exe: $(WXDIR)\src\msw\dummy.obj $(WXLIB) controls.obj controls.def controls.res
link $(LINKFLAGS) @<<
controls.obj $(WXDIR)\src\msw\dummy.obj,
controls,
NUL,
$(LIBS),
controls.def
;
<<
rc -K controls.res
controls.obj: controls.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<<
controls.res : controls.rc $(WXDIR)\include\wx\msw\wx.rc
rc -r /i$(WXDIR)\include controls
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase *.map
-erase *.sbr
-erase *.pdb