Compare commits
144 Commits
b4_OOR_1
...
wxPy_2_3_0
Author | SHA1 | Date | |
---|---|---|---|
|
9d288a9972 | ||
|
25832b3f2b | ||
|
6d5b2a57cf | ||
|
c48269b9f7 | ||
|
7561aacd5e | ||
|
5260937e74 | ||
|
29d83fc1e5 | ||
|
5600884ab7 | ||
|
2910855229 | ||
|
c3302e7e29 | ||
|
48c31b2853 | ||
|
cb71578cae | ||
|
4cdc2c137e | ||
|
889f0b7c67 | ||
|
e6c3f404b8 | ||
|
bdfeadcac5 | ||
|
bcbb0f8309 | ||
|
37d92a964a | ||
|
0ad771924b | ||
|
e4ad24c9d3 | ||
|
3958ae62ba | ||
|
5d5b1c0ce0 | ||
|
c20facdb25 | ||
|
25d73e0f28 | ||
|
2b510feb17 | ||
|
ac346f5046 | ||
|
72c71d3972 | ||
|
c989314692 | ||
|
e987a489c8 | ||
|
af9083592b | ||
|
4dfaa61e60 | ||
|
442d08ce74 | ||
|
18c5099700 | ||
|
31827af3ea | ||
|
353327844e | ||
|
10e07c70d8 | ||
|
30aaddfe89 | ||
|
8bc25b29f1 | ||
|
90b2b1303a | ||
|
493f1553fd | ||
|
c20a12bd55 | ||
|
2d4511658d | ||
|
ffe107c8c0 | ||
|
0d832cf788 | ||
|
8e49dc6301 | ||
|
5d59e67a7b | ||
|
06b32ebe4f | ||
|
da7ed9b77e | ||
|
856e03b753 | ||
|
9df61a29d2 | ||
|
419c299ae5 | ||
|
3bdc265d9d | ||
|
9416aa89ca | ||
|
6618870d16 | ||
|
6603907dea | ||
|
5abf8c9d66 | ||
|
fdca68a670 | ||
|
36bd690299 | ||
|
1912918cce | ||
|
f98de4487f | ||
|
4dc3fdec0c | ||
|
c59b4b010e | ||
|
52f96deca1 | ||
|
2461b2e716 | ||
|
f9d3748bc0 | ||
|
a224234132 | ||
|
3dec57adfd | ||
|
513903c4f9 | ||
|
19d7140ec2 | ||
|
27419164ad | ||
|
ca715d8835 | ||
|
a88acabdd2 | ||
|
19b726bbca | ||
|
69231000be | ||
|
f80eabe5a2 | ||
|
b07664068b | ||
|
833615dd4d | ||
|
965784669a | ||
|
8084a109b6 | ||
|
2b75f58067 | ||
|
aa06a8fdfb | ||
|
e661fcd770 | ||
|
23ca6e208f | ||
|
d7dcb93990 | ||
|
3f030b4804 | ||
|
5a226de062 | ||
|
ea24eeb2db | ||
|
b7d8f285c3 | ||
|
f5cd97870d | ||
|
788722ac5c | ||
|
f3d5d2b5b9 | ||
|
1094fecfdd | ||
|
5d2b67f7d1 | ||
|
059f05650b | ||
|
940718f06e | ||
|
17766da91f | ||
|
cb0b3950ff | ||
|
82ca6dbcf4 | ||
|
9d57991759 | ||
|
2beca66298 | ||
|
1b12ab1641 | ||
|
ef397583df | ||
|
4e0e692f03 | ||
|
fc5d5458a6 | ||
|
4def3b3595 | ||
|
be52217ed3 | ||
|
c2fa61e833 | ||
|
a90c95aa8e | ||
|
804a46d3f7 | ||
|
13bf613ebd | ||
|
aa6c945b0a | ||
|
c503ab8437 | ||
|
be57fda609 | ||
|
a8cd4a3a03 | ||
|
65608e3bb0 | ||
|
2dd88c8023 | ||
|
3f4902f50b | ||
|
69db49223e | ||
|
4114d0af4f | ||
|
3ce946d47e | ||
|
9fbbbd40d1 | ||
|
4284e7cdb7 | ||
|
5ce0e4ac06 | ||
|
aa50e893ee | ||
|
e9c4c02c19 | ||
|
b326e313a0 | ||
|
4b1f6faaa2 | ||
|
fb1bd1bdd3 | ||
|
f204026b42 | ||
|
66242f2079 | ||
|
c60f5c6517 | ||
|
1e1ca6f0b2 | ||
|
d38d271fa6 | ||
|
22394d24f6 | ||
|
57e26a09f1 | ||
|
2b15fdfcf3 | ||
|
27a97d02eb | ||
|
e7b596fbff | ||
|
d493b66a90 | ||
|
b668a73527 | ||
|
1c6466854c | ||
|
268d5364cf | ||
|
9d8c2f419f | ||
|
d2520c85b0 |
59
Makefile.in
59
Makefile.in
@@ -153,7 +153,7 @@ INTLDIR = $(WXDIR)/locale
|
||||
########################## Archive name ###############################
|
||||
|
||||
# append a version suffix x.y.z to all file names
|
||||
VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
|
||||
VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
|
||||
WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz
|
||||
WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz
|
||||
WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
|
||||
@@ -345,7 +345,7 @@ OLEOBJS = \
|
||||
droptgt.o \
|
||||
oleutils.o \
|
||||
uuid.o
|
||||
|
||||
|
||||
############################## Rules ##################################
|
||||
|
||||
BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
|
||||
@@ -729,7 +729,7 @@ DEMOS_DIST: ALL_GUI_DIST
|
||||
cp $(DEMODIR)/configure.in $(DISTDIR)/demos
|
||||
|
||||
cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/demos/bombs
|
||||
cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
|
||||
cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
|
||||
@@ -946,7 +946,7 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
|
||||
cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
|
||||
cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/internat
|
||||
mkdir $(DISTDIR)/samples/internat/de
|
||||
mkdir $(DISTDIR)/samples/internat/fr
|
||||
@@ -958,10 +958,10 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
|
||||
cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
|
||||
cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
|
||||
cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/de
|
||||
#cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/de
|
||||
cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
|
||||
cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
|
||||
cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/de
|
||||
#cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/de
|
||||
|
||||
mkdir $(DISTDIR)/samples/ipc
|
||||
cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
|
||||
@@ -1093,7 +1093,7 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
|
||||
cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
|
||||
cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/richedit
|
||||
cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
|
||||
cp $(SAMPDIR)/richedit/makefile.unx $(DISTDIR)/samples/richedit
|
||||
@@ -1102,35 +1102,35 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
|
||||
cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
|
||||
cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/proplist
|
||||
cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
|
||||
cp $(SAMPDIR)/proplist/makefile.unx $(DISTDIR)/samples/proplist
|
||||
cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
|
||||
cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/propsize
|
||||
cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
|
||||
cp $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize
|
||||
cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
|
||||
cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/sashtest
|
||||
cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
|
||||
cp $(SAMPDIR)/sashtest/makefile.unx $(DISTDIR)/samples/sashtest
|
||||
cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
|
||||
cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/scroll
|
||||
cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
|
||||
cp $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll
|
||||
cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/scrollsub
|
||||
cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
|
||||
cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
|
||||
cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/sockets
|
||||
cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
|
||||
cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
|
||||
@@ -1141,7 +1141,7 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
|
||||
cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
|
||||
cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/statbar
|
||||
cp $(SAMPDIR)/statbar/Makefile.in $(DISTDIR)/samples/statbar
|
||||
cp $(SAMPDIR)/statbar/makefile.unx $(DISTDIR)/samples/statbar
|
||||
@@ -1153,12 +1153,12 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
|
||||
cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
|
||||
cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/thread
|
||||
cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
|
||||
cp $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread
|
||||
cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/toolbar
|
||||
cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
|
||||
cp $(SAMPDIR)/toolbar/makefile.unx $(DISTDIR)/samples/toolbar
|
||||
@@ -1166,7 +1166,7 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
|
||||
mkdir $(DISTDIR)/samples/toolbar/bitmaps
|
||||
cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/treectrl
|
||||
cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
|
||||
cp $(SAMPDIR)/treectrl/makefile.unx $(DISTDIR)/samples/treectrl
|
||||
@@ -1175,33 +1175,33 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
|
||||
mkdir $(DISTDIR)/samples/treectrl/bitmaps
|
||||
cp $(SAMPDIR)/treectrl/bitmaps/*.bmp $(DISTDIR)/samples/treectrl/bitmaps
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/treelay
|
||||
cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
|
||||
cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay
|
||||
cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay
|
||||
cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/typetest
|
||||
cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
|
||||
cp $(SAMPDIR)/typetest/makefile.unx $(DISTDIR)/samples/typetest
|
||||
cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
|
||||
cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
|
||||
cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/validate
|
||||
cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
|
||||
cp $(SAMPDIR)/validate/makefile.unx $(DISTDIR)/samples/validate
|
||||
cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
|
||||
cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
|
||||
cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/samples/wizard
|
||||
cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
|
||||
cp $(SAMPDIR)/wizard/makefile.unx $(DISTDIR)/samples/wizard
|
||||
cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
|
||||
cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
|
||||
|
||||
|
||||
UTILS_DIST: ALL_GUI_DIST
|
||||
mkdir $(DISTDIR)/utils
|
||||
cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
|
||||
@@ -1346,3 +1346,18 @@ clean:
|
||||
$(RM) ./lib/lib*
|
||||
|
||||
cleanall: clean
|
||||
|
||||
|
||||
RPMTOP=_dist_dir/_rpm_top
|
||||
|
||||
rpm: dist
|
||||
@echo "*** Building RPMs ***"
|
||||
-mkdir $(RPMTOP)
|
||||
-mkdir $(RPMTOP)/SOURCES
|
||||
-mkdir $(RPMTOP)/SPECS
|
||||
-mkdir $(RPMTOP)/BUILD
|
||||
-mkdir $(RPMTOP)/RPMS
|
||||
-mkdir $(RPMTOP)/SRPMS
|
||||
cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES
|
||||
rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
|
||||
mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .
|
||||
|
@@ -138,6 +138,11 @@ public:
|
||||
// Loads bitmap or icon resource from file:
|
||||
wxBitmap LoadBitmap(const wxString& name);
|
||||
wxIcon LoadIcon(const wxString& name);
|
||||
|
||||
// Attaches unknown control into given panel/window/dialog:
|
||||
// (unknown controls are used in conjunction with <object class="unknown">)
|
||||
bool AttachUnknownControl(const wxString& name, wxWindow *control,
|
||||
wxWindow *parent = NULL);
|
||||
|
||||
// Returns numeric ID that is equivalent to string id used in XML
|
||||
// resource. To be used in event tables
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib gizmos.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/tree.exe" /libpath:"d:\wx2\wxWindows\lib"
|
||||
# ADD LINK32 wx.lib png.lib zlib.lib jpeg.lib tiff.lib gizmos.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/tree.exe" /libpath:"d:\wx2\wxWindows\lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "TreeVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib gizmosd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/tree.exe" /pdbtype:sept /libpath:"d:\wx2\wxWindows\lib"
|
||||
# ADD LINK32 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib gizmosd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/tree.exe" /pdbtype:sept /libpath:"d:\wx2\wxWindows\lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "TreeVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StcTestVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StcTestVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib wxxml.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib wxxml.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "XmlDemoVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib wxxmld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib wxxmld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "XmlDemoVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -41,7 +41,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "d:\libxml\libxml2-2.1.1" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "expat/xmlparse" /I "expat/xmltok" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809
|
||||
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "d:\libxml\libxml2-2.1.1" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "expat/xmlparse" /I "expat/xmltok" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809
|
||||
@@ -82,12 +82,40 @@ LIB32=link.exe -lib
|
||||
|
||||
# Name "wxXMLVC - Win32 Release"
|
||||
# Name "wxXMLVC - Win32 Debug"
|
||||
# Begin Group "Expat"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\expat\xmlparse\xmlparse.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\expat\xmltok\xmlrole.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\expat\xmltok\xmltok.c
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_bmp.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_bmpbt.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_bttn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_cald.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_chckb.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -108,6 +136,10 @@ SOURCE=.\xh_dlg.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_frame.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_gauge.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -116,6 +148,14 @@ SOURCE=.\xh_html.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_listb.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_listc.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_menu.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -136,6 +176,10 @@ SOURCE=.\xh_radbx.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_scrol.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_sizer.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -152,6 +196,14 @@ SOURCE=.\xh_stbmp.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_stbox.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_stlin.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_sttxt.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -160,11 +212,15 @@ SOURCE=.\xh_text.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_listb.cpp
|
||||
SOURCE=.\xh_toolb.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_toolb.cpp
|
||||
SOURCE=.\xh_tree.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_unkwn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -180,7 +236,7 @@ SOURCE=.\xmlbinz.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xmlpars.cpp
|
||||
SOURCE=.\xmlexpat.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -188,43 +244,11 @@ SOURCE=.\xmlres.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_bmpbt.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_cald.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_listc.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_scrol.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_stbox.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_tree.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_stlin.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_bmp.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xh_unkwn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xmlrsall.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xmlwrite.cpp
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
|
@@ -30,6 +30,7 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
|
||||
ADD_STYLE(wxSTAY_ON_TOP);
|
||||
ADD_STYLE(wxCAPTION);
|
||||
ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
|
||||
ADD_STYLE(wxDEFAULT_FRAME_STYLE);
|
||||
ADD_STYLE(wxTHICK_FRAME);
|
||||
ADD_STYLE(wxSYSTEM_MENU);
|
||||
ADD_STYLE(wxRESIZE_BORDER);
|
||||
|
@@ -22,36 +22,65 @@
|
||||
#include "wx/xml/xh_unkwn.h"
|
||||
#include "wx/window.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/sizer.h"
|
||||
|
||||
|
||||
class wxUnknownControlContainer : public wxPanel
|
||||
{
|
||||
public:
|
||||
wxUnknownControlContainer(wxWindow *parent,
|
||||
const wxString& controlName,
|
||||
wxWindowID id = -1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize)
|
||||
: wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
|
||||
controlName + wxT("_container")),
|
||||
m_controlName(controlName), m_controlAdded(FALSE)
|
||||
{
|
||||
m_bg = GetBackgroundColour();
|
||||
SetBackgroundColour(wxColour(255, 0, 255));
|
||||
}
|
||||
|
||||
virtual void AddChild(wxWindowBase *child);
|
||||
|
||||
protected:
|
||||
wxString m_controlName;
|
||||
bool m_controlAdded;
|
||||
wxColour m_bg;
|
||||
};
|
||||
|
||||
void wxUnknownControlContainer::AddChild(wxWindowBase *child)
|
||||
{
|
||||
wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") )
|
||||
|
||||
wxPanel::AddChild(child);
|
||||
|
||||
SetBackgroundColour(m_bg);
|
||||
child->SetName(m_controlName);
|
||||
m_controlAdded = TRUE;
|
||||
|
||||
wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
sizer->Add((wxWindow*)child, 1, wxEXPAND);
|
||||
SetSizer(sizer);
|
||||
SetAutoLayout(TRUE);
|
||||
Layout();
|
||||
}
|
||||
|
||||
|
||||
|
||||
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
|
||||
: wxXmlResourceHandler()
|
||||
{
|
||||
AddWindowStyles();
|
||||
}
|
||||
|
||||
wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
|
||||
{
|
||||
long id = GetLong(wxT("id"), -1);
|
||||
wxString name = GetParamValue(wxT("name"));
|
||||
|
||||
wxWindow *wnd = NULL;
|
||||
|
||||
if (id != -1)
|
||||
wnd = m_parentAsWindow->FindWindow(id);
|
||||
if (wnd == NULL && !name.IsEmpty())
|
||||
wnd = m_parentAsWindow->FindWindow(name);
|
||||
|
||||
if (wnd == NULL)
|
||||
wxLogError(wxT("Cannot find specified window for class 'unknown' (id=%li, name='%s')."), id, name.mb_str());
|
||||
else
|
||||
{
|
||||
if (wnd->GetParent() != m_parentAsWindow)
|
||||
wnd->Reparent(m_parentAsWindow);
|
||||
SetupWindow(wnd);
|
||||
}
|
||||
|
||||
return wnd;
|
||||
wxPanel *panel =
|
||||
new wxUnknownControlContainer(m_parentAsWindow,
|
||||
GetName(), GetID(),
|
||||
GetPosition(), GetSize());
|
||||
SetupWindow(panel);
|
||||
return panel;
|
||||
}
|
||||
|
||||
bool wxUnknownWidgetXmlHandler::CanHandle(wxXmlNode *node)
|
||||
|
@@ -195,6 +195,19 @@ wxIcon wxXmlResource::LoadIcon(const wxString& name)
|
||||
return rt;
|
||||
}
|
||||
|
||||
bool wxXmlResource::AttachUnknownControl(const wxString& name,
|
||||
wxWindow *control, wxWindow *parent)
|
||||
{
|
||||
if (parent == NULL)
|
||||
parent = control->GetParent();
|
||||
wxWindow *container = parent->FindWindow(name + wxT("_container"));
|
||||
if (!container)
|
||||
{
|
||||
wxLogError(_("Cannot find container for unknown control '%s'."), name.c_str());
|
||||
return FALSE;
|
||||
}
|
||||
return control->Reparent(container);
|
||||
}
|
||||
|
||||
|
||||
void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
|
||||
@@ -882,8 +895,6 @@ void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// --------------- XMLID implementation -----------------------------
|
||||
|
||||
#define XMLID_TABLE_SIZE 1024
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/wxconvert.exe"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/wxconvert.exe"
|
||||
|
||||
!ELSEIF "$(CFG)" == "ConvertVC - Win32 Debug"
|
||||
|
||||
@@ -72,7 +72,8 @@ LINK32=link.exe
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
@@ -82,7 +83,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/wxconvert.exe" /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/wxconvert.exe" /pdbtype:sept
|
||||
|
||||
!ELSEIF "$(CFG)" == "ConvertVC - Win32 Debug DLL"
|
||||
|
||||
@@ -98,7 +99,8 @@ LINK32=link.exe
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /YX"wxprec.h" /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
@@ -147,14 +149,6 @@ LINK32=link.exe
|
||||
# Name "ConvertVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\blank.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\bullseye.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\convert.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -163,50 +157,6 @@ SOURCE=.\convert.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\error.ico
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\hand.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\info.ico
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\magnif1.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\noentry.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\pbrush.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\pencil.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\pntleft.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\pntright.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\query.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\question.ico
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\rc2wxr.cpp
|
||||
|
||||
!IF "$(CFG)" == "ConvertVC - Win32 Release"
|
||||
@@ -255,26 +205,6 @@ SOURCE=.\rc2xml.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\roller.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\size.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\tip.ico
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\warning.ico
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wx\msw\watch1.cur
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wxconvert.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809
|
||||
|
29
contrib/utils/convertrc/ConvertVC.dsw
Normal file
29
contrib/utils/convertrc/ConvertVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "ConvertVC"=.\ConvertVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
18
contrib/utils/convertrc/makefile.b32
Normal file
18
contrib/utils/convertrc/makefile.b32
Normal file
@@ -0,0 +1,18 @@
|
||||
#
|
||||
# File: makefile.b32
|
||||
# Author: Julian Smart
|
||||
# Created: 1999
|
||||
# Updated:
|
||||
# Copyright:
|
||||
#
|
||||
# Makefile : Builds convert for 32-bit BC++
|
||||
|
||||
WXDIR = $(WXWIN)
|
||||
EXTRALIBS=$(WXDIR)\lib\wxxml.lib
|
||||
|
||||
TARGET=wxconvert
|
||||
|
||||
OBJECTS=convert.obj rc2xml.obj rc2wxr.obj wxr2xml.obj
|
||||
|
||||
!include $(WXDIR)\src\makeprog.b32
|
||||
|
17
contrib/utils/convertrc/makefile.g95
Normal file
17
contrib/utils/convertrc/makefile.g95
Normal file
@@ -0,0 +1,17 @@
|
||||
#
|
||||
# File: makefile.g95
|
||||
# Author: Julian Smart
|
||||
# Created: 1999
|
||||
# Updated:
|
||||
# Copyright: (c) Julian Smart, 1999
|
||||
#
|
||||
# Makefile for wxrc (Cygwin/Mingw32).
|
||||
|
||||
WXDIR = ../../..
|
||||
|
||||
TARGET=wxconvert
|
||||
EXTRALIBS=-lwxxml
|
||||
OBJECTS=convert.o rc2xml.o rc2wxr.o wxr2xml.o
|
||||
|
||||
include $(WXDIR)/src/makeprog.g95
|
||||
|
29
contrib/utils/convertrc/makefile.vc
Normal file
29
contrib/utils/convertrc/makefile.vc
Normal file
@@ -0,0 +1,29 @@
|
||||
#
|
||||
# File: makefile.vc
|
||||
# Author: Julian Smart
|
||||
# Created: 2000
|
||||
# Updated:
|
||||
# Copyright: (c) Julian Smart
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile : Builds wxconvert
|
||||
# Use FINAL=1 argument to nmake to build final version with no debugging
|
||||
# info
|
||||
# Set WXDIR for your system
|
||||
WXDIR = $(WXWIN)
|
||||
|
||||
PROGRAM=wxconvert
|
||||
|
||||
FINAL=0
|
||||
|
||||
!if "$(FINAL)" == "0"
|
||||
EXTRALIBS=$(WXDIR)\lib\wxxmld.lib
|
||||
!else
|
||||
EXTRALIBS=$(WXDIR)\lib\wxxml.lib
|
||||
!endif
|
||||
|
||||
OBJECTS=convert.obj rc2xml.obj rc2wxr.obj wxr2xml.obj
|
||||
|
||||
!include $(WXDIR)\src\makeprog.vc
|
||||
|
13
contrib/utils/convertrc/makefile.wat
Normal file
13
contrib/utils/convertrc/makefile.wat
Normal file
@@ -0,0 +1,13 @@
|
||||
#
|
||||
# Makefile for WATCOM
|
||||
#
|
||||
#
|
||||
|
||||
WXDIR = $(%WXWIN)
|
||||
|
||||
PROGRAM = wxconvert
|
||||
EXTRALIBS = $(WXDIR)\lib\wxxml.lib
|
||||
OBJECTS=convert.obj rc2xml.obj rc2wxr.obj wxr2xml.obj
|
||||
|
||||
!include $(WXDIR)\src\makeprog.wat
|
||||
|
@@ -98,6 +98,12 @@ int XmlResApp::OnRun()
|
||||
{ wxCMD_LINE_NONE }
|
||||
};
|
||||
|
||||
#if wxUSE_GUI
|
||||
// VS: I need reasonable output to console from wxCmdLineParser
|
||||
wxLog::SetTimestamp(NULL);
|
||||
delete wxLog::SetActiveTarget(new wxLogStderr);
|
||||
#endif
|
||||
|
||||
wxXmlDocument::AddHandler(new wxXmlIOHandlerBinZ);
|
||||
|
||||
wxCmdLineParser parser(cmdLineDesc, argc, argv);
|
||||
|
@@ -49,7 +49,7 @@ void NodeInfo::Read(const wxString& filename, wxPathList& list)
|
||||
|
||||
for (size_t i = 0; i < tf.GetLineCount(); i++)
|
||||
{
|
||||
if (tf[i].IsEmpty() || tf[i][0] == _T('#')) continue;
|
||||
if (tf[i].IsEmpty() || tf[i][0u] == _T('#')) continue;
|
||||
wxStringTokenizer tkn(tf[i], _T(' '));
|
||||
wxString s = tkn.GetNextToken();
|
||||
if (s == _T("node"))
|
||||
|
@@ -113,7 +113,7 @@ void PropEditCtrlColor::OnDetails()
|
||||
wxString txt = m_TextCtrl->GetValue();
|
||||
long unsigned tmp;
|
||||
|
||||
if (txt.Length() == 7 && txt[0] == _T('#') &&
|
||||
if (txt.Length() == 7 && txt[0u] == _T('#') &&
|
||||
wxSscanf(txt.c_str(), _T("#%lX"), &tmp) == 1)
|
||||
clr = wxColour((tmp & 0xFF0000) >> 16,
|
||||
(tmp & 0x00FF00) >> 8,
|
||||
|
@@ -96,7 +96,9 @@ PreviewFrame::PreviewFrame()
|
||||
|
||||
CreateStatusBar();
|
||||
|
||||
SetSize(GetSize()); // refresh: MSW needs it
|
||||
#ifdef __WXMSW__
|
||||
SendSizeEvent(); // force resize for WXMSW
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@@ -20,7 +20,7 @@
|
||||
#include "propframe.h"
|
||||
|
||||
class WXDLLEXPORT wxXmlNode;
|
||||
class WXDLLEXPORT wxGenericTreeCtrl;
|
||||
class WXDLLEXPORT wxTreeCtrl;
|
||||
class WXDLLEXPORT wxTextCtrl;
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ class PropEditCtrl : public wxPanel
|
||||
|
||||
PropertiesFrame *m_PropFrame;
|
||||
bool m_Created;
|
||||
wxGenericTreeCtrl *m_TreeCtrl;
|
||||
wxTreeCtrl *m_TreeCtrl;
|
||||
wxTreeItemId m_TreeItem;
|
||||
wxWindow *m_TheCtrl;
|
||||
PropertyInfo *m_PropInfo;
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/bombs.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/bombs.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/bombs.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/bombs.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/dbbrowse.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/dbbrowse.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/dbbrowse.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/dbbrowse.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -34,6 +34,10 @@
|
||||
// - darf nur einmal im Projekte definiert werden ?? Extra Databasse Klasse ?
|
||||
wxDbConnectInf DbConnectInf; // F<>r DBase
|
||||
|
||||
#if !wxUSE_ODBC
|
||||
#error Demo cannot be compiled unless setup.h has wxUSE_ODBC set to 1
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------------------------
|
||||
extern WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList; /* from db.cpp, used in getting back error results from db connections */
|
||||
|
||||
|
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 wx.lib jpeg.lib png.lib tiff.lib xpm.lib zlib.lib advapi32.lib comctl32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib rpcrt4.lib shell32.lib user32.lib uuid.lib winspool.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib"
|
||||
# ADD LINK32 wx.lib jpeg.lib png.lib tiff.lib zlib.lib advapi32.lib comctl32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib rpcrt4.lib shell32.lib user32.lib uuid.lib winspool.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "dbbrowse - Win32 Debug"
|
||||
|
||||
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 wxd.lib jpegd.lib pngd.lib tiffd.lib xpmd.lib zlibd.lib advapi32.lib comctl32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib rpcrt4.lib shell32.lib user32.lib uuid.lib winspool.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /pdbtype:sept
|
||||
# ADD LINK32 wxd.lib jpegd.lib pngd.lib tiffd.lib zlibd.lib advapi32.lib comctl32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib rpcrt4.lib shell32.lib user32.lib uuid.lib winspool.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /pdbtype:sept
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
@@ -1,15 +0,0 @@
|
||||
|
||||
# Top dir of wxWindows
|
||||
top_builddir = /gtm/bart/wxGTK
|
||||
|
||||
PROGRAM=dbbrowser_gtk
|
||||
|
||||
|
||||
OBJECTS= dbbrowse.o doc.o pgmctrl.o tabpgwin.o\
|
||||
browsedb.o dbtree.o dbgrid.o dlguser.o
|
||||
|
||||
|
||||
|
||||
|
||||
include $(top_builddir)/src/makeprog.env
|
||||
|
@@ -21,9 +21,11 @@
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/toolbar.h>
|
||||
#include <wx/treectrl.h>
|
||||
/*
|
||||
#ifdef __WXMSW__
|
||||
#include <wx/xpmhand.h>
|
||||
#endif
|
||||
*/
|
||||
//---------------------------
|
||||
#include "tabpgwin.h" // Original name : "controlarea.h"
|
||||
//---------------------------
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/forty.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/forty.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/forty.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/forty.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/fractal.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/fractal.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FractalVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/fractal.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/fractal.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FractalVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/life.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/life.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/life.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/life.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -443,7 +443,7 @@ void LifeFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
|
||||
|
||||
if (filedlg.ShowModal() == wxID_OK)
|
||||
{
|
||||
wxFileInputStream stream(filedlg.GetFilename());
|
||||
wxFileInputStream stream(filedlg.GetPath());
|
||||
LifeReader reader(stream);
|
||||
|
||||
// the reader handles errors itself, no need to do anything here
|
||||
|
@@ -45,8 +45,8 @@
|
||||
|
||||
LifeReader::LifeReader(wxInputStream& is)
|
||||
{
|
||||
wxBufferedInputStream buff_is = wxBufferedInputStream(is);
|
||||
wxTextInputStream text_is = wxTextInputStream(buff_is);
|
||||
wxBufferedInputStream buff_is(is);
|
||||
wxTextInputStream text_is(buff_is);
|
||||
wxString line, rest;
|
||||
|
||||
// check stream
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/wxpoem.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/wxpoem.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "PoemVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/wxpoem.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/wxpoem.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "PoemVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -483,17 +483,17 @@ samples/validate/*.xpm
|
||||
samples/validate/*.ico
|
||||
samples/validate/*.bmp
|
||||
|
||||
samples/events/*.cpp
|
||||
samples/events/*.h
|
||||
samples/events/*.def
|
||||
samples/events/*.rc
|
||||
samples/events/*.inf
|
||||
samples/events/*.txt
|
||||
samples/events/makefile*
|
||||
samples/events/*.xbm
|
||||
samples/events/*.xpm
|
||||
samples/events/*.ico
|
||||
samples/events/*.bmp
|
||||
samples/event/*.cpp
|
||||
samples/event/*.h
|
||||
samples/event/*.def
|
||||
samples/event/*.rc
|
||||
samples/event/*.inf
|
||||
samples/event/*.txt
|
||||
samples/event/makefile*
|
||||
samples/event/*.xbm
|
||||
samples/event/*.xpm
|
||||
samples/event/*.ico
|
||||
samples/event/*.bmp
|
||||
|
||||
samples/treectrl/*.cpp
|
||||
samples/treectrl/*.h
|
||||
|
@@ -4,7 +4,7 @@
|
||||
|
||||
[Setup]
|
||||
MinVersion=4.0,4.0
|
||||
AppName=wxWindows
|
||||
AppName=wxWindows 2.3.0
|
||||
AppId=wxWindows
|
||||
CreateUninstallRegKey=1
|
||||
UsePreviousAppDir=1
|
||||
@@ -19,7 +19,7 @@
|
||||
WindowStartMaximized=1
|
||||
WindowVisible=1
|
||||
WindowResizable=1
|
||||
UninstallDisplayName=Uninstall wxWindows
|
||||
UninstallDisplayName=wxWindows 2.3.0
|
||||
UninstallLogMode=Append
|
||||
DirExistsWarning=auto
|
||||
UninstallFilesDir={app}
|
||||
@@ -28,9 +28,9 @@
|
||||
CreateAppDir=1
|
||||
DisableProgramGroupPage=0
|
||||
AlwaysCreateUninstallIcon=1
|
||||
UninstallIconName=Uninstall wxWindows
|
||||
UninstallIconName=Uninstall wxWindows 2.3.0
|
||||
Uninstallable=1
|
||||
DefaultDirName=c:\wx2
|
||||
DefaultDirName=c:\wx230
|
||||
DefaultGroupName=wxWindows 2.3.0
|
||||
LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt
|
||||
InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt
|
||||
|
@@ -38,9 +38,5 @@ src/mac/macsock/*.lib
|
||||
src/mac/morefile/*.h
|
||||
src/mac/morefile/*.cpp
|
||||
|
||||
src/mac/xpm/*.c
|
||||
src/mac/xpm/*.cpp
|
||||
src/mac/xpm/*.h
|
||||
|
||||
include/wx/mac/*.h
|
||||
|
||||
|
@@ -16,6 +16,7 @@ samples/dragimag/Makefile.in
|
||||
samples/drawing/Makefile.in
|
||||
samples/dynamic/Makefile.in
|
||||
samples/exec/Makefile.in
|
||||
samples/event/Makefile.in
|
||||
samples/grid/Makefile.in
|
||||
samples/newgrid/Makefile.in
|
||||
samples/help/Makefile.in
|
||||
@@ -61,6 +62,7 @@ samples/wizard/Makefile.in
|
||||
samples/dialup/Makefile.in
|
||||
samples/font/Makefile.in
|
||||
samples/menu/Makefile.in
|
||||
samples/memcheck/Makefile.in
|
||||
samples/treelay/Makefile.in
|
||||
samples/opengl/Makefile.in
|
||||
samples/opengl/cube/Makefile.in
|
||||
@@ -75,10 +77,18 @@ demos/life/Makefile.in
|
||||
demos/dbbrowse/Makefile.in
|
||||
utils/dialoged/Makefile.in
|
||||
utils/dialoged/src/Makefile.in
|
||||
utils/tex2rtf/Makefile.in
|
||||
utils/tex2rtf/src/Makefile.in
|
||||
utils/makegen/Makefile.in
|
||||
utils/HelpGen/Makefile.in
|
||||
utils/HelpGen/src/Makefile.in
|
||||
utils/Makefile.in
|
||||
utils/hhp2cached/Makefile.in
|
||||
|
||||
contrib/Makefile.in
|
||||
contrib/src/Makefile.in
|
||||
contrib/src/applet/Makefile.in
|
||||
contrib/src/canvas/Makefile.in
|
||||
contrib/src/ogl/Makefile.in
|
||||
contrib/src/mmedia/Makefile.in
|
||||
contrib/src/stc/Makefile.in
|
||||
@@ -90,12 +100,20 @@ contrib/samples/canvas/test/Makefile.in
|
||||
contrib/samples/canvas/simple/Makefile.in
|
||||
contrib/samples/canvas/Makefile.in
|
||||
contrib/samples/gizmos/Makefile.in
|
||||
contrib/samples/gizmos/multicell/Makefile.in
|
||||
contrib/samples/gizmos/splittree/Makefile.in
|
||||
contrib/samples/ogl/Makefile.in
|
||||
contrib/samples/ogl/ogledit/Makefile.in
|
||||
contrib/samples/ogl/studio/Makefile.in
|
||||
contrib/samples/mmedia/Makefile.in
|
||||
contrib/samples/plot/Makefile.in
|
||||
contrib/samples/stc/Makefile.in
|
||||
contrib/samples/applet/Makefile.in
|
||||
|
||||
contrib/utils/Makefile.in
|
||||
contrib/utils/convertrc/Makefile.in
|
||||
contrib/utils/wxrc/Makefile.in
|
||||
contrib/utils/wxrcedit/Makefile.in
|
||||
|
||||
descrip.mms
|
||||
lib/vms.opt
|
||||
|
@@ -54,31 +54,42 @@ cd $1
|
||||
echo Removing backup files...
|
||||
rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
|
||||
|
||||
rm -f $2/wxWindows-${WXVER}*.tgz
|
||||
rm -f $2/tex2rtf2.tgz
|
||||
rm -f $2/ogl3.tgz
|
||||
rm -f $2/jpeg.tgz
|
||||
rm -f $2/tiff.tgz
|
||||
rm -f $2/wx*-${WXVER}*.tgz
|
||||
rm -f $2/tex2rtf2-*.tgz
|
||||
rm -f $2/dialoged-*.tgz
|
||||
rm -f $2/ogl3-*.tgz
|
||||
rm -f $2/jpeg-*.tgz
|
||||
rm -f $2/tiff-*.tgz
|
||||
rm -f $2/stc-*.tgz
|
||||
rm -f $2/canvas-*.tgz
|
||||
rm -f $2/contrib-*.tgz
|
||||
rm -f $2/applet-*.tgz
|
||||
|
||||
echo Tarring...
|
||||
|
||||
### Generic
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgen.txt
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgen.txt
|
||||
tar cvf $2/wxWindows-${WXVER}-gen.tar -T /tmp/wxgen.txt
|
||||
gzip $2/wxWindows-${WXVER}-gen.tar
|
||||
mv $2/wxWindows-${WXVER}-gen.tar.gz $2/wxWindows-${WXVER}-gen.tgz
|
||||
|
||||
### wxGTK
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgtk.txt
|
||||
tar cvf $2/wxWindows-${WXVER}-gtk.tar -T /tmp/wxgtk.txt
|
||||
gzip $2/wxWindows-${WXVER}-gtk.tar
|
||||
mv $2/wxWindows-${WXVER}-gtk.tar.gz $2/wxWindows-${WXVER}-gtk.tgz
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxgtk.txt
|
||||
tar cvf $2/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
|
||||
gzip $2/wxGTK-${WXVER}.tar
|
||||
mv $2/wxGTK-${WXVER}.tar.gz $2/wxGTK-${WXVER}.tgz
|
||||
|
||||
### wxMotif
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxmotif.txt
|
||||
tar cvf $2/wxWindows-${WXVER}-mot.tar -T /tmp/wxmotif.txt
|
||||
gzip $2/wxWindows-${WXVER}-mot.tar
|
||||
mv $2/wxWindows-${WXVER}-mot.tar.gz $2/wxWindows-${WXVER}-mot.tgz
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxmotif.txt
|
||||
tar cvf $2/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
|
||||
gzip $2/wxMotif-${WXVER}.tar
|
||||
mv $2/wxMotif-${WXVER}.tar.gz $2/wxMotif-${WXVER}.tgz
|
||||
|
||||
### wxMSW
|
||||
ls `cat $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/bc.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxmsw.txt
|
||||
tar cvf $2/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
|
||||
gzip $2/wxMSW-${WXVER}.tar
|
||||
mv $2/wxMSW-${WXVER}.tar.gz $2/wxMSW-${WXVER}.tgz
|
||||
|
||||
### Doc sources
|
||||
ls `cat $1/distrib/msw/docsrc.rsp` > /tmp/docsrc.txt
|
||||
@@ -99,33 +110,33 @@ gzip $2/wxWindows-${WXVER}-pdf.tar
|
||||
mv $2/wxWindows-${WXVER}-pdf.tar.gz $2/wxWindows-${WXVER}-pdf.tgz
|
||||
|
||||
### Stubs files
|
||||
ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
|
||||
tar cvf $2/wxWindows-${WXVER}-stubs.tar -T /tmp/stubs.txt
|
||||
gzip $2/wxWindows-${WXVER}-stubs.tar
|
||||
mv $2/wxWindows-${WXVER}-stubs.tar.gz $2/wxWindows-${WXVER}-stubs.tgz
|
||||
#ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
|
||||
#tar cvf $2/wxWindows-${WXVER}-stubs.tar -T /tmp/stubs.txt
|
||||
#gzip $2/wxWindows-${WXVER}-stubs.tar
|
||||
#mv $2/wxWindows-${WXVER}-stubs.tar.gz $2/wxWindows-${WXVER}-stubs.tgz
|
||||
|
||||
### Tex2RTF
|
||||
ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt
|
||||
tar cvf $2/tex2rtf2.tar -T /tmp/tex2rtf.txt
|
||||
gzip $2/tex2rtf2.tar
|
||||
mv $2/tex2rtf2.tar.gz $2/tex2rtf2.tgz
|
||||
tar cvf $2/tex2rtf2-${WXVER}.tar -T /tmp/tex2rtf.txt
|
||||
gzip $2/tex2rtf2-${WXVER}.tar
|
||||
mv $2/tex2rtf2-${WXVER}.tar.gz $2/tex2rtf2-${WXVER}.tgz
|
||||
|
||||
### OGL
|
||||
ls `cat $1/distrib/msw/ogl.rsp` > /tmp/ogl.txt
|
||||
tar cvf $2/ogl3.tar -T /tmp/ogl.txt
|
||||
gzip $2/ogl3.tar
|
||||
mv $2/ogl3.tar.gz $2/ogl3.tgz
|
||||
tar cvf $2/ogl3-${WXVER}.tar -T /tmp/ogl.txt
|
||||
gzip $2/ogl3-${WXVER}.tar
|
||||
mv $2/ogl3-${WXVER}.tar.gz $2/ogl3-${WXVER}.tgz
|
||||
|
||||
### JPEG
|
||||
ls `cat $1/distrib/msw/jpeg.rsp` > /tmp/jpeg.txt
|
||||
tar cvf $2/jpeg.tar -T /tmp/jpeg.txt
|
||||
gzip $2/jpeg.tar
|
||||
mv $2/jpeg.tar.gz $2/jpeg.tgz
|
||||
tar cvf $2/jpeg-${WXVER}.tar -T /tmp/jpeg.txt
|
||||
gzip $2/jpeg-${WXVER}.tar
|
||||
mv $2/jpeg-${WXVER}.tar.gz $2/jpeg-${WXVER}.tgz
|
||||
|
||||
### TIFF
|
||||
ls `cat $1/distrib/msw/tiff.rsp` > /tmp/tiff.txt
|
||||
tar cvf $2/tiff.tar -T /tmp/tiff.txt
|
||||
gzip $2/tiff.tar
|
||||
mv $2/tiff.tar.gz $2/tiff.tgz
|
||||
tar cvf $2/tiff-${WXVER}.tar -T /tmp/tiff.txt
|
||||
gzip $2/tiff-${WXVER}.tar
|
||||
mv $2/tiff-${WXVER}.tar.gz $2/tiff-${WXVER}.tgz
|
||||
|
||||
echo Done!
|
||||
|
@@ -98,7 +98,6 @@ WXBUILDDLL=1
|
||||
# Please set these according to the settings in wx_setup.h, so we can include
|
||||
# the appropriate libraries in wx.lib
|
||||
USE_CTL3D=0
|
||||
USE_XPM_IN_MSW=1
|
||||
|
||||
PERIPH_LIBS=
|
||||
PERIPH_TARGET=
|
||||
@@ -111,12 +110,6 @@ PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
|
||||
PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
|
||||
!endif
|
||||
|
||||
!if "$(USE_XPM_IN_MSW)" == "1"
|
||||
PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
|
||||
PERIPH_TARGET=xpm $(PERIPH_TARGET)
|
||||
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
|
||||
!endif
|
||||
|
||||
#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
|
||||
PERIPH_LIBS=
|
||||
PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
|
||||
@@ -126,7 +119,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA
|
||||
DUMMY=dummy
|
||||
!else
|
||||
DUMMY=dummydll
|
||||
LIBS= cw32mti import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
|
||||
LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff
|
||||
!endif
|
||||
|
||||
LIBTARGET=$(WXLIB)
|
||||
@@ -281,16 +274,6 @@ all_execs:
|
||||
make -f makefile.b32 all_execs
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
wxxpm: $(CFG)
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_wxxpm: $(CFG)
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.b32 clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
png: $(CFG)
|
||||
cd $(WXDIR)\src\png
|
||||
make -f makefile.b32
|
||||
@@ -321,16 +304,6 @@ clean_jpeg:
|
||||
make -f makefile.b32 clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
xpm: $(CFG)
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.b32 lib
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_xpm:
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.b32 clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
tiff: $(CFG)
|
||||
cd $(WXDIR)\src\tiff
|
||||
make -f makefile.b32 lib
|
||||
@@ -356,7 +329,7 @@ $(CFG): makefile.b32
|
||||
-WE
|
||||
-tWM
|
||||
|
||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
|
||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
|
||||
-I$(WXDIR)\include\wx\msw\gnuwin32
|
||||
|
||||
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
|
||||
|
@@ -98,7 +98,6 @@ THISDIR = $(WXDIR)\src\msw
|
||||
# Please set these according to the settings in wx_setup.h, so we can include
|
||||
# the appropriate libraries in wx.lib
|
||||
USE_CTL3D=1
|
||||
USE_XPM_IN_MSW=1
|
||||
|
||||
PERIPH_LIBS=
|
||||
PERIPH_TARGET=
|
||||
@@ -108,12 +107,6 @@ PERIPH_CLEAN_TARGET=
|
||||
PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
|
||||
!endif
|
||||
|
||||
!if "$(USE_XPM_IN_MSW)" == "1"
|
||||
PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
|
||||
PERIPH_TARGET=xpm $(PERIPH_TARGET)
|
||||
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
|
||||
!endif
|
||||
|
||||
# TODO: add these libraries
|
||||
# PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
|
||||
PERIPH_TARGET=zlib png $(PERIPH_TARGET)
|
||||
@@ -228,16 +221,6 @@ all_execs:
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
# CONTRIB
|
||||
xpm: $(CFG)
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_xpm: $(CFG)
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.bcc clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
png: $(CFG)
|
||||
cd $(WXDIR)\src\png
|
||||
make -f makefile.bcc
|
||||
@@ -275,7 +258,7 @@ $(CFG): makefile.bcc
|
||||
-Fs-
|
||||
-Vf
|
||||
-Ff=4
|
||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
|
||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib
|
||||
-I$(WXDIR)\include\wx\msw\gnuwin32
|
||||
-L$(BCCDIR)\lib
|
||||
-D__WXWIN__
|
||||
|
@@ -78,12 +78,10 @@ DUMMYOBJ=dummy.obj
|
||||
# This one overrides the others, to be consistent with the settings in wx_setup.h
|
||||
MINIMAL_WXWINDOWS_SETUP=0
|
||||
|
||||
USE_XPM_IN_MSW=1
|
||||
USE_CTL3D=1
|
||||
|
||||
!if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
|
||||
USE_CTL3D=0
|
||||
USE_XPM_IN_MSW=0
|
||||
!endif
|
||||
|
||||
PERIPH_LIBS=
|
||||
@@ -94,12 +92,6 @@ PERIPH_CLEAN_TARGET=
|
||||
# PERIPH_LIBS=d:\msdev\lib\ctl3d32.lib $(PERIPH_LIBS)
|
||||
# !endif
|
||||
|
||||
!if "$(USE_XPM_IN_MSW)" == "1"
|
||||
PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
|
||||
PERIPH_TARGET=xpm $(PERIPH_TARGET)
|
||||
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
|
||||
!endif
|
||||
|
||||
# PNG and Zlib
|
||||
PERIPH_TARGET=png zlib $(PERIPH_TARGET)
|
||||
PERIPH_CLEAN_TARGET=clean_png clean_zlib $(PERIPH_CLEAN_TARGET)
|
||||
@@ -124,10 +116,6 @@ MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");
|
||||
|
||||
MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");
|
||||
|
||||
# TODO: Implement XPM and PNG targets in this makefile!
|
||||
# $(OLEDIR)\xpmhand \
|
||||
# $(OLEDIR)\pnghand \
|
||||
|
||||
OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
|
||||
|
||||
# Normal, static library
|
||||
@@ -235,18 +223,6 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h
|
||||
|
||||
# Peripheral components
|
||||
|
||||
$(WXDIR)\lib\xpm.lib: xpm
|
||||
|
||||
xpm:
|
||||
cd $(WXDIR)\src\xpm
|
||||
nmake -f makefile.dos FINAL=$(FINAL)
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_xpm:
|
||||
cd $(WXDIR)\src\xpm
|
||||
nmake -f makefile.dos clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
zlib:
|
||||
cd $(WXDIR)\src\zlib
|
||||
nmake -f makefile.dos FINAL=$(FINAL)
|
||||
|
@@ -119,6 +119,7 @@ datstrm.cpp C B
|
||||
db.cpp C 32,B
|
||||
dbtable.cpp C 32,B
|
||||
dcbase.cpp C
|
||||
dircmn.cpp C B
|
||||
dlgcmn.cpp C
|
||||
dobjcmn.cpp C
|
||||
dndcmn.cpp C
|
||||
@@ -159,7 +160,7 @@ imagtiff.cpp C 32
|
||||
imagpcx.cpp C 32
|
||||
imagpng.cpp C 32
|
||||
imagpnm.cpp C 32
|
||||
imagxpm.cpp C 32
|
||||
imagxpm.cpp C
|
||||
init.cpp B
|
||||
intl.cpp C B
|
||||
ipcbase.cpp C B
|
||||
@@ -524,6 +525,7 @@ utilsexc.cpp O B
|
||||
wave.cpp O
|
||||
window.cpp O
|
||||
gsocket.c O
|
||||
gsockpm.c O
|
||||
|
||||
helpdata.cpp H
|
||||
helpfrm.cpp H
|
||||
|
@@ -76,7 +76,6 @@ EXTRAOBJS=
|
||||
GENDIR = $(WXDIR)/src/generic
|
||||
COMMDIR = $(WXDIR)/src/common
|
||||
HTMLDIR = $(WXDIR)/src/html
|
||||
XPMDIR = $(WXDIR)/src/xpm
|
||||
PNGDIR = $(WXDIR)/src/png
|
||||
JPEGDIR = $(WXDIR)/src/jpeg
|
||||
ZLIBDIR = $(WXDIR)/src/zlib
|
||||
@@ -180,20 +179,8 @@ JPEGOBJS = \
|
||||
$(JPEGDIR)/jquant2.$(OBJSUFF) \
|
||||
$(JPEGDIR)/jdmerge.$(OBJSUFF)
|
||||
|
||||
XPMOBJECTS = $(XPMDIR)/crbuffri.o\
|
||||
$(XPMDIR)/crdatfri.o\
|
||||
$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
|
||||
$(XPMDIR)/crifrdat.o\
|
||||
$(XPMDIR)/data.o\
|
||||
$(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
|
||||
$(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
|
||||
$(XPMDIR)/rdftoi.o\
|
||||
$(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
|
||||
$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
|
||||
$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
|
||||
|
||||
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
|
||||
$(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
|
||||
$(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
|
||||
|
||||
all: $(OBJECTS) $(WXLIB)
|
||||
|
||||
|
@@ -95,7 +95,7 @@ WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
|
||||
WXDEF = wx$(WXVERSION).def
|
||||
DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
|
||||
$(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
|
||||
$(WXDIR)/lib/libxpm.a $(WXDIR)/lib/libtiff.a
|
||||
$(WXDIR)/lib/libtiff.a
|
||||
DLL_LDFLAGS = -L$(WXDIR)/lib
|
||||
DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
|
||||
-luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
|
||||
@@ -113,7 +113,6 @@ HTMLDIR = $(WXDIR)/src/html
|
||||
ZLIBDIR = $(WXDIR)/src/zlib
|
||||
PNGDIR = $(WXDIR)/src/png
|
||||
JPEGDIR = $(WXDIR)/src/jpeg
|
||||
XPMDIR = $(WXDIR)/src/xpm
|
||||
TIFFDIR = $(WXDIR)/src/tiff
|
||||
OLEDIR = $(WXDIR)/src/msw/ole
|
||||
MSWDIR = $(WXDIR)/src/msw
|
||||
@@ -121,7 +120,6 @@ MSWDIR = $(WXDIR)/src/msw
|
||||
ZLIBLIB = $(WXDIR)/lib/libzlib.a
|
||||
PNGLIB = $(WXDIR)/lib/libpng.a
|
||||
JPEGLIB = $(WXDIR)/lib/libjpeg.a
|
||||
XPMLIB = $(WXDIR)/lib/libxpm.a
|
||||
TIFFLIB = $(WXDIR)/lib/libtiff.a
|
||||
|
||||
DOCDIR = $(WXDIR)/docs
|
||||
@@ -236,27 +234,6 @@ JPEGOBJS = \
|
||||
$(JPEGDIR)/jquant2.$(OBJSUFF) \
|
||||
$(JPEGDIR)/jdmerge.$(OBJSUFF)
|
||||
|
||||
# NOTE: these filenames are case sensitive!
|
||||
XPMOBJS = $(XPMDIR)/Attrib.o\
|
||||
$(XPMDIR)/CrBufFrI.o\
|
||||
$(XPMDIR)/CrDatFrI.o\
|
||||
$(XPMDIR)/create.o\
|
||||
$(XPMDIR)/CrIFrBuf.o\
|
||||
$(XPMDIR)/CrIFrDat.o\
|
||||
$(XPMDIR)/data.o\
|
||||
$(XPMDIR)/Image.o\
|
||||
$(XPMDIR)/Info.o\
|
||||
$(XPMDIR)/hashtab.o\
|
||||
$(XPMDIR)/misc.o\
|
||||
$(XPMDIR)/parse.o\
|
||||
$(XPMDIR)/RdFToDat.o\
|
||||
$(XPMDIR)/RdFToI.o\
|
||||
$(XPMDIR)/rgb.o\
|
||||
$(XPMDIR)/scan.o\
|
||||
$(XPMDIR)/simx.o\
|
||||
$(XPMDIR)/WrFFrDat.o\
|
||||
$(XPMDIR)/WrFFrI.o
|
||||
|
||||
TIFFOBJS = $(TIFFDIR)/tif_aux.o \
|
||||
$(TIFFDIR)/tif_close.o \
|
||||
$(TIFFDIR)/tif_codec.o \
|
||||
@@ -302,9 +279,9 @@ else
|
||||
endif
|
||||
|
||||
ifndef WXMAKINGDLL
|
||||
all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
|
||||
all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB)
|
||||
else
|
||||
all: $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
|
||||
all: $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL)
|
||||
endif
|
||||
|
||||
ifndef WXMAKINGDLL
|
||||
@@ -370,10 +347,6 @@ $(JPEGLIB): $(JPEGOBJS)
|
||||
$(AR) $(AROPTIONS) $@ $(JPEGOBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(XPMLIB): $(XPMOBJS)
|
||||
$(AR) $(AROPTIONS) $@ $(XPMOBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(TIFFLIB): $(TIFFOBJS)
|
||||
$(AR) $(AROPTIONS) $@ $(TIFFOBJS)
|
||||
$(RANLIB) $@
|
||||
@@ -438,8 +411,6 @@ clean:
|
||||
-$(RM) ../png/*.bak
|
||||
-$(RM) ../jpeg/*.o
|
||||
-$(RM) ../jpeg/*.bak
|
||||
-$(RM) ../xpm/*.o
|
||||
-$(RM) ../xpm/*.bak
|
||||
-$(RM) ../tiff/*.o
|
||||
-$(RM) ../tiff/*.bak
|
||||
|
||||
@@ -448,7 +419,6 @@ cleanall: clean
|
||||
-$(RM) $(ZLIBLIB)
|
||||
-$(RM) $(PNGLIB)
|
||||
-$(RM) $(JPEGLIB)
|
||||
-$(RM) $(XPMLIB)
|
||||
-$(RM) $(TIFFLIB)
|
||||
|
||||
ifdef WXMAKINGDLL
|
||||
|
@@ -67,7 +67,6 @@ OPTIONS=
|
||||
|
||||
GENDIR=$(WXDIR)\src\generic
|
||||
COMMDIR=$(WXDIR)\src\common
|
||||
XPMDIR=$(WXDIR)\src\xpm
|
||||
OLEDIR=ole
|
||||
MSWDIR=$(WXDIR)\src\msw
|
||||
|
||||
@@ -79,20 +78,8 @@ COMMONOBJS = \
|
||||
|
||||
MSWOBJS = #$ ExpandList("WXMSWOBJS");
|
||||
|
||||
XPMOBJECTS = $(XPMDIR)\crbuffri.obj\
|
||||
$(XPMDIR)\crdatfri.obj\
|
||||
$(XPMDIR)\create.obj $(XPMDIR)\crifrbuf.obj\
|
||||
$(XPMDIR)\crifrdat.obj\
|
||||
$(XPMDIR)\data.obj\
|
||||
$(XPMDIR)\hashtab.obj $(XPMDIR)\misc.obj\
|
||||
$(XPMDIR)\parse.obj $(XPMDIR)\rdftodat.obj\
|
||||
$(XPMDIR)\rdftoi.obj\
|
||||
$(XPMDIR)\rgb.obj $(XPMDIR)\scan.obj\
|
||||
$(XPMDIR)\simx.obj $(XPMDIR)\wrffrdat.obj\
|
||||
$(XPMDIR)\wrffrp.obj $(XPMDIR)\wrffri.obj
|
||||
|
||||
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(XPMOBJECTS)
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
|
||||
|
||||
all: $(LIBTARGET)
|
||||
|
||||
|
@@ -92,8 +92,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWinDll - Win32 Debug"
|
||||
|
||||
@@ -118,8 +118,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\zlib\Debug\zlib.lib /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
@@ -71,7 +71,7 @@
|
||||
$DLL_OR_LIB=Config("wxbase") ? "wxBase" : "wxWindows";
|
||||
$DLL_FLAGS=" ";
|
||||
#! actually this depends on the contents of setup.h
|
||||
$EXTRA_LIBS=Config("wxbase") ? "" : "xpm zlib png jpeg tiff";
|
||||
$EXTRA_LIBS=Config("wxbase") ? "" : "zlib png jpeg tiff";
|
||||
}
|
||||
|
||||
#! let's be smarter: first of all, if no extension is given, add .lib
|
||||
|
@@ -82,11 +82,10 @@ LIBTARGET = $(WXLIB)\wx.lib
|
||||
DUMMY=dummydll
|
||||
# ODBCLIB = ..\..\contrib\odbc\odbc32.lib
|
||||
|
||||
EXTRATARGETS = xpm png zlib jpeg tiff
|
||||
EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib clean_jpeg clean_tiff
|
||||
EXTRATARGETS = png zlib jpeg tiff
|
||||
EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff
|
||||
GENDIR=$(WXDIR)\src\generic
|
||||
COMMDIR=$(WXDIR)\src\common
|
||||
XPMDIR=$(WXDIR)\src\xpm
|
||||
JPEGDIR=$(WXDIR)\src\jpeg
|
||||
TIFFDIR=$(WXDIR)\src\tiff
|
||||
MSWDIR=$(WXDIR)\src\msw
|
||||
@@ -207,73 +206,6 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
|
||||
}
|
||||
#$}
|
||||
|
||||
crbuffri.obj: $(XPMDIR)\crbuffri.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crbuffrp.obj: $(XPMDIR)\crbuffrp.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crdatfri.obj: $(XPMDIR)\crdatfri.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crdatfrp.obj: $(XPMDIR)\crdatfrp.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
create.obj: $(XPMDIR)\create.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crifrbuf.obj: $(XPMDIR)\crifrbuf.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crifrdat.obj: $(XPMDIR)\crifrdat.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crpfrdat.obj: $(XPMDIR)\crpfrdat.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
# TODO: what to do about this clash of filename????
|
||||
#data.obj: $(XPMDIR)\data.c
|
||||
# *$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
hashtab.obj: $(XPMDIR)\hashtab.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
misc.obj: $(XPMDIR)\misc.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
parse.obj: $(XPMDIR)\parse.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
rdftodat.obj: $(XPMDIR)\rdftodat.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
rdftoi.obj: $(XPMDIR)\rdftoi.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
rdftop.obj: $(XPMDIR)\rdftop.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
rgb.obj: $(XPMDIR)\rgb.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
scan.obj: $(XPMDIR)\scan.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
simx.obj: $(XPMDIR)\simx.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
wrffrdat.obj: $(XPMDIR)\wrffrdat.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
wrffri.obj: $(XPMDIR)\wrffri.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
wrffrp.obj: $(XPMDIR)\wrffrp.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
|
||||
trees$(O)
|
||||
OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
|
||||
@@ -323,16 +255,6 @@ uncompr.obj: uncompr.c zlib.h zconf.h
|
||||
zutil.obj: zutil.c zutil.h zlib.h zconf.h
|
||||
$(CC) -c $(CFLAGS) $*.c
|
||||
|
||||
xpm: .SYMBOLIC
|
||||
cd $(WXDIR)\src\xpm
|
||||
wmake -f makefile.wat all
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_xpm: .SYMBOLIC
|
||||
cd $(WXDIR)\src\xpm
|
||||
wmake -f makefile.wat clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
png: .SYMBOLIC
|
||||
cd $(WXDIR)\src\png
|
||||
wmake -f makefile.wat all
|
||||
|
@@ -1,5 +1,5 @@
|
||||
wxBase.dsp
|
||||
wxBase.dsw
|
||||
wxBaseVC.dsp
|
||||
wxBaseVC.dsw
|
||||
wxBaseDll.dsp
|
||||
wxBaseDll.dsw
|
||||
|
||||
@@ -20,9 +20,6 @@ src/zlib/ZlibVC.dsw
|
||||
src/png/PngVC.dsp
|
||||
src/png/PngVC.dsw
|
||||
|
||||
src/xpm/XpmVC.dsp
|
||||
src/xpm/XpmVC.dsw
|
||||
|
||||
samples/SamplesVC.dsw
|
||||
|
||||
samples/calendar/CalendarVC.dsp
|
||||
@@ -67,6 +64,9 @@ samples/drawing/DrawingVC.dsw
|
||||
samples/dynamic/DynamicVC.dsp
|
||||
samples/dynamic/DynamicVC.dsw
|
||||
|
||||
samples/event/EventVC.dsp
|
||||
samples/event/EventVC.dsw
|
||||
|
||||
samples/exec/ExecVC.dsp
|
||||
samples/exec/ExecVC.dsw
|
||||
|
||||
|
@@ -25,14 +25,20 @@ pause
|
||||
|
||||
erase %dest\wx*.zip
|
||||
erase %dest\*.htb
|
||||
erase %dest\ogl3.zip
|
||||
erase %dest\tex2rtf2.zip
|
||||
erase %dest\jpeg.zip
|
||||
erase %dest\tiff.zip
|
||||
erase %dest\dialoged.zip
|
||||
erase %dest\utils.zip
|
||||
erase %dest\extradoc.zip
|
||||
erase %dest\*-win32.zip
|
||||
erase %dest\ogl3*.zip
|
||||
erase %dest\contrib*.zip
|
||||
erase %dest\tex2rtf2*.zip
|
||||
erase %dest\mmedia*.zip
|
||||
erase %dest\jpeg*.zip
|
||||
erase %dest\tiff*.zip
|
||||
erase %dest\dialoged*.zip
|
||||
erase %dest\utils*.zip
|
||||
erase %dest\extradoc*.zip
|
||||
erase %dest\stc*.zip
|
||||
erase %dest\*-win32*.zip
|
||||
erase %dest\setup*.*
|
||||
erase %dest\*.txt
|
||||
erase %dest\make*
|
||||
|
||||
if direxist %dest\wx erase /sxyz %dest\wx\
|
||||
if not direxist %dest mkdir %dest
|
||||
@@ -49,8 +55,20 @@ Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\wx_chm.rsp
|
||||
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\jpeg.rsp
|
||||
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\tiff.rsp
|
||||
|
||||
echo Zipping wxMac distribution
|
||||
zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
|
||||
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
|
||||
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw.rsp
|
||||
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
|
||||
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
|
||||
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
|
||||
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
|
||||
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
|
||||
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
|
||||
|
||||
Rem Below is the old-style separated-out format. This is retained only
|
||||
Rem for local use, and for creating wxMSW-xxx.zip.
|
||||
echo Zipping individual components
|
||||
zip32 -@ %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\generic.rsp
|
||||
zip32 -@ -u %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\makefile.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\msw.rsp
|
||||
@@ -72,7 +90,7 @@ zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
|
||||
|
||||
Rem PDF/HTML docs that should go into the Windows setup because
|
||||
Rem there are no WinHelp equivalents
|
||||
zip32 -@ %dest\extradoc.zip < %src\distrib\msw\extradoc.rsp
|
||||
zip32 -@ %dest\extradoc-%version%.zip < %src\distrib\msw\extradoc.rsp
|
||||
|
||||
rem VC++ project files
|
||||
zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp
|
||||
@@ -84,49 +102,53 @@ rem CodeWarrior project files
|
||||
zip32 -@ %dest\wxWindows-%version%-cw.zip < %src\distrib\msw\cw.rsp
|
||||
|
||||
rem OGL 3
|
||||
zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp
|
||||
zip32 -@ %dest\ogl3-%version%.zip < %src\distrib\msw\ogl.rsp
|
||||
|
||||
rem MMedia
|
||||
zip32 -@ %dest\mmedia.zip < %src\distrib\msw\mmedia.rsp
|
||||
zip32 -@ %dest\mmedia-%version%.zip < %src\distrib\msw\mmedia.rsp
|
||||
|
||||
rem STC (Scintilla widget)
|
||||
zip32 -@ %dest\stc.zip < %src\distrib\msw\stc.rsp
|
||||
zip32 -@ %dest\stc-%version%.zip < %src\distrib\msw\stc.rsp
|
||||
|
||||
rem GLCanvas: obsolete, now in main library
|
||||
rem zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp
|
||||
|
||||
rem Tex2RTF
|
||||
zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp
|
||||
zip32 -@ %dest\tex2rtf2-%version%.zip < %src\distrib\msw\tex2rtf.rsp
|
||||
|
||||
rem JPEG source
|
||||
zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
|
||||
zip32 -@ %dest\jpeg-%version%.zip < %src\distrib\msw\jpeg.rsp
|
||||
|
||||
rem TIFF source
|
||||
zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp
|
||||
zip32 -@ %dest\tiff-%version%.zip < %src\distrib\msw\tiff.rsp
|
||||
|
||||
zip32 -@ %dest\wxxml.zip < %src\distrib\msw\xml.rsp
|
||||
zip32 -@ %dest\wxxml-%version%.zip < %src\distrib\msw\xml.rsp
|
||||
|
||||
zip32 -@ %dest\contrib-%version%.zip < %src\distrib\msw\contrib.rsp
|
||||
|
||||
rem Dialog Editor source and binary
|
||||
erase %dest\dialoged_source.zip
|
||||
zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
|
||||
zip32 -j %dest\dialoged.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
|
||||
zip32 -j %dest\dialoged-%version%.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
|
||||
erase %dest\dialoged_source.zip
|
||||
|
||||
rem Misc. utils not in the main distribution
|
||||
zip32 -@ %dest\utils.zip < %src\distrib\msw\utils.rsp
|
||||
zip32 -@ -u %dest\utils.zip < %src\distrib\msw\utilmake.rsp
|
||||
zip32 -@ %dest\utils-%version%.zip < %src\distrib\msw\utils.rsp
|
||||
zip32 -@ -u %dest\utils-%version%.zip < %src\distrib\msw\utilmake.rsp
|
||||
|
||||
copy %src\docs\changes.txt %dest
|
||||
copy %src\docs\msw\install.txt %dest\install_msw.txt
|
||||
copy %src\docs\motif\install.txt %dest\install_motif.txt
|
||||
copy %src\docs\gtk\install.txt %dest\install_gtk.txt
|
||||
copy %src\docs\readme.txt %dest
|
||||
copy %src\docs\motif\readme.txt %dest\readme_motif.txt
|
||||
copy %src\docs\gtk\readme.txt %dest\readme_gtk.txt
|
||||
copy %src\docs\msw\readme.txt %dest\readme_msw.txt
|
||||
copy %src\docs\readme_vms.txt %dest
|
||||
copy %src\docs\motif\makewxmotif %dest
|
||||
copy %src\docs\gtk\makewxgtk %dest
|
||||
copy %src\docs\changes.txt %dest\changes-%version%.txt
|
||||
copy %src\docs\msw\install.txt %dest\install_msw-%version%.txt
|
||||
copy %src\docs\mac\install.txt %dest\install_mac-%version%.txt
|
||||
copy %src\docs\motif\install.txt %dest\install_motif-%version%.txt
|
||||
copy %src\docs\gtk\install.txt %dest\install_gtk-%version%.txt
|
||||
copy %src\docs\readme.txt %dest\readme-%version%.txt
|
||||
copy %src\docs\motif\readme.txt %dest\readme_motif-%version%.txt
|
||||
copy %src\docs\gtk\readme.txt %dest\readme_gtk-%version%.txt
|
||||
copy %src\docs\msw\readme.txt %dest\readme_msw-%version%.txt
|
||||
copy %src\docs\mac\readme.txt %dest\readme_mac-%version%.txt
|
||||
copy %src\docs\readme_vms.txt %dest\readme_vms-%version%.txt
|
||||
copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
|
||||
copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%
|
||||
|
||||
Rem Skip Inno Setup if inno is 0.
|
||||
if "%inno" == "0" goto end
|
||||
@@ -137,8 +159,8 @@ Rem Make dialoged-win32.zip and tex2rtf-win32.zip
|
||||
|
||||
cd %src\bin
|
||||
|
||||
zip32 %dest\dialoged-win32.zip dialoged.*
|
||||
zip32 %dest\tex2rtf-win32.zip tex2rtf.*
|
||||
zip32 %dest\dialoged-win32-%version%.zip dialoged.*
|
||||
zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*
|
||||
|
||||
cd %dest
|
||||
|
||||
@@ -154,14 +176,15 @@ unzip32 -o ..\wxWindows-%version%-gen.zip
|
||||
unzip32 -o ..\wxWindows-%version%-vc.zip
|
||||
unzip32 -o ..\wxWindows-%version%-bc.zip
|
||||
unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip
|
||||
unzip32 -o ..\extradoc.zip
|
||||
unzip32 -o ..\extradoc-%version%.zip
|
||||
Rem Need Word file, for Remstar DB classes
|
||||
unzip32 -o ..\wxWindows-%version%-Word.zip
|
||||
unzip32 -o ..\ogl3.zip
|
||||
unzip32 -o ..\jpeg.zip
|
||||
unzip32 -o ..\tiff.zip
|
||||
unzip32 -o ..\xml.zip
|
||||
unzip32 -o ..\tex2rtf2.zip
|
||||
unzip32 -o ..\ogl3-%version%.zip
|
||||
unzip32 -o ..\jpeg-%version%.zip
|
||||
unzip32 -o ..\tiff-%version%.zip
|
||||
unzip32 -o ..\wxxml-%version%.zip
|
||||
unzip32 -o ..\contrib-%version%.zip
|
||||
unzip32 -o ..\tex2rtf2-%version%.zip
|
||||
|
||||
rem Now delete a few files that are unnecessary
|
||||
attrib -R *
|
||||
@@ -212,7 +235,7 @@ Rem ren %WXWIN\deliver2\setup.EXE %WXWIN\deliver2\wxMSW-%version%-setup.exe
|
||||
cd %dest
|
||||
|
||||
rem Put all the setup files into a single zip archive.
|
||||
zip32 wxMSW-%version%-setup.zip readme.txt setup.*
|
||||
zip32 wxMSW-%version%-setup.zip readme-%version%.txt setup.*
|
||||
|
||||
echo wxWindows archived.
|
||||
|
||||
|
@@ -8,14 +8,15 @@ wxBase:
|
||||
|
||||
- fixed problem with wxURL when using static version of the library
|
||||
- wxZipFSHandler::FindFirst() and FindNext() now correctly list directories
|
||||
- wxMimeTypesManager now can create file associations too
|
||||
- wxMimeTypesManager now can create file associations too (Chris Elliott)
|
||||
- wxCopyFile() respects the file permissions (Roland Scholz)
|
||||
- wxFTP::GetFileSize() added (S<>ren Erland Vest<73>)
|
||||
- wxDateTime::IsSameDate() bug fixed
|
||||
- wxTimeSpan::Format() now behaves more as expected, see docs
|
||||
- wxLocale now provides much more convenient API for setting language and detecting
|
||||
current system language. New API is more abstracted and truly cross-platform,
|
||||
independent of underlying C runtime library.
|
||||
- wxLocale now provides much more convenient API for setting language and
|
||||
detecting current system language. New API is more abstracted and truly
|
||||
cross-platform, independent of underlying C runtime library.
|
||||
- wxDir::Traverse() added
|
||||
|
||||
All (GUI):
|
||||
|
||||
@@ -25,7 +26,7 @@ All (GUI):
|
||||
- FindOrCreateBrush/Pen() bug fix for invalid colour values
|
||||
- new wxXPMHandler for reading and writing XPM images
|
||||
- added new (now recommended) API for conversion between wxImage and wxBitmap
|
||||
(wxBitmap::ConvertToImage() and wxBitmap::wxBitmap(wxImage&) instead of
|
||||
(wxBitmap::ConvertToImage() and wxBitmap::wxBitmap(wxImage&) instead of
|
||||
wxImage methods and ctor)
|
||||
|
||||
wxMSW:
|
||||
@@ -34,7 +35,7 @@ wxMSW:
|
||||
- fixed bug in MDI children flags (mis)handling
|
||||
- it is possible to compile wxCHMHelpController with other compilers than VisualC++
|
||||
now and hhctrl.ocx is loaded at runtime.
|
||||
|
||||
|
||||
wxGTK:
|
||||
|
||||
- added support for wchar_t (wxUSE_WCHAR_T) under Unix
|
||||
@@ -238,7 +239,7 @@ wxHTML:
|
||||
|
||||
- almost complete rewrite of wxHtmlHelpController,
|
||||
including faster search, bookmarks, printing, setup dialog
|
||||
and cross-platform binary compatible .cached files for faster
|
||||
and cross-platform binary compatible .cached files for faster
|
||||
loading of large helpbooks, case insensitive search
|
||||
splitted into 3 parts: wxHtmlHelpData, Frame and Controller
|
||||
- added support for charsets and <meta> tag
|
||||
|
@@ -1,7 +1,7 @@
|
||||
|
||||
!!! When sending bug reports tell us what version of wxWindows you are
|
||||
using (including the beta) and what compiler on what system. One
|
||||
example: wxGTK 2.2.0, egcs 1.1.1, Redhat 6.2 !!!
|
||||
example: wxGTK 2.3.0, egcs 1.1.1, Redhat 6.2 !!!
|
||||
|
||||
* The most simple case
|
||||
-----------------------
|
||||
|
@@ -1,12 +1,12 @@
|
||||
\section{\class{wxBoxSizer}}\label{wxboxsizer}
|
||||
|
||||
The basic idea behind a box sizer is that windows will most often be laid out in rather
|
||||
simple basic geomerty, typically in a row or a column or several hierachies of either.
|
||||
simple basic geometry, typically in a row or a column or several hierarchies of either.
|
||||
|
||||
As an example, we will construct a dialog that will contain a text field at the top and
|
||||
two buttons at the bottom. This can be seen as a top-hierarchy column with the text at
|
||||
the top and buttons at the bottom and a low-hierchary row with an OK button to the left
|
||||
and a Cancel button to the right. In many cases (particulary dialogs under Unix and
|
||||
the top and buttons at the bottom and a low-hierarchy row with an OK button to the left
|
||||
and a Cancel button to the right. In many cases (particularly dialogs under Unix and
|
||||
normal frames) the main window will be resizable by the user and this change of size
|
||||
will have to get propagated to its children. In our case, we want the text area to grow
|
||||
with the dialog, whereas the button shall have a fixed size. In addition, there will be
|
||||
|
@@ -1,8 +1,13 @@
|
||||
%
|
||||
% automatically generated by HelpGen from
|
||||
% include\wx\dir.h at 11/Dec/99 00:55:30
|
||||
%
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%% Name: dir.tex
|
||||
%% Purpose: wxDir documentation
|
||||
%% Author: Vadim Zeitlin
|
||||
%% Modified by:
|
||||
%% Created: 04.04.00
|
||||
%% RCS-ID: $Id$
|
||||
%% Copyright: (c) Vadim Zeitlin
|
||||
%% License: wxWindows license
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
\section{\class{wxDir}}\label{wxdir}
|
||||
|
||||
@@ -10,6 +15,10 @@ wxDir is a portable equivalent of Unix {open/read/close}dir functions which
|
||||
allow enumerating of the files in a directory. wxDir allows enumerate files as
|
||||
well as directories.
|
||||
|
||||
wxDir also provides a flexible way to enumerate files recursively using
|
||||
\helpref{Traverse}{wxdirtraverse} or a simpler
|
||||
\helpref{GetAllFiles}{wxdirgetallfiles} function.
|
||||
|
||||
Example of use:
|
||||
|
||||
\begin{verbatim}
|
||||
@@ -117,3 +126,117 @@ empty) and flags, return TRUE on success.
|
||||
Continue enumerating files satisfying the criteria specified by the last call
|
||||
to \helpref{GetFirst}{wxdirgetfirst}.
|
||||
|
||||
\membersection{wxDir::Traverse}{wxdirtraverse}
|
||||
|
||||
\func{size\_t}{Traverse}{\param{wxDirTraverser& }{sink}, \param{const wxString& }{filespec = wxEmptyString}, \param{int }{flags = wxDIR\_DEFAULT}}
|
||||
|
||||
Enumerate all files and directories under the given directory recursively
|
||||
calling the element of the provided \helpref{wxDirTraverser}{wxdirtraverser}
|
||||
object for each of them.
|
||||
|
||||
More precisely, the function will really recurse into subdirectories if
|
||||
{\it flags} contains {\tt wxDIR\_DIRS} flag. It will ignore the files (but
|
||||
still possibly recurse into subdirectories) if {\tt wxDIR\_FILES} flag is
|
||||
given.
|
||||
|
||||
For each found directory, \helpref{sink.OnDir()}{wxdirtraverserondir} is called
|
||||
and \helpref{sink.OnFile()}{wxdirtraverseronfile} is called for every file.
|
||||
Depending on the return value, the enumeration may continue or stop.
|
||||
|
||||
The function returns the total number of files found or {\tt (size\_t)-1} on
|
||||
error.
|
||||
|
||||
See also: \helpref{GetAllFiles}{wxdirgetallfiles}
|
||||
|
||||
\membersection{wxDirTraverser::GetAllFiles}{wxdirtraversergetallfiles}
|
||||
|
||||
\func{static size\_t}{GetAllFiles}{\param{const wxString& }{dirname}, \param{wxArrayString *}{files}, \param{const wxString& }{filespec = wxEmptyString}, \param{int }{flags = wxDIR\_DEFAULT}}
|
||||
|
||||
The function appends the names of all the files under directory {\it dirname}
|
||||
to the array {\it files} (note that its old contents is preserved). Only files
|
||||
matching the {\it filespec} are taken, with empty spec matching all the files.
|
||||
|
||||
The {\it flags} parameter should always include {\tt wxDIR\_FILES} or the array
|
||||
would be unchanged and should include {\tt wxDIR\_DIRS} flag to recurse into
|
||||
subdirectories (both flags are included in the value by default).
|
||||
|
||||
See also: \helpref{Traverse}{wxdirtraverse}
|
||||
|
||||
\section{\class{wxDirTraverser}}\label{wxdirtraverser}
|
||||
|
||||
wxDirTraverser is an abstract interface which must be implemented by objects
|
||||
passed to \helpref{Traverse}{wxdirtraverse} function.
|
||||
|
||||
Example of use (this works almost like \helpref{GetAllFiles}{wxdirgetallfiles}):
|
||||
|
||||
\begin{verbatim}
|
||||
class wxDirTraverserSimple : public wxDirTraverser
|
||||
{
|
||||
public:
|
||||
wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
|
||||
|
||||
virtual wxDirTraverseResult OnFile(const wxString& filename)
|
||||
{
|
||||
m_files.Add(filename);
|
||||
return wxDIR_CONTINUE;
|
||||
}
|
||||
|
||||
virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
|
||||
{
|
||||
return wxDIR_CONTINUE;
|
||||
}
|
||||
|
||||
private:
|
||||
wxArrayString& m_files;
|
||||
};
|
||||
|
||||
// get the names of all files in the array
|
||||
wxArrayString files;
|
||||
wxDirTraverserSimple traverser(files);
|
||||
|
||||
wxDir dir(dirname);
|
||||
dir.Traverse(traverser);
|
||||
\end{verbatim}
|
||||
|
||||
\wxheading{Derived from}
|
||||
|
||||
No base class
|
||||
|
||||
\wxheading{Constants}
|
||||
|
||||
The elements of {\tt wxDirTraverseResult} are the possible return values of the
|
||||
callback functions:
|
||||
|
||||
{\small
|
||||
\begin{verbatim}
|
||||
enum wxDirTraverseResult
|
||||
{
|
||||
wxDIR_IGNORE = -1, // ignore this directory but continue with others
|
||||
wxDIR_STOP, // stop traversing
|
||||
wxDIR_CONTINUE // continue into this directory
|
||||
};
|
||||
\end{verbatim}
|
||||
|
||||
\wxheading{Include files}
|
||||
|
||||
<wx/dir.h>
|
||||
|
||||
\latexignore{\rtfignore{\wxheading{Members}}}
|
||||
|
||||
\membersection{wxDirTraverser::OnFile}{wxdirtraverseronfile}
|
||||
|
||||
\func{virtual wxDirTraverseResult}{OnFile}{\param{const wxString& }{filename}}
|
||||
|
||||
This function is called for each file. It may return {\tt wxDIR\_STOP} to abort
|
||||
traversing (for example, if the file being searched is found) or
|
||||
{\tt wxDIR\_CONTINUE} to proceed.
|
||||
|
||||
\membersection{wxDirTraverser::OnDir}{wxdirtraverserondir}
|
||||
|
||||
\func{virtual wxDirTraverseResult}{OnDir}{\param{const wxString& }{dirname}}
|
||||
|
||||
This function is called for each directory. It may return {\tt wxSIR\_STOP}
|
||||
to abort traversing completely, {\tt wxDIR\_IGNORE} to skip this directory but
|
||||
continue with others or {\tt wxDIR\_CONTINUE} to enumerate all files and
|
||||
subdirectories in this directory.
|
||||
|
||||
|
@@ -93,8 +93,6 @@ If the specified encoding isn't available, no font is created.
|
||||
If the desired font does not exist, the closest match will be chosen.
|
||||
Under Windows, only scaleable TrueType fonts are used.
|
||||
|
||||
Underlining only works under Windows at present.
|
||||
|
||||
See also \helpref{wxDC::SetFont}{wxdcsetfont}, \helpref{wxDC::DrawText}{wxdcdrawtext}
|
||||
and \helpref{wxDC::GetTextExtent}{wxdcgettextextent}.
|
||||
|
||||
|
@@ -30,8 +30,9 @@ No base class
|
||||
The functions in this section work with and manipulate the active log target.
|
||||
The {\it OnLog()} is called by the {\it wxLogXXX()} functions and invokes the
|
||||
{\it DoLog()} of the active log target if any. Get/Set methods are used to
|
||||
install/query the current active target and, finally, {\it
|
||||
DontCreateOnDemand()} disables the automatic creation of a standard log target
|
||||
install/query the current active target and, finally,
|
||||
\helpref{DontCreateOnDemand()}{wxlogdontcreateondemand}
|
||||
disables the automatic creation of a standard log target
|
||||
if none actually exists. It is only useful when the application is terminating
|
||||
and shouldn't be used in other situations because it may easily lead to a loss
|
||||
of messages.
|
||||
@@ -123,6 +124,7 @@ window on the corresponding error message. If you wish to enable it, please use
|
||||
|
||||
\helpref{AddTraceMask}{wxlogaddtracemask}\\
|
||||
\helpref{RemoveTraceMask}{wxlogremovetracemask}\\
|
||||
\helpref{ClearTraceMasks}{wxlogcleartracemasks}\\
|
||||
\helpref{IsAllowedTraceMask}{wxlogisallowedtracemask}\\
|
||||
\helpref{SetVerbose}{wxlogsetverbose}\\
|
||||
\helpref{GetVerbose}{wxloggetverbose}\\
|
||||
@@ -147,6 +149,15 @@ Add the {\it mask} to the list of allowed masks for
|
||||
|
||||
See also: \helpref{RemoveTraceMask}{wxlogremovetracemask}
|
||||
|
||||
\membersection{wxLog::ClearTraceMasks}\label{wxlogcleartracemasks}
|
||||
|
||||
\func{static void}{ClearTraceMasks}{\void}
|
||||
|
||||
Removes all trace masks previously set with
|
||||
\helpref{AddTraceMask}{wxlogaddtracemask}.
|
||||
|
||||
See also: \helpref{RemoveTraceMask}{wxlogremovetracemask}
|
||||
|
||||
\membersection{wxLog::OnLog}\label{wxlogonlog}
|
||||
|
||||
\func{static void}{OnLog}{\param{wxLogLevel }{ level}, \param{const char * }{ message}}
|
||||
@@ -172,7 +183,11 @@ previous active log target (may be NULL).
|
||||
\func{static void}{DontCreateOnDemand}{\void}
|
||||
|
||||
Instructs wxLog to not create new log targets on the fly if there is none
|
||||
currently. (Almost) for internal use only.
|
||||
currently. (Almost) for internal use only: it is supposed to be called by the
|
||||
application shutdown code.
|
||||
|
||||
Note that this function also calls
|
||||
\helpref{ClearTraceMasks}{wxlogcleartracemasks}.
|
||||
|
||||
\membersection{wxLog::Flush}\label{wxlogflush}
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
wxWindows 2.2 for Motif installation
|
||||
wxWindows 2.3 for Motif installation
|
||||
------------------------------------
|
||||
|
||||
IMPORTANT NOTE:
|
||||
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
|
||||
|
||||
When sending bug reports tell us what version of wxWindows you are
|
||||
using (including the beta) and what compiler on what system. One
|
||||
example: wxMotif 2.2.0, egcs 1.1.1, Redhat 5.0
|
||||
example: wxMotif 2.3.0, egcs 1.1.1, Redhat 5.0
|
||||
|
||||
First steps
|
||||
-----------
|
||||
|
@@ -1,9 +1,9 @@
|
||||
|
||||
Installing wxWindows 2.2
|
||||
Installing wxWindows 2.3
|
||||
------------------------
|
||||
|
||||
This is wxWindows 2.2 for Microsoft Windows 3.1, 95, 98 and
|
||||
Windows NT/Windows 2000. This is an official, stable release.
|
||||
This is wxWindows 2.3 for Microsoft Windows 3.1, 95, 98 and
|
||||
Windows NT/Windows 2000. This is an unstable development release.
|
||||
|
||||
IMPORTANT NOTE: If you experience problems installing, please
|
||||
re-read this instructions and other related files (changes.txt,
|
||||
@@ -288,7 +288,7 @@ samples, and not all samples. The remaining samples can be made
|
||||
with the makefiles. See also the demos hierarchy which doesn't
|
||||
have any BC++ project files yet.
|
||||
|
||||
Note (2): to make the png, xpm, zlib, jpeg and tiff libraries (needed for
|
||||
Note (2): to make the png, zlib, jpeg and tiff libraries (needed for
|
||||
some samples) you need to compile them with bc32.ide.
|
||||
|
||||
Note (3): the debug version of the wxWindows library is about 40 MB, and the
|
||||
@@ -412,15 +412,6 @@ Watcom C++.
|
||||
Note (3): if Watcom can't read the precompiled header when
|
||||
building a sample, try deleting src\msw\watcom.pch and
|
||||
compiling the sample again.
|
||||
Note (4): if you get _popen_ and _pclose_ link errors, try
|
||||
recompiling wxWindows with XPM support disabled in setup.h.
|
||||
Alternatively, make sure these lines exist at the top of
|
||||
src\xpm\xpmi.h:
|
||||
|
||||
// Added by JACS for Watcom C++/wxWindows compilation (no popen/pclose functions)
|
||||
#ifdef __WATCOMC__
|
||||
#define NO_ZPIPE
|
||||
#endif
|
||||
|
||||
Metrowerks CodeWarrior compilation
|
||||
----------------------------------
|
||||
|
@@ -1,22 +1,27 @@
|
||||
wxWindows 2.3.0
|
||||
---------------
|
||||
|
||||
*** Please note that this is an UNSTABLE DEVELOPMENT SNAPSHOT.
|
||||
*** Unless you need the new features and bug fixes, you may wish to
|
||||
*** use the official 2.2.x stable series.
|
||||
|
||||
Welcome to wxWindows 2, a sophisticated cross-platform C++
|
||||
framework for writing advanced GUI applications using (where
|
||||
possible) the native controls.
|
||||
|
||||
In addition to common and advanced GUI facilities such as frames, scrolling
|
||||
windows, toolbars, tree controls, icons, device contexts, printing,
|
||||
splitter windows and so on, there are wrappers for common file operations,
|
||||
and facilities for writing TCP/IP applications, thread handling, and more.
|
||||
Where certain features are not available on a platform, such as MDI and
|
||||
tree controls on Unix, they are emulated.
|
||||
In addition to common and advanced GUI facilities such as
|
||||
frames, scrolling windows, toolbars, tree controls, icons,
|
||||
device contexts, printing, splitter windows and so on, there are
|
||||
wrappers for common file operations, and facilities for writing
|
||||
TCP/IP applications, thread handling, and more. Where certain
|
||||
features are not available on a platform, such as MDI and tree
|
||||
controls on Unix, they are emulated.
|
||||
|
||||
A detailed 1400-page reference manual is supplied in HTML, PDF and
|
||||
Windows Help form: see the docs hierarchy.
|
||||
A detailed 1400-page reference manual is supplied in HTML, PDF
|
||||
and Windows Help form: see the docs hierarchy.
|
||||
|
||||
For a quick start, point your Web browser at docs/html/index.htm for a
|
||||
list of important documents and samples.
|
||||
For a quick start, point your Web browser at docs/html/index.htm
|
||||
for a list of important documents and samples.
|
||||
|
||||
Changes in this release
|
||||
-----------------------
|
||||
@@ -28,7 +33,7 @@ Platforms supported
|
||||
|
||||
wxWindows 2 currently supports the following platforms:
|
||||
|
||||
- Windows 3.1, Windows 95/98, Windows NT
|
||||
- Windows 3.1, Windows 95/98, Windows NT, Windows 2000
|
||||
- Most Unix variants with Motif/Lesstif
|
||||
- Most Unix variants with GTK+
|
||||
- MacOS
|
||||
@@ -212,5 +217,5 @@ web site.
|
||||
|
||||
Good luck!
|
||||
|
||||
The wxWindows Team, 8th May, 2001
|
||||
The wxWindows Team, 12th May, 2001
|
||||
|
||||
|
@@ -42,12 +42,12 @@ class WXDLLEXPORT wxDateSpan;
|
||||
|
||||
#ifdef __WXMAC__
|
||||
#if __MSL__ < 0x6000
|
||||
#define WX_TIME_BASE_OFFSET ( 2082844800L + 126144000L )
|
||||
#define WX_TIME_BASE_OFFSET ( 2082844800L + 126144000L )
|
||||
#else
|
||||
#define WX_TIME_BASE_OFFSET 0
|
||||
#define WX_TIME_BASE_OFFSET 0
|
||||
#endif
|
||||
#else
|
||||
#define WX_TIME_BASE_OFFSET 0
|
||||
#define WX_TIME_BASE_OFFSET 0
|
||||
#endif
|
||||
/*
|
||||
* TODO
|
||||
@@ -539,7 +539,7 @@ public:
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
// default ctor does not initialize the object, use Set()!
|
||||
wxDateTime() { }
|
||||
wxDateTime() { m_time = wxLongLong((long)ULONG_MAX, ULONG_MAX); }
|
||||
|
||||
// from time_t: seconds since the Epoch 00:00:00 UTC, Jan 1, 1970)
|
||||
#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
|
||||
@@ -773,8 +773,7 @@ public:
|
||||
// result of timezone shift)
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
// is the date valid? Note that this will return TRUE for non
|
||||
// initialized objects but FALSE if *this == wxInvalidDateTime
|
||||
// is the date valid?
|
||||
inline bool IsValid() const { return m_time != wxInvalidDateTime.m_time; }
|
||||
|
||||
// get the broken down date/time representation in the given timezone
|
||||
|
@@ -452,7 +452,8 @@ enum wxDBMS
|
||||
dbmsINFORMIX,
|
||||
dbmsVIRTUOSO,
|
||||
dbmsDB2,
|
||||
dbmsINTERBASE
|
||||
dbmsINTERBASE,
|
||||
dbmsPERVASIVE_SQL
|
||||
};
|
||||
|
||||
|
||||
|
@@ -37,6 +37,32 @@ enum
|
||||
wxDIR_DEFAULT = wxDIR_FILES | wxDIR_DIRS | wxDIR_HIDDEN
|
||||
};
|
||||
|
||||
// these constants are possible return value of wxDirTraverser::OnDir()
|
||||
enum wxDirTraverseResult
|
||||
{
|
||||
wxDIR_IGNORE = -1, // ignore this directory but continue with others
|
||||
wxDIR_STOP, // stop traversing
|
||||
wxDIR_CONTINUE // continue into this directory
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxDirTraverser: helper class for wxDir::Traverse()
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxDirTraverser
|
||||
{
|
||||
public:
|
||||
// called for each file found by wxDir::Traverse()
|
||||
//
|
||||
// return wxDIR_STOP or wxDIR_CONTINUE from here
|
||||
virtual wxDirTraverseResult OnFile(const wxString& filename) = 0;
|
||||
|
||||
// called for each directory found by wxDir::Traverse()
|
||||
//
|
||||
// return one of the enum elements defined above
|
||||
virtual wxDirTraverseResult OnDir(const wxString& dirname) = 0;
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxDir: portable equivalent of {open/read/close}dir functions
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -65,6 +91,9 @@ public:
|
||||
// returns TRUE if the directory was successfully opened
|
||||
bool IsOpened() const;
|
||||
|
||||
// get the full name of the directory (without '/' at the end)
|
||||
wxString GetName() const;
|
||||
|
||||
// file enumeration routines
|
||||
// -------------------------
|
||||
|
||||
@@ -78,27 +107,19 @@ public:
|
||||
// GetFirstNormal()
|
||||
bool GetNext(wxString *filename) const;
|
||||
|
||||
// TODO using scandir() when available later, emulating it otherwise
|
||||
#if 0
|
||||
// get all files in the directory into an array, return TRUE on success
|
||||
// enumerate all files in this directory and its subdirectories
|
||||
//
|
||||
// this function uses Select() function to select the files
|
||||
// unless the filespec is explicitly given and Compare() function to sort
|
||||
// them
|
||||
bool Read(wxArrayString& filenames,
|
||||
const wxString& filespec = wxEmptyString) const;
|
||||
// return the number of files found
|
||||
size_t Traverse(wxDirTraverser& sink,
|
||||
const wxString& filespec = wxEmptyString,
|
||||
int flags = wxDIR_DEFAULT) const;
|
||||
|
||||
protected:
|
||||
// this function is called by Read() if filespec is not specified in
|
||||
// Read(): it should return TRUE if the file matches our selection
|
||||
// criteria and FALSE otherwise
|
||||
virtual bool Select(const wxChar* filename);
|
||||
|
||||
// This function is called by Read() to sort the array: it should return
|
||||
// -1, 0 or +1 if the first file is less than, equal to or greater than
|
||||
// the second. The base class version does
|
||||
virtual int Compare(const wxChar *filename1, const wxChar *filename2);
|
||||
#endif // 0
|
||||
// simplest version of Traverse(): get the names of all files under this
|
||||
// directory into filenames array, return the number of files
|
||||
static size_t GetAllFiles(const wxString& dirname,
|
||||
wxArrayString *files,
|
||||
const wxString& filespec = wxEmptyString,
|
||||
int flags = wxDIR_DEFAULT);
|
||||
|
||||
private:
|
||||
friend class WXDLLEXPORT wxDirData;
|
||||
|
@@ -454,10 +454,10 @@ WX_DEFINE_EXPORTED_ARRAY(void *, wxArrayPtrVoid);
|
||||
// append all element of one array to another one
|
||||
#define WX_APPEND_ARRAY(array, other) \
|
||||
{ \
|
||||
size_t count = other.Count(); \
|
||||
size_t count = (other).Count(); \
|
||||
for ( size_t n = 0; n < count; n++ ) \
|
||||
{ \
|
||||
array.Add(other[n]); \
|
||||
(array).Add((other)[n]); \
|
||||
} \
|
||||
}
|
||||
|
||||
@@ -469,13 +469,13 @@ WX_DEFINE_EXPORTED_ARRAY(void *, wxArrayPtrVoid);
|
||||
// count on it)!
|
||||
#define WX_CLEAR_ARRAY(array) \
|
||||
{ \
|
||||
size_t count = array.Count(); \
|
||||
size_t count = (array).Count(); \
|
||||
for ( size_t n = 0; n < count; n++ ) \
|
||||
{ \
|
||||
delete array[n]; \
|
||||
delete (array)[n]; \
|
||||
} \
|
||||
\
|
||||
array.Empty(); \
|
||||
(array).Empty(); \
|
||||
}
|
||||
|
||||
#endif // _DYNARRAY_H
|
||||
|
@@ -961,7 +961,6 @@ public:
|
||||
wxEVT_MENU_INIT,
|
||||
wxEVT_MENU_HIGHLIGHT,
|
||||
wxEVT_POPUP_MENU_INIT,
|
||||
wxEVT_CONTEXT_MENU,
|
||||
*/
|
||||
|
||||
class WXDLLEXPORT wxMenuEvent : public wxEvent
|
||||
@@ -1425,6 +1424,37 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS(wxHelpEvent)
|
||||
};
|
||||
|
||||
// A Context event is sent when the user right clicks on a window or
|
||||
// presses Shift-F10
|
||||
// NOTE : Under windows this is a repackaged WM_CONTETXMENU message
|
||||
// Under other systems it may have to be generated from a right click event
|
||||
/*
|
||||
wxEVT_CONTEXT_MENU
|
||||
*/
|
||||
|
||||
class WXDLLEXPORT wxContextMenuEvent : public wxCommandEvent
|
||||
{
|
||||
public:
|
||||
wxContextMenuEvent(wxEventType type = wxEVT_NULL,
|
||||
wxWindowID id = 0,
|
||||
const wxPoint& pt = wxDefaultPosition)
|
||||
{
|
||||
m_eventType = type;
|
||||
m_id = id;
|
||||
m_pos = pt;
|
||||
}
|
||||
|
||||
// Position of event (in screen coordinates)
|
||||
const wxPoint& GetPosition() const { return m_pos; }
|
||||
void SetPosition(const wxPoint& pos) { m_pos = pos; }
|
||||
|
||||
protected:
|
||||
wxPoint m_pos;
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxContextMenuEvent)
|
||||
};
|
||||
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
// Idle event
|
||||
@@ -1705,6 +1735,7 @@ typedef void (wxEvtHandler::*wxWindowDestroyEventFunction)(wxWindowDestroyEvent&
|
||||
typedef void (wxEvtHandler::*wxSetCursorEventFunction)(wxSetCursorEvent&);
|
||||
typedef void (wxEvtHandler::*wxNotifyEventFunction)(wxNotifyEvent&);
|
||||
typedef void (wxEvtHandler::*wxHelpEventFunction)(wxHelpEvent&);
|
||||
typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&);
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
// N.B. In GNU-WIN32, you *have* to take the address of a member function
|
||||
@@ -1935,6 +1966,10 @@ typedef void (wxEvtHandler::*wxHelpEventFunction)(wxHelpEvent&);
|
||||
#define EVT_DETAILED_HELP_RANGE(id1, id2, func) \
|
||||
DECLARE_EVENT_TABLE_ENTRY( wxEVT_DETAILED_HELP, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxHelpEventFunction) & func, (wxObject *) NULL ),
|
||||
|
||||
// Context Menu Events
|
||||
#define EVT_CONTEXT_MENU(func) \
|
||||
DECLARE_EVENT_TABLE_ENTRY(wxEVT_CONTEXT_MENU, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxContextMenuEventFunction) & func, (wxObject *) NULL ),
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Global data
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -102,14 +102,6 @@ public:
|
||||
wxPathFormat format = wxPATH_NATIVE)
|
||||
{ Assign(path, name, ext, format); }
|
||||
|
||||
// assorted assignment operators
|
||||
|
||||
wxFileName& operator=(const wxFileName& filename)
|
||||
{ Assign(filename); return *this; }
|
||||
|
||||
wxFileName& operator=(const wxString& filename)
|
||||
{ Assign(filename); return *this; }
|
||||
|
||||
// the same for delayed initialization
|
||||
|
||||
// VZ: wouldn't it be better to call this Create() for consistency with
|
||||
@@ -128,6 +120,14 @@ public:
|
||||
void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE)
|
||||
{ Assign(dir, _T(""), format); }
|
||||
|
||||
// assorted assignment operators
|
||||
|
||||
wxFileName& operator=(const wxFileName& filename)
|
||||
{ Assign(filename); return *this; }
|
||||
|
||||
wxFileName& operator=(const wxString& filename)
|
||||
{ Assign(filename); return *this; }
|
||||
|
||||
// reset all components to default, uninitialized state
|
||||
void Clear();
|
||||
|
||||
@@ -191,15 +191,15 @@ public:
|
||||
|
||||
// Comparison
|
||||
|
||||
// compares with the rules of this platform
|
||||
bool SameAs(const wxFileName &filepath,
|
||||
wxPathFormat format = wxPATH_NATIVE);
|
||||
|
||||
// uses the current platform settings
|
||||
bool operator==(const wxFileName& filename) { return SameAs(filename); }
|
||||
bool operator==(const wxString& filename)
|
||||
{ return *this == wxFileName(filename); }
|
||||
|
||||
// compares with the rules of this platform
|
||||
bool SameAs(const wxFileName &filepath,
|
||||
wxPathFormat format = wxPATH_NATIVE);
|
||||
|
||||
// Tests
|
||||
static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE );
|
||||
bool IsRelative( wxPathFormat format = wxPATH_NATIVE );
|
||||
|
@@ -560,6 +560,16 @@ private:
|
||||
class WXDLLEXPORT wxGridCellAttr
|
||||
{
|
||||
public:
|
||||
enum wxAttrKind
|
||||
{
|
||||
Any,
|
||||
Default,
|
||||
Cell,
|
||||
Row,
|
||||
Col,
|
||||
Merged
|
||||
};
|
||||
|
||||
// ctors
|
||||
wxGridCellAttr()
|
||||
{
|
||||
@@ -583,6 +593,7 @@ public:
|
||||
|
||||
// creates a new copy of this object
|
||||
wxGridCellAttr *Clone() const;
|
||||
void MergeWith(wxGridCellAttr *mergefrom);
|
||||
|
||||
// this class is ref counted: it is created with ref count of 1, so
|
||||
// calling DecRef() once will delete it. Calling IncRef() allows to lock
|
||||
@@ -599,7 +610,8 @@ public:
|
||||
m_hAlign = hAlign;
|
||||
m_vAlign = vAlign;
|
||||
}
|
||||
void SetReadOnly(bool isReadOnly = TRUE) { m_isReadOnly = isReadOnly; }
|
||||
void SetReadOnly(bool isReadOnly = TRUE)
|
||||
{ m_isReadOnly = isReadOnly ? ReadOnly : ReadWrite; }
|
||||
|
||||
// takes ownership of the pointer
|
||||
void SetRenderer(wxGridCellRenderer *renderer)
|
||||
@@ -607,6 +619,8 @@ public:
|
||||
void SetEditor(wxGridCellEditor* editor)
|
||||
{ wxSafeDecRef(m_editor); m_editor = editor; }
|
||||
|
||||
void SetKind(wxAttrKind kind) { m_attrkind = kind; }
|
||||
|
||||
// accessors
|
||||
bool HasTextColour() const { return m_colText.Ok(); }
|
||||
bool HasBackgroundColour() const { return m_colBack.Ok(); }
|
||||
@@ -614,6 +628,7 @@ public:
|
||||
bool HasAlignment() const { return (m_hAlign != -1 || m_vAlign != -1); }
|
||||
bool HasRenderer() const { return m_renderer != NULL; }
|
||||
bool HasEditor() const { return m_editor != NULL; }
|
||||
bool HasReadWriteMode() const { return m_isReadOnly != Unset; }
|
||||
|
||||
const wxColour& GetTextColour() const;
|
||||
const wxColour& GetBackgroundColour() const;
|
||||
@@ -622,20 +637,31 @@ public:
|
||||
wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
|
||||
wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
|
||||
|
||||
bool IsReadOnly() const { return m_isReadOnly; }
|
||||
bool IsReadOnly() const { return m_isReadOnly == wxGridCellAttr::ReadOnly; }
|
||||
|
||||
wxAttrKind GetKind() { return m_attrkind; }
|
||||
|
||||
void SetDefAttr(wxGridCellAttr* defAttr) { m_defGridAttr = defAttr; }
|
||||
|
||||
private:
|
||||
enum wxAttrReadMode
|
||||
{
|
||||
Unset = -1,
|
||||
ReadWrite,
|
||||
ReadOnly
|
||||
};
|
||||
|
||||
// the common part of all ctors
|
||||
void Init()
|
||||
{
|
||||
m_nRef = 1;
|
||||
|
||||
m_isReadOnly = FALSE;
|
||||
m_isReadOnly = Unset;
|
||||
|
||||
m_renderer = NULL;
|
||||
m_editor = NULL;
|
||||
|
||||
m_attrkind = wxGridCellAttr::Cell;
|
||||
}
|
||||
|
||||
// the dtor is private because only DecRef() can delete us
|
||||
@@ -658,7 +684,9 @@ private:
|
||||
wxGridCellEditor* m_editor;
|
||||
wxGridCellAttr* m_defGridAttr;
|
||||
|
||||
bool m_isReadOnly;
|
||||
wxAttrReadMode m_isReadOnly;
|
||||
|
||||
wxAttrKind m_attrkind;
|
||||
|
||||
// use Clone() instead
|
||||
DECLARE_NO_COPY_CLASS(wxGridCellAttr);
|
||||
@@ -687,7 +715,8 @@ public:
|
||||
virtual ~wxGridCellAttrProvider();
|
||||
|
||||
// DecRef() must be called on the returned pointer
|
||||
virtual wxGridCellAttr *GetAttr(int row, int col) const;
|
||||
virtual wxGridCellAttr *GetAttr(int row, int col,
|
||||
wxGridCellAttr::wxAttrKind kind ) const;
|
||||
|
||||
// all these functions take ownership of the pointer, don't call DecRef()
|
||||
// on it
|
||||
@@ -778,7 +807,9 @@ public:
|
||||
|
||||
// by default forwarded to wxGridCellAttrProvider if any. May be
|
||||
// overridden to handle attributes directly in the table.
|
||||
virtual wxGridCellAttr *GetAttr( int row, int col );
|
||||
virtual wxGridCellAttr *GetAttr( int row, int col,
|
||||
wxGridCellAttr::wxAttrKind kind );
|
||||
|
||||
|
||||
// these functions take ownership of the pointer
|
||||
virtual void SetAttr(wxGridCellAttr* attr, int row, int col);
|
||||
@@ -1078,7 +1109,7 @@ public:
|
||||
// handler to reduce screen flicker.
|
||||
//
|
||||
void ForceRefresh();
|
||||
|
||||
|
||||
|
||||
// ------ edit control functions
|
||||
//
|
||||
@@ -1160,6 +1191,8 @@ public:
|
||||
wxString GetColLabelValue( int col );
|
||||
wxColour GetGridLineColour() { return m_gridLineColour; }
|
||||
wxColour GetCellHighlightColour() { return m_cellHighlightColour; }
|
||||
int GetCellHighlightPenWidth() { return m_cellHighlightPenWidth; }
|
||||
int GetCellHighlightROPenWidth() { return m_cellHighlightROPenWidth; }
|
||||
|
||||
void SetRowLabelSize( int width );
|
||||
void SetColLabelSize( int height );
|
||||
@@ -1172,6 +1205,8 @@ public:
|
||||
void SetColLabelValue( int col, const wxString& );
|
||||
void SetGridLineColour( const wxColour& );
|
||||
void SetCellHighlightColour( const wxColour& );
|
||||
void SetCellHighlightPenWidth(int width);
|
||||
void SetCellHighlightROPenWidth(int width);
|
||||
|
||||
void EnableDragRowSize( bool enable = TRUE );
|
||||
void DisableDragRowSize() { EnableDragRowSize( FALSE ); }
|
||||
@@ -1364,6 +1399,14 @@ public:
|
||||
m_extraHeight = extraHeight;
|
||||
}
|
||||
|
||||
// Accessors for component windows
|
||||
wxWindow* GetGridWindow() { return (wxWindow*)m_gridWin; }
|
||||
wxWindow* GetGridRowLabelWindow() { return (wxWindow*)m_rowLabelWin; }
|
||||
wxWindow* GetGridColLabelWindow() { return (wxWindow*)m_colLabelWin; }
|
||||
wxWindow* GetGridCornerLabelWindow() { return (wxWindow*)m_cornerLabelWin; }
|
||||
|
||||
|
||||
|
||||
// ------ For compatibility with previous wxGrid only...
|
||||
//
|
||||
// ************************************************
|
||||
@@ -1605,6 +1648,9 @@ protected:
|
||||
wxColour m_gridLineColour;
|
||||
bool m_gridLinesEnabled;
|
||||
wxColour m_cellHighlightColour;
|
||||
int m_cellHighlightPenWidth;
|
||||
int m_cellHighlightROPenWidth;
|
||||
|
||||
|
||||
// common part of AutoSizeColumn/Row() and GetBestSize()
|
||||
int SetOrCalcColumnSizes(bool calcOnly, bool setAsMin = TRUE);
|
||||
@@ -1741,7 +1787,7 @@ protected:
|
||||
void HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol );
|
||||
|
||||
void HighlightBlock( const wxGridCellCoords& topLeft,
|
||||
const wxGridCellCoords& bottomRight )
|
||||
const wxGridCellCoords& bottomRight )
|
||||
{ HighlightBlock( topLeft.GetRow(), topLeft.GetCol(),
|
||||
bottomRight.GetRow(), bottomRight.GetCol() ); }
|
||||
|
||||
|
@@ -143,6 +143,11 @@ public:
|
||||
|
||||
void SetModified() { m_modified = TRUE; }
|
||||
|
||||
// wxGTK-specific: called recursively by Enable,
|
||||
// to give widgets an oppprtunity to correct their colours after they
|
||||
// have been changed by Enable
|
||||
virtual void OnParentEnable( bool enable ) ;
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
|
@@ -114,6 +114,11 @@ public:
|
||||
/* For compatibility across platforms (not in event table) */
|
||||
void OnIdle(wxIdleEvent& WXUNUSED(event)) {};
|
||||
|
||||
// wxGTK-specific: called recursively by Enable,
|
||||
// to give widgets an oppprtunity to correct their colours after they
|
||||
// have been changed by Enable
|
||||
virtual void OnParentEnable( bool WXUNUSED(enable) ) {};
|
||||
|
||||
/* used by all window classes in the widget creation process */
|
||||
bool PreCreation( wxWindow *parent, const wxPoint &pos, const wxSize &size );
|
||||
void PostCreation();
|
||||
|
@@ -143,6 +143,11 @@ public:
|
||||
|
||||
void SetModified() { m_modified = TRUE; }
|
||||
|
||||
// wxGTK-specific: called recursively by Enable,
|
||||
// to give widgets an oppprtunity to correct their colours after they
|
||||
// have been changed by Enable
|
||||
virtual void OnParentEnable( bool enable ) ;
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
|
@@ -114,6 +114,11 @@ public:
|
||||
/* For compatibility across platforms (not in event table) */
|
||||
void OnIdle(wxIdleEvent& WXUNUSED(event)) {};
|
||||
|
||||
// wxGTK-specific: called recursively by Enable,
|
||||
// to give widgets an oppprtunity to correct their colours after they
|
||||
// have been changed by Enable
|
||||
virtual void OnParentEnable( bool WXUNUSED(enable) ) {};
|
||||
|
||||
/* used by all window classes in the widget creation process */
|
||||
bool PreCreation( wxWindow *parent, const wxPoint &pos, const wxSize &size );
|
||||
void PostCreation();
|
||||
|
@@ -103,7 +103,6 @@ public:
|
||||
#if wxUSE_GUI
|
||||
// convertion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
|
||||
wxImage( const wxBitmap &bitmap );
|
||||
operator wxBitmap() const { return ConvertToBitmap(); }
|
||||
wxBitmap ConvertToBitmap() const;
|
||||
#ifdef __WXGTK__
|
||||
wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
|
||||
|
@@ -1,6 +1,8 @@
|
||||
#ifndef _WX_JOYSTICK_H_BASE_
|
||||
#define _WX_JOYSTICK_H_BASE_
|
||||
|
||||
#if wxUSE_JOYSTICK
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
#include "wx/msw/joystick.h"
|
||||
#elif defined(__WXMOTIF__)
|
||||
@@ -15,5 +17,7 @@
|
||||
#include "wx/stubs/joystick.h"
|
||||
#endif
|
||||
|
||||
#endif // wxUSE_JOYSTICK
|
||||
|
||||
#endif
|
||||
// _WX_JOYSTICK_H_BASE_
|
||||
|
@@ -187,6 +187,9 @@ class WXDLLEXPORT wxListBase : public wxObject
|
||||
{
|
||||
friend class wxNodeBase; // should be able to call DetachNode()
|
||||
friend class wxHashTableBase; // should be able to call untyped Find()
|
||||
private:
|
||||
// common part of all ctors
|
||||
void Init(wxKeyType keyType = wxKEY_NONE); // Must be declared before it's used (for VC++ 1.5)
|
||||
public:
|
||||
// default ctor & dtor
|
||||
wxListBase(wxKeyType keyType = wxKEY_NONE) { Init(keyType); }
|
||||
@@ -308,8 +311,6 @@ protected:
|
||||
|
||||
private:
|
||||
// helpers
|
||||
// common part of all ctors
|
||||
void Init(wxKeyType keyType = wxKEY_NONE);
|
||||
// common part of copy ctor and assignment operator
|
||||
void DoCopy(const wxListBase& list);
|
||||
// common part of all Append()s
|
||||
|
@@ -161,7 +161,7 @@ public:
|
||||
void SetVerbose(bool bVerbose = TRUE) { m_bVerbose = bVerbose; }
|
||||
// should GetActiveTarget() try to create a new log object if the
|
||||
// current is NULL?
|
||||
static void DontCreateOnDemand() { ms_bAutoCreate = FALSE; }
|
||||
static void DontCreateOnDemand();
|
||||
|
||||
// trace mask (see wxTraceXXX constants for details)
|
||||
static void SetTraceMask(wxTraceMask ulMask) { ms_ulTraceMask = ulMask; }
|
||||
@@ -169,6 +169,8 @@ public:
|
||||
static void AddTraceMask(const wxString& str) { ms_aTraceMasks.Add(str); }
|
||||
// add string trace mask
|
||||
static void RemoveTraceMask(const wxString& str);
|
||||
// remove all string trace masks
|
||||
static void ClearTraceMasks();
|
||||
|
||||
// sets the timestamp string: this is used as strftime() format string
|
||||
// for the log targets which add time stamps to the messages - set it
|
||||
|
@@ -69,7 +69,7 @@ protected:
|
||||
WXHBITMAP m_maskBitmap;
|
||||
};
|
||||
|
||||
enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict } ;
|
||||
enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ;
|
||||
|
||||
class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
|
||||
{
|
||||
@@ -92,6 +92,7 @@ public:
|
||||
int m_bitmapType ;
|
||||
PicHandle m_hPict ;
|
||||
WXHBITMAP m_hBitmap;
|
||||
WXHICON m_hIcon ;
|
||||
wxMask * m_bitmapMask; // Optional mask
|
||||
};
|
||||
|
||||
@@ -211,6 +212,8 @@ protected:
|
||||
public:
|
||||
void SetHBITMAP(WXHBITMAP bmp);
|
||||
WXHBITMAP GetHBITMAP() const;
|
||||
void SetHICON(WXHICON ico);
|
||||
inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }
|
||||
|
||||
PicHandle GetPict() const;
|
||||
|
||||
|
@@ -88,15 +88,11 @@ protected:
|
||||
virtual void DoSetItemClientObject( int n, wxClientData* clientData );
|
||||
virtual wxClientData* DoGetItemClientObject( int n ) const;
|
||||
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
|
||||
// free all memory we have (used by Clear() and dtor)
|
||||
void Free();
|
||||
|
||||
wxArrayString m_strings;
|
||||
wxChoiceDataArray m_dataArray ;
|
||||
wxChoiceDataArray m_datas ;
|
||||
MenuHandle m_macPopUpMenuHandle ;
|
||||
};
|
||||
|
||||
|
@@ -72,7 +72,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
|
||||
|
||||
virtual void Clear();
|
||||
|
||||
virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; };
|
||||
virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; }
|
||||
virtual void EndDoc(void) {};
|
||||
|
||||
virtual void StartPage(void) {};
|
||||
@@ -235,21 +235,22 @@ protected:
|
||||
wxCoord xoffset, wxCoord yoffset,
|
||||
int fillStyle = wxODDEVEN_RULE);
|
||||
|
||||
|
||||
|
||||
//
|
||||
|
||||
public:
|
||||
//begin wxmac
|
||||
protected:
|
||||
//begin wxmac
|
||||
// Variables used for scaling
|
||||
double m_mm_to_pix_x,m_mm_to_pix_y;
|
||||
bool m_needComputeScaleX,m_needComputeScaleY; // not yet used
|
||||
long m_internalDeviceOriginX,m_internalDeviceOriginY; // If un-scrolled is non-zero or
|
||||
// d.o. changes with scrolling.
|
||||
// Set using SetInternalDeviceOrigin().
|
||||
// not yet used
|
||||
bool m_needComputeScaleX,m_needComputeScaleY;
|
||||
// If un-scrolled is non-zero or d.o. changes with scrolling.
|
||||
// Set using SetInternalDeviceOrigin().
|
||||
long m_internalDeviceOriginX,m_internalDeviceOriginY;
|
||||
// To be set by external classes such as wxScrolledWindow
|
||||
// using SetDeviceOrigin()
|
||||
long m_externalDeviceOriginX,m_externalDeviceOriginY;
|
||||
|
||||
// Begin implementation for Mac
|
||||
public:
|
||||
|
||||
long m_externalDeviceOriginX,m_externalDeviceOriginY; // To be set by external classes
|
||||
// such as wxScrolledWindow
|
||||
// using SetDeviceOrigin()
|
||||
GrafPtr m_macPort ;
|
||||
GWorldPtr m_macMask ;
|
||||
|
||||
|
@@ -18,21 +18,6 @@
|
||||
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
|
||||
{
|
||||
friend class WXDLLEXPORT wxBitmap;
|
||||
friend class WXDLLEXPORT wxIcon;
|
||||
public:
|
||||
wxIconRefData();
|
||||
~wxIconRefData();
|
||||
|
||||
public:
|
||||
WXHICON m_hIcon;
|
||||
};
|
||||
|
||||
#define M_ICONDATA ((wxIconRefData *)m_refData)
|
||||
#define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData())
|
||||
|
||||
// Icon
|
||||
class WXDLLEXPORT wxIcon: public wxBitmap
|
||||
{
|
||||
@@ -44,8 +29,8 @@ public:
|
||||
// Copy constructors
|
||||
inline wxIcon(const wxIcon& icon) { Ref(icon); }
|
||||
|
||||
wxIcon( const char **bits, int width=-1, int height=-1 );
|
||||
wxIcon( char **bits, int width=-1, int height=-1 );
|
||||
wxIcon( const char **data );
|
||||
wxIcon( char **data );
|
||||
wxIcon(const char bits[], int width, int height);
|
||||
wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICON_RESOURCE,
|
||||
int desiredWidth = -1, int desiredHeight = -1);
|
||||
@@ -59,11 +44,6 @@ public:
|
||||
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
|
||||
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
|
||||
inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
|
||||
|
||||
void SetHICON(WXHICON ico);
|
||||
inline WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
|
||||
|
||||
virtual bool Ok() const { return (m_refData != NULL) ; }
|
||||
};
|
||||
|
||||
/*
|
||||
|
@@ -47,28 +47,16 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
|
||||
|
||||
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
|
||||
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
|
||||
virtual void OnPaint( wxPaintEvent &event ) ;
|
||||
virtual void OnPaint( wxPaintEvent &event ) ;
|
||||
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
|
||||
|
||||
inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
|
||||
|
||||
// for compatibility with wxMSW
|
||||
const wxIcon& GetIcon() const
|
||||
{
|
||||
// don't use wxDynamicCast, icons and bitmaps are really the same thing
|
||||
// in wxGTK
|
||||
return (const wxIcon &)m_messageBitmap;
|
||||
}
|
||||
|
||||
// for compatibility with wxMSW
|
||||
void SetIcon(const wxIcon& icon)
|
||||
{
|
||||
SetBitmap( (const wxBitmap&) icon );
|
||||
}
|
||||
inline const wxBitmap& GetBitmap() const { return m_messageBitmap; }
|
||||
const wxIcon& GetIcon() const { return (const wxIcon&) GetBitmap() ; }
|
||||
void SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
|
||||
|
||||
// overriden base class virtuals
|
||||
virtual bool AcceptsFocus() const { return FALSE; }
|
||||
wxSize DoGetBestSize() const ;
|
||||
wxSize DoGetBestSize() const ;
|
||||
|
||||
protected:
|
||||
wxBitmap m_messageBitmap;
|
||||
|
@@ -122,11 +122,7 @@ public:
|
||||
//!code: | -1 0 0 |
|
||||
//!code: matrix' = | 0 -1 0 | x matrix
|
||||
//!code: | 0 0 1 |
|
||||
#if defined(__WXPM__)
|
||||
wxTransformMatrix& Mirror(bool x=TRUE, bool y=FALSE);
|
||||
#else
|
||||
wxTransformMatrix& Mirror(bool x=true, bool y=false);
|
||||
#endif
|
||||
// Translate by dx, dy:
|
||||
//!ex:
|
||||
//!code: | 1 0 dx |
|
||||
|
@@ -70,6 +70,7 @@ public:
|
||||
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
protected:
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||
virtual void DoSetItemClientData( int n, void* clientData );
|
||||
virtual void* DoGetItemClientData( int n ) const;
|
||||
virtual void DoSetItemClientObject( int n, wxClientData* clientData );
|
||||
|
@@ -84,10 +84,6 @@ public:
|
||||
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
WXHWND GetEditHWND() const;
|
||||
|
||||
protected:
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
};
|
||||
|
||||
#endif // wxUSE_COMBOBOX
|
||||
|
@@ -73,8 +73,6 @@
|
||||
|
||||
class WXDLLEXPORT wxDC : public wxDCBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxDC)
|
||||
|
||||
public:
|
||||
wxDC();
|
||||
~wxDC();
|
||||
@@ -224,6 +222,20 @@ protected:
|
||||
WXHBRUSH m_oldBrush;
|
||||
WXHFONT m_oldFont;
|
||||
WXHPALETTE m_oldPalette;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxDC)
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxDCTemp: a wxDC which doesn't free the given HDC (used by wxWindows
|
||||
// only/mainly)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxDCTemp : public wxDC
|
||||
{
|
||||
public:
|
||||
wxDCTemp(WXHDC hdc) { SetHDC(hdc); }
|
||||
virtual ~wxDCTemp() { SetHDC((WXHDC)NULL); }
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -28,10 +28,6 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if !defined(__cplusplus)
|
||||
typedef int bool;
|
||||
#endif
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#endif
|
||||
@@ -49,11 +45,11 @@ struct _GSocket
|
||||
GSocketError m_error;
|
||||
|
||||
/* Attributes */
|
||||
bool m_non_blocking;
|
||||
bool m_server;
|
||||
bool m_stream;
|
||||
bool m_oriented;
|
||||
bool m_establishing;
|
||||
int m_non_blocking;
|
||||
int m_server;
|
||||
int m_stream;
|
||||
int m_oriented;
|
||||
int m_establishing;
|
||||
struct timeval m_timeout;
|
||||
|
||||
/* Callbacks */
|
||||
@@ -87,7 +83,7 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
|
||||
|
||||
/* Callbacks */
|
||||
|
||||
bool _GSocket_GUI_Init(GSocket *socket);
|
||||
int _GSocket_GUI_Init(GSocket *socket);
|
||||
void _GSocket_GUI_Destroy(GSocket *socket);
|
||||
|
||||
LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
|
||||
|
@@ -19,6 +19,7 @@
|
||||
#ifndef _REGISTRY_H
|
||||
#include <wx/msw/registry.h>
|
||||
#endif
|
||||
#include <wx/object.h>
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxRegConfig
|
||||
|
@@ -12,12 +12,25 @@
|
||||
#ifndef _WX_APP_H_
|
||||
#define _WX_APP_H_
|
||||
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#ifdef __EMX__
|
||||
#include <unistd.h>
|
||||
#else
|
||||
#include <utils.h>
|
||||
#undef BYTE_ORDER
|
||||
#include <types.h>
|
||||
#include <nerrno.h>
|
||||
#define INCL_ORDERS
|
||||
#endif
|
||||
|
||||
#include "wx/event.h"
|
||||
#include "wx/icon.h"
|
||||
|
||||
class WXDLLEXPORT wxFrame;
|
||||
class WXDLLEXPORT wxWindow;
|
||||
class WXDLLEXPORT wxApp ;
|
||||
class WXDLLEXPORT wxApp;
|
||||
class WXDLLEXPORT wxKeyEvent;
|
||||
class WXDLLEXPORT wxLog;
|
||||
|
||||
@@ -36,6 +49,7 @@ extern MRESULT EXPENTRY wxWndProc( HWND
|
||||
,MPARAM
|
||||
);
|
||||
|
||||
|
||||
// Represents the application. Derive OnInit and declare
|
||||
// a new App object to start application
|
||||
class WXDLLEXPORT wxApp : public wxAppBase
|
||||
@@ -76,6 +90,11 @@ public:
|
||||
void SetAuto3D(bool bFlag) { m_bAuto3D = bFlag; }
|
||||
bool GetAuto3D(void) const { return m_bAuto3D; }
|
||||
|
||||
int AddSocketHandler(int handle, int mask,
|
||||
void (*callback)(void*), void * gsock);
|
||||
void RemoveSocketHandler(int handle);
|
||||
void HandleSockets();
|
||||
|
||||
protected:
|
||||
bool m_bShowOnInit;
|
||||
int m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
|
||||
@@ -84,6 +103,14 @@ protected:
|
||||
//
|
||||
// PM-specific wxApp definitions */
|
||||
//
|
||||
private:
|
||||
int m_maxSocketHandles;
|
||||
int m_maxSocketNr;
|
||||
int m_lastUsedHandle;
|
||||
fd_set m_readfds;
|
||||
fd_set m_writefds;
|
||||
void* m_sockCallbackInfo;
|
||||
|
||||
public:
|
||||
|
||||
// Implementation
|
||||
@@ -98,13 +125,12 @@ public:
|
||||
|
||||
public:
|
||||
int m_nCmdShow;
|
||||
HMQ m_hMq;
|
||||
|
||||
protected:
|
||||
bool m_bKeepGoing ;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
private:
|
||||
HMQ m_hMq;
|
||||
};
|
||||
|
||||
int WXDLLEXPORT wxEntry( int argc, char *argv[] );
|
||||
|
@@ -1,105 +0,0 @@
|
||||
/* -------------------------------------------------------------------------
|
||||
* Project: GSocket (Generic Socket) for WX
|
||||
* Name: gsockos2.h
|
||||
* Purpose: GSocket OS/2 header
|
||||
* CVSID: $Id$
|
||||
* -------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ifndef __GSOCK_OS2_H
|
||||
#define __GSOCK_OS2_H
|
||||
|
||||
#ifndef __GSOCKET_STANDALONE__
|
||||
#include "wx/setup.h"
|
||||
#endif
|
||||
|
||||
#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
|
||||
|
||||
#ifndef __GSOCKET_STANDALONE__
|
||||
#include "wx/gsocket.h"
|
||||
#else
|
||||
#include "gsocket.h"
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#define SIGPIPE 13
|
||||
|
||||
/* Definition of GSocket */
|
||||
struct _GSocket
|
||||
{
|
||||
int m_fd;
|
||||
GAddress *m_local;
|
||||
GAddress *m_peer;
|
||||
GSocketError m_error;
|
||||
|
||||
int m_non_blocking;
|
||||
int m_server;
|
||||
int m_stream;
|
||||
int m_oriented;
|
||||
int m_establishing;
|
||||
unsigned long m_timeout;
|
||||
|
||||
/* Callbacks */
|
||||
GSocketEventFlags m_detected;
|
||||
GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
|
||||
char *m_data[GSOCK_MAX_EVENT];
|
||||
|
||||
char *m_gui_dependent;
|
||||
};
|
||||
|
||||
/* Definition of GAddress */
|
||||
struct _GAddress
|
||||
{
|
||||
struct sockaddr *m_addr;
|
||||
size_t m_len;
|
||||
|
||||
GAddressType m_family;
|
||||
int m_realfamily;
|
||||
|
||||
GSocketError m_error;
|
||||
};
|
||||
|
||||
/* Input / Output */
|
||||
|
||||
GSocketError _GSocket_Input_Timeout(GSocket *socket);
|
||||
GSocketError _GSocket_Output_Timeout(GSocket *socket);
|
||||
int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size);
|
||||
int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size);
|
||||
int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size);
|
||||
int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
|
||||
|
||||
/* Callbacks */
|
||||
|
||||
void _GSocket_Enable(GSocket *socket, GSocketEvent event);
|
||||
void _GSocket_Disable(GSocket *socket, GSocketEvent event);
|
||||
void _GSocket_Detected_Read(GSocket *socket);
|
||||
void _GSocket_Detected_Write(GSocket *socket);
|
||||
|
||||
void _GSocket_GUI_Init(GSocket *socket);
|
||||
void _GSocket_GUI_Destroy(GSocket *socket);
|
||||
void _GSocket_Enable_Events(GSocket *socket);
|
||||
void _GSocket_Disable_Events(GSocket *socket);
|
||||
void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event);
|
||||
void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event);
|
||||
|
||||
/* GAddress */
|
||||
|
||||
GSocketError _GAddress_translate_from(GAddress *address,
|
||||
struct sockaddr *addr, int len);
|
||||
GSocketError _GAddress_translate_to(GAddress *address,
|
||||
struct sockaddr **addr, int *len);
|
||||
|
||||
GSocketError _GAddress_Init_INET(GAddress *address);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
|
||||
|
||||
#endif /* __GSOCK_UNX_H */
|
||||
|
@@ -92,6 +92,10 @@ public:
|
||||
void SetCheckable(bool checkable) { m_bCheckable = checkable; }
|
||||
bool IsCheckable() const { return m_bCheckable; }
|
||||
|
||||
// this is for menu items only: accel string is drawn right aligned after the
|
||||
// menu item if not empty
|
||||
void SetAccelString(const wxString& strAccel) { m_strAccel = strAccel; }
|
||||
|
||||
// this function might seem strange, but if it returns FALSE it means that
|
||||
// no non-standard attribute are set, so there is no need for this control
|
||||
// to be owner-drawn. Moreover, you can force owner-drawn to FALSE if you
|
||||
@@ -125,7 +129,8 @@ public:
|
||||
virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
|
||||
|
||||
protected:
|
||||
wxString m_strName; // label for a manu item
|
||||
wxString m_strName, // label for a manu item
|
||||
m_strAccel; // the accel string ("Ctrl-F17") if any
|
||||
|
||||
private:
|
||||
static size_t ms_nDefaultMarginWidth; // menu check mark width
|
||||
|
@@ -26,10 +26,6 @@
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#if !defined(__cplusplus)
|
||||
typedef int bool;
|
||||
#endif
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#endif
|
||||
@@ -47,11 +43,11 @@ struct _GSocket
|
||||
GAddress *m_peer;
|
||||
GSocketError m_error;
|
||||
|
||||
bool m_non_blocking;
|
||||
bool m_server;
|
||||
bool m_stream;
|
||||
bool m_oriented;
|
||||
bool m_establishing;
|
||||
int m_non_blocking;
|
||||
int m_server;
|
||||
int m_stream;
|
||||
int m_oriented;
|
||||
int m_establishing;
|
||||
unsigned long m_timeout;
|
||||
|
||||
/* Callbacks */
|
||||
@@ -85,7 +81,7 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
|
||||
|
||||
/* Callbacks */
|
||||
|
||||
bool _GSocket_GUI_Init(GSocket *socket);
|
||||
int _GSocket_GUI_Init(GSocket *socket);
|
||||
void _GSocket_GUI_Destroy(GSocket *socket);
|
||||
|
||||
void _GSocket_Enable_Events(GSocket *socket);
|
||||
|
@@ -637,6 +637,13 @@ WXDLLEXPORT int wxSystem(const wxChar *psz);
|
||||
WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm);
|
||||
#endif
|
||||
|
||||
// under VC++ 6.0 isspace() returns 1 for 8 bit chars which completely breaks
|
||||
// the file parsing - this may be true for 5.0 as well, update #ifdef then
|
||||
#if defined(__VISUALC__) && (__VISUALC__ >= 1200) && !wxUSE_UNICODE
|
||||
#undef wxIsspace
|
||||
#define wxIsspace(c) ((((unsigned)c) < 128) && isspace(c))
|
||||
#endif // VC++
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// common macros which are always defined
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -17,4 +17,6 @@
|
||||
#define wxUSE_GUI 1
|
||||
#define TARGET_CARBON 1
|
||||
#define OLDP2C 1
|
||||
#define PM_USE_SESSION_APIS 0
|
||||
|
||||
#include "wx/wx_cw_cm.h"
|
||||
|
@@ -14,8 +14,10 @@
|
||||
|
||||
#pragma once on
|
||||
#define WX_PRECOMP
|
||||
#define wxUSE_GUI 1
|
||||
#define TARGET_CARBON 1
|
||||
#define OLDP2C 1
|
||||
#define wxUSE_GUI 1
|
||||
#define PM_USE_SESSION_APIS 0
|
||||
|
||||
#include "wx/wx_cw_cm.h"
|
||||
#include "wx/wxprec.h"
|
@@ -13,6 +13,7 @@
|
||||
#define wxUSE_GUI 1
|
||||
#define TARGET_CARBON 1
|
||||
#define OLDP2C 1
|
||||
#define PM_USE_SESSION_APIS 0
|
||||
|
||||
#include "wx/wx_cw_cm.h"
|
||||
#ifdef __WXMSW__
|
||||
|
@@ -15,6 +15,7 @@
|
||||
#define wxUSE_GUI 1
|
||||
#define TARGET_CARBON 1
|
||||
#define OLDP2C 1
|
||||
#define PM_USE_SESSION_APIS 0
|
||||
|
||||
#include "wx/wx_cw_cm.h"
|
||||
#ifdef WX_PRECOMP
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/calendar.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/calendar.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "CalendarVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/calendar.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/calendar.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "CalendarVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/caret.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/caret.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "CaretVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/caret.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/caret.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "CaretVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/checklst.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/checklst.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "CheckLstVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/checklst.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/checklst.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "CheckLstVC - Win32 Debug DLL"
|
||||
|
||||
|
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/conftest.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/conftest.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "ConfigVC - Win32 Debug"
|
||||
|
||||
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/conftest.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/conftest.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "ConfigVC - Win32 Debug DLL"
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user