From 3ca6a5f04692678cd2d9f3ea0843fc3f5a0b254f Mon Sep 17 00:00:00 2001 From: Bryan Petty Date: Tue, 8 Aug 2000 06:11:51 +0000 Subject: [PATCH] second merge of the 2.2 branch (RL) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- debian/control.in | 17 +- debian/rules | 28 +- debian/wxwin-i18n.dirs | 2 + debian/wxwin-i18n.docs | 2 + debian/wxwin-i18n.files | 2 + distrib/msw/expdwild.bat | 15 + distrib/msw/filerepl.bat | 27 + distrib/msw/tmake/filelist.txt | 2 +- distrib/msw/tmake/vc.t | 6 +- distrib/msw/tmake/vc6.t | 8 +- distrib/msw/tmake/vc6bdll.t | 16 +- distrib/msw/tmake/vc6dll.t | 23 +- distrib/msw/tmake/vcapp.t | 43 +- distrib/msw/vcupdate.bat | 9 + docs/gtk/changes.txt | 23 +- docs/html/news.htm | 10 + docs/html/platform.htm | 4 +- docs/latex/wx/cmdevent.tex | 20 +- docs/latex/wx/combobox.tex | 8 +- docs/latex/wx/database.tex | 9 +- docs/latex/wx/db.tex | 993 +++++++++++++++++++++++++- docs/latex/wx/gridwork.tex | 59 ++ docs/latex/wx/image.tex | 19 + docs/latex/wx/locale.tex | 60 +- docs/latex/wx/spinbutt.tex | 3 + docs/latex/wx/tconstr.tex | 13 +- docs/latex/wx/textfile.tex | 21 +- docs/latex/wx/toolbar.tex | 6 +- docs/latex/wx/upduievt.tex | 3 +- docs/tech/tn0003.txt | 9 + include/wx/db.h | 30 +- include/wx/dbtable.h | 54 +- include/wx/defs.h | 3 +- include/wx/event.h | 14 +- include/wx/intl.h | 7 +- include/wx/msw/minifram.h | 60 +- include/wx/msw/radiobox.h | 8 + include/wx/msw/setup0.h | 250 +++++-- include/wx/tbarbase.h | 10 + lib/wx22.def | 198 ++++-- locale/cs.po | 185 ++--- samples/console/console.cpp | 110 ++- samples/controls/controls.cpp | 2 +- samples/db/dbtest.cpp | 716 ++++++++++--------- samples/db/dbtest.h | 24 +- samples/db/listdb.cpp | 12 +- samples/dialogs/dialogs.cpp | 2 +- samples/drawing/drawing.cpp | 15 +- samples/help/doc.chm | Bin 13434 -> 8845 bytes samples/menu/menu.cpp | 57 +- src/common/base.rc | 49 ++ src/common/datetime.cpp | 110 +-- src/common/db.cpp | 1075 +++++++++++++++++------------ src/common/dbtable.cpp | 787 +++++++++++---------- src/common/docview.cpp | 24 +- src/common/dynlib.cpp | 1 - src/common/fontmap.cpp | 24 +- src/common/framecmn.cpp | 10 +- src/common/fs_zip.cpp | 9 +- src/common/gifdecod.cpp | 2 +- src/common/hash.cpp | 8 +- src/common/image.cpp | 10 +- src/common/imagjpeg.cpp | 15 +- src/common/imagpng.cpp | 11 +- src/common/sizer.cpp | 334 ++++----- src/common/unzip.c | 5 + src/common/utilscmn.cpp | 20 +- src/common/valgen.cpp | 149 ++-- src/generic/choicdgg.cpp | 21 +- src/generic/dcpsg.cpp | 35 +- src/generic/grid.cpp | 11 +- src/generic/listctrl.cpp | 10 +- src/gtk/combobox.cpp | 6 +- src/gtk/dcclient.cpp | 106 ++- src/gtk/menu.cpp | 22 +- src/gtk/statline.cpp | 26 +- src/gtk/textctrl.cpp | 2 + src/gtk/win_gtk.c | 7 +- src/gtk1/combobox.cpp | 6 +- src/gtk1/dcclient.cpp | 106 ++- src/gtk1/menu.cpp | 22 +- src/gtk1/statline.cpp | 26 +- src/gtk1/textctrl.cpp | 2 + src/gtk1/win_gtk.c | 7 +- src/html/htmlfilt.cpp | 2 +- src/html/htmprint.cpp | 26 +- src/msw/filedlg.cpp | 28 +- src/msw/font.cpp | 15 +- src/msw/frame.cpp | 23 +- src/msw/gsocket.c | 2 +- src/msw/imaglist.cpp | 46 +- src/msw/listctrl.cpp | 7 +- src/msw/makefile.vc | 9 +- src/msw/mdi.cpp | 38 +- src/msw/menu.cpp | 12 +- src/msw/nativdlg.cpp | 6 +- src/msw/ole/automtn.cpp | 8 +- src/msw/radiobox.cpp | 312 ++++++--- src/msw/radiobut.cpp | 1 + src/msw/settings.cpp | 1 - src/msw/version.rc | 34 +- src/msw/window.cpp | 8 +- src/msw/xpmhand.cpp | 3 +- src/xpm/RdFToI.c | 3 +- wxPython/.cvsignore | 1 + wxPython/BUILD.txt | 12 +- wxPython/CHANGES.txt | 7 + wxPython/demo/About.py | 2 +- wxPython/demo/GridSimple.py | 3 + wxPython/demo/Main.py | 1 + wxPython/demo/wxScrolledWindow.py | 2 +- wxPython/distrib/autobuild.py | 4 +- wxPython/distrib/build.py | 4 +- wxPython/distrib/wxPython.WSM | Bin 33 -> 33 bytes wxPython/distrib/wxPython.spec | 4 +- wxPython/distrib/wxPython.wse | 12 +- wxPython/src/__version__.py | 2 +- wxPython/src/clip_dnd.i | 5 +- wxPython/src/events.i | 3 +- wxPython/src/gtk/events.cpp | 13 +- wxPython/src/gtk/events.py | 3 + wxPython/src/gtk/mdi.cpp | 2 + wxPython/src/gtk/printfw.cpp | 16 +- wxPython/src/gtk/windows.cpp | 58 ++ wxPython/src/gtk/windows.py | 6 + wxPython/src/mdi.i | 3 + wxPython/src/msw/clip_dnd.cpp | 41 ++ wxPython/src/msw/clip_dnd.py | 3 + wxPython/src/msw/events.cpp | 13 +- wxPython/src/msw/events.py | 3 + wxPython/src/msw/mdi.cpp | 72 ++ wxPython/src/msw/mdi.py | 7 + wxPython/src/msw/printfw.cpp | 14 +- wxPython/src/msw/windows.cpp | 58 ++ wxPython/src/msw/windows.py | 6 + wxPython/src/printfw.i | 2 +- wxPython/src/windows.i | 2 + wxPython/wxPython/lib/pyshell.py | 10 +- 138 files changed, 4958 insertions(+), 2295 deletions(-) create mode 100644 debian/wxwin-i18n.dirs create mode 100644 debian/wxwin-i18n.docs create mode 100644 debian/wxwin-i18n.files create mode 100755 distrib/msw/expdwild.bat create mode 100755 distrib/msw/filerepl.bat create mode 100755 distrib/msw/vcupdate.bat create mode 100644 docs/latex/wx/gridwork.tex create mode 100644 src/common/base.rc diff --git a/debian/control.in b/debian/control.in index 535ce2d60e..78203579a0 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,7 +1,7 @@ Source: wxwindows=V Section: libs Priority: optional -Build-Depends: debhelper, flex, bison, libgtk1.2-dev, python-dev (>=1.5), zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, mesag-dev +Build-Depends: debhelper, flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, mesag-dev Maintainer: Ron Lee Standards-Version: 3.1.1 @@ -107,7 +107,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development) Package: libwxgtk=V-python Architecture: any Section: interpreters -Depends: libwxgtk=V (= ${Source-Version}), python-base (>=1.5), ${shlibs:Depends} +Depends: libwxgtk=V (= ${Source-Version}), python-base (>=1.5.2), ${shlibs:Depends} Suggests: wxwin=V-doc Description: wxWindows Cross-platform C++ GUI toolkit (Python binding) wxWindows is a class library for C++ providing GUI (Graphical User @@ -157,6 +157,19 @@ Description: wxWindows Cross-platform C++ GUI toolkit (header files) This package provides the common header files required to build applications using the wxWindows toolkit. +Package: wxwin=V-i18n +Architecture: all +Section: libs +Conflicts: wxwin-i18n +Replaces: wxwin-i18n +Provides: wxwin-i18n +Description: wxWindows Cross-platform C++ GUI toolkit (i18n support) + wxWindows is a class library for C++ providing GUI (Graphical User + Interface) and other facilities on more than one platform. Version =V + currently supports subsets of GTK+, Motif, and MS Windows. + . + This package provides the i18n message catalogs for wxWindows. + Package: wxwin=V-doc Architecture: all Section: doc diff --git a/debian/rules b/debian/rules index df58c43300..38ed021b45 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,7 @@ package_gtk_py=libwxgtk$(release)-python package_gtk_contrib=libwxgtk$(release)-contrib package_gtk_contrib_dev=libwxgtk$(release)-contrib-dev package_headers=wxwin$(release)-headers +package_i18n=wxwin$(release)-i18n package_doc=wxwin$(release)-doc package_examples=wxwin$(release)-examples @@ -36,6 +37,7 @@ objdir_gtk_debug=objs_gtk_d objdir_doc_cruft=objs_doc_con objdir_doc=docs/wxWindows-manual.html objdir_examples=docs/examples +objdir_i18n=locale objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \ $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \ $(objdir_doc) $(objdir_examples) @@ -44,12 +46,13 @@ build_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \ build-wxbase-debug-stamp build-gtk-shared-stamp \ build-gtk-static-stamp build-gtk-debug-stamp \ build-contrib-shared-stamp build-contrib-static-stamp \ - build-gtk-python-stamp build-examples-stamp build-doc-stamp + build-gtk-python-stamp build-examples-stamp build-doc-stamp \ + build-i18n-stamp install_all=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ install-gtk-lib install-gtk-dev install-gtk-dbg \ install-gtk-contrib install-gtk-contrib-dev install-gtk-py \ - install-headers install-doc install-examples + install-headers install-i18n install-doc install-examples wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \ --prefix=$(shell pwd) \ @@ -106,6 +109,10 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base echo "generating control file $(package_headers).$$f"; \ cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \ done; + @for f in dirs docs files; do \ + echo "generating control file $(package_i18n).$$f"; \ + cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \ + done; @for f in dirs docs doc-base; do \ echo "generating control file $(package_doc).$$f"; \ cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \ @@ -250,6 +257,12 @@ build-examples-stamp: done; touch $@ +build-i18n-stamp: build-gtk-shared-stamp + dh_testdir + cd $(objdir_i18n) \ + && $(MAKE) allmo + touch $@ + clean: debian/control dh_testdir dh_testroot @@ -266,6 +279,7 @@ clean: debian/control rm -f debian/$(package_gtk_contrib).* rm -f debian/$(package_gtk_contrib_dev).* rm -f debian/$(package_headers).* + rm -f debian/$(package_i18n).* rm -f debian/$(package_doc).* rm -f debian/$(package_examples).* @@ -375,6 +389,14 @@ install-headers: install-gtk-lib zlib.3 \ png.5 +install-i18n: DH_OPTIONS=-p$(package_i18n) +install-i18n: build-i18n-stamp install-gtk-lib + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + dh_movefiles --sourcedir=debian/$(package_gtk_lib) + install-doc: DH_OPTIONS=-p$(package_doc) install-doc: build-doc-stamp dh_testdir @@ -461,5 +483,5 @@ binary-doc: control-files-stamp install-doc binary-wxbase-dbg binary-doc install install-wxbase-lib \ install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \ install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \ - install-gtk-py install-headers install-doc install-examples + install-gtk-py install-headers install-i18n install-doc install-examples diff --git a/debian/wxwin-i18n.dirs b/debian/wxwin-i18n.dirs new file mode 100644 index 0000000000..d10fb40c7b --- /dev/null +++ b/debian/wxwin-i18n.dirs @@ -0,0 +1,2 @@ +/usr/share/locale + diff --git a/debian/wxwin-i18n.docs b/debian/wxwin-i18n.docs new file mode 100644 index 0000000000..4c4d01649e --- /dev/null +++ b/debian/wxwin-i18n.docs @@ -0,0 +1,2 @@ +docs/licence.txt + diff --git a/debian/wxwin-i18n.files b/debian/wxwin-i18n.files new file mode 100644 index 0000000000..39825b2213 --- /dev/null +++ b/debian/wxwin-i18n.files @@ -0,0 +1,2 @@ +/usr/share/locale/ + diff --git a/distrib/msw/expdwild.bat b/distrib/msw/expdwild.bat new file mode 100755 index 0000000000..34974a61d7 --- /dev/null +++ b/distrib/msw/expdwild.bat @@ -0,0 +1,15 @@ +@echo off +rem Expands wildcards in response file (arg 1) into output file (arg 2) +rem Note: requires ls.exe from GNU-WIN32 distribution, renamed to ls2.exe. +rem Correction: this is too slow, so we're using the built in 'dir'. + +set newname=%temp\temp.tmp +sed -e "s/\//\\/g" %1 > %newname + +set len=%@LINES[%newname] +rem set len=%@DEC[%len] +do i = 0 to %len by 1 + set line=%@LINE[%newname,%i] + if NOT "%line" == "" dir /FB %line >> %2 +enddo + diff --git a/distrib/msw/filerepl.bat b/distrib/msw/filerepl.bat new file mode 100755 index 0000000000..815fc0b19b --- /dev/null +++ b/distrib/msw/filerepl.bat @@ -0,0 +1,27 @@ +@echo off +Rem Replace a string with another string in the given files. +Rem The first argument is the string to be replaced. +Rem The second argument is the replacement string. +Rem The third argument is a file listing the files to be processed. + +set keyword=%1 +set repl=%2 +set files=%3 +echo s/%keyword/%repl/g > script.tmp + +call %wxwin\distrib\msw\expdwild.bat %3 list.tmp + +set len=%@LINES[%files] +do i = 0 to %len by 1 + set line=%@LINE[list.tmp,%i] + if "%line" == "**EOF**" enddo +rem echo Cmd: grep %keyword %line + grep %keyword %line > size.tmp + if "%@FILESIZE[size.tmp]" == "0" enddo + sed -f script.tmp %line > file.tmp + move file.tmp %line +enddo +erase script.tmp +erase list.tmp +erase size.tmp +:end diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 87814a64d9..d21c284737 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -96,7 +96,7 @@ splash.cpp G splitter.cpp G statline.cpp G U,R,P statusbr.cpp G -tabg.cpp G P +tabg.cpp G 16,P numdlgg.cpp G tbarsmpl.cpp G textdlgg.cpp G diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 4422ad0267..58026c0d84 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -79,9 +79,6 @@ LIBTARGET=$(WXLIB) DUMMYOBJ=$D\dummy.obj !endif -# Please set these according to the settings in setup.h, so we can include -# the appropriate libraries in wx.lib - # This one overrides the others, to be consistent with the settings in setup.h MINIMAL_WXWINDOWS_SETUP=0 @@ -89,6 +86,9 @@ PERIPH_LIBS= PERIPH_TARGET= PERIPH_CLEAN_TARGET= +# Set to 0 if not using GLCanvas (only affects DLL build) +USE_GLCANVAS=1 + # These are absolute paths, so that the compiler # generates correct __FILE__ symbols for debugging. # Otherwise you don't be able to double-click on a memory diff --git a/distrib/msw/tmake/vc6.t b/distrib/msw/tmake/vc6.t index 665f35329a..9359c9e654 100644 --- a/distrib/msw/tmake/vc6.t +++ b/distrib/msw/tmake/vc6.t @@ -80,8 +80,8 @@ RSC=rc.exe # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c -# ADD CPP /nologo /MT /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=1 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c +# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "NDEBUG" /D wxUSE_GUI=1 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -103,8 +103,8 @@ LIB32=link.exe -lib # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" -D "_MT" /YX /FD /c -# ADD CPP /nologo /MTd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /Fr /D "_MT" /Yu"wx/wxprec.h" /FD /c +# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" -D "_MT" /YX /FD /c +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /Fr /D "_MT" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe diff --git a/distrib/msw/tmake/vc6bdll.t b/distrib/msw/tmake/vc6bdll.t index 8ed6d304af..ef85135667 100644 --- a/distrib/msw/tmake/vc6bdll.t +++ b/distrib/msw/tmake/vc6bdll.t @@ -85,8 +85,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 /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /machine:I386 +# 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 /dll /machine:I386 /out:"BaseDllRelease/wxbase221.dll" +# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /machine:I386 /out:"BaseDllRelease/wxbase221.dll" !ELSEIF "$(CFG)" == "wxBaseDll - Win32 Debug" @@ -101,8 +101,8 @@ LINK32=link.exe # PROP Intermediate_Dir "BaseDllDebug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /ZI /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /D "__WXDEBUG__" /Yu"wx/wxprec.h" /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /D "__WXDEBUG__" /Yu"wx/wxprec.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -111,8 +111,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 /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept +# 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 /dll /debug /machine:I386 /pdbtype:sept /out:"BaseDllDebug/wxbase221d.dll" +# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"BaseDllDebug/wxbase221d.dll" !ENDIF @@ -122,6 +122,10 @@ LINK32=link.exe # Name "wxBaseDll - Win32 Debug" # Begin Source File +SOURCE=.\src\common\base.rc +# End Source File +# Begin Source File + SOURCE=.\src\msw\dummydll.cpp # ADD CPP /Yc"wx/wxprec.h" # End Source File diff --git a/distrib/msw/tmake/vc6dll.t b/distrib/msw/tmake/vc6dll.t index 19bf5b936a..133cdbc56b 100644 --- a/distrib/msw/tmake/vc6dll.t +++ b/distrib/msw/tmake/vc6dll.t @@ -83,17 +83,17 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /GX /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /GX /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "NDEBUG" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "$(wx)\include" /d "NDEBUG" 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\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 -# 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 winmm.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 +# 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" !ELSEIF "$(CFG)" == "wxWinDll - Win32 Debug" @@ -108,18 +108,18 @@ LINK32=link.exe # PROP Intermediate_Dir "DebugDLL" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /ZI /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "$(wx)\include" /d "_DEBUG" 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\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /dll /debug /machine:I386 /pdbtype:sept -# 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\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# 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" !ENDIF @@ -144,10 +144,15 @@ SOURCE=.\src\msw\dummydll.cpp # Begin Source File +SOURCE=.\src\msw\version.rc +# End Source File +# Begin Source File + SOURCE=.\src\common\y_tab.c !IF "$(CFG)" == "wxWinDll - Win32 Release" +# ADD CPP /W1 # SUBTRACT CPP /YX /Yc /Yu !ELSEIF "$(CFG)" == "wxWinDll - Win32 Debug" diff --git a/distrib/msw/tmake/vcapp.t b/distrib/msw/tmake/vcapp.t index afc6a86cea..2a0d20746c 100644 --- a/distrib/msw/tmake/vcapp.t +++ b/distrib/msw/tmake/vcapp.t @@ -30,20 +30,26 @@ if ( Config("wx") ) { #! VC 6.0 supports env vars in include path #! $WXDIR = $ENV{'WX'}; - $WXDIR = "\$(WX)"; + if ( $ENV{'wx'} ) { $WXDIR = "\$(wx)"; } + else { $WXDIR = "\$(WXWIN)"; } $TMAKE_INCDIR_WX = $WXDIR . "\\include"; AddIncludePath($TMAKE_INCDIR_WX); } if ( Config("dll") ) { $DLL="Dll"; - $DLL_OR_LIB="wxWinDll"; + $DLL_SUFFIX="d"; + $DLL_OR_LIB=(Config("wxbase") ? "wxbase" : "wxmsw") . "221"; $DLL_FLAGS="/D WXUSINGDLL "; + $EXTRA_LIBS=""; } else { $DLL=""; + $DLL_SUFFIX=""; $DLL_OR_LIB="wxWindows"; $DLL_FLAGS=" "; + #! actually this depends on the contents of setup.h + $EXTRA_LIBS=Config("wxbase") ? "" : "xpm zlib png jpeg tiff"; } #! let's be smarter: first of all, if no extension is given, add .lib @@ -64,12 +70,21 @@ if ( Config("wx") ) { $vc_base_libs .= "comctl32.lib rpcrt4.lib wsock32.lib "; - $vc_link_release = "$WXDIR\\Release$DLL\\$DLL_OR_LIB.lib $WXDIR\\src\\xpm\\Release\\xpm.lib "; - $vc_link_debug = "$WXDIR\\Debug$DLL\\$DLL_OR_LIB.lib $WXDIR\\src\\xpm\\Debug\\xpm.lib "; + $vc_link_release = "$WXDIR\\Release$DLL\\$DLL_OR_LIB.lib "; + $vc_link_debug = "$WXDIR\\Debug$DLL\\$DLL_OR_LIB$DLL_SUFFIX.lib "; + foreach ( split(/ /, $EXTRA_LIBS) ) { + $vc_link_release .= "$WXDIR\\src\\$_\\Release\\$_.lib "; + $vc_link_debug .= "$WXDIR\\src\\$_\\Debug\\$_.lib "; + } } $vc_link_release .= '/nologo /subsystem:windows /machine:I386'; $vc_link_debug .= '/nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept'; + foreach ( split(/ /, Project('LIBPATH')) ) { + $vc_link_release .= " /libpath:$_\\Release"; + $vc_link_debug .= " /libpath:$_\\Debug"; + } + $vc_cpp_def_common = '/D "WIN32" /D "_WINDOWS" ' . $DLL_FLAGS; $vc_cpp_def_release = '/D "NDEBUG" ' . $vc_cpp_def_common; $vc_cpp_def_debug = '/D "_DEBUG" ' . $vc_cpp_def_common; @@ -79,8 +94,8 @@ $vc_base_libs = 'kernel32.lib user32.lib advapi32.lib '; if ( Config("wx") ) { $vc_base_libs .= 'wsock32.lib '; - $vc_link_release = "$WXDIR\\Base${DLL}Release\\wxBase$DLL.lib "; - $vc_link_debug = "$WXDIR\\Base${DLL}Debug\\wxBase$DLL.lib "; + $vc_link_release = "$WXDIR\\Base${DLL}Release\\$DLL_OR_LIB.lib "; + $vc_link_debug = "$WXDIR\\Base${DLL}Debug\\$DLL_OR_LIB" . "d.lib "; } $vc_link_release .= '/nologo /subsystem:console /machine:I386'; $vc_link_debug .= '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept'; @@ -205,13 +220,13 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Output_Dir "Release#$ $text = "$DLL" . '"' +# PROP BASE Intermediate_Dir "Release#$ $text = "$DLL" . '"' # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "Release#$ $text = "$DLL" . '"' +# PROP Intermediate_Dir "Release#$ $text = "$DLL" . '"' #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); # PROP Target_Dir "" # ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE"); @@ -233,13 +248,13 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Output_Dir "Debug#$ $text = "$DLL" . '"' +# PROP BASE Intermediate_Dir "Debug#$ $text = "$DLL" . '"' # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "Debug#$ $text = "$DLL" . '"' +# PROP Intermediate_Dir "Debug#$ $text = "$DLL" . '"' #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); # PROP Target_Dir "" # ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG"); diff --git a/distrib/msw/vcupdate.bat b/distrib/msw/vcupdate.bat new file mode 100755 index 0000000000..399a6d73ee --- /dev/null +++ b/distrib/msw/vcupdate.bat @@ -0,0 +1,9 @@ +@echo off +Rem Replace the DLL version number in the VC++ project files + +input Enter the old version name (e.g. wx22_0): %%oldName +input Enter the new version name (e.g. wx22_1): %%newName + +call %wxwin\distrib\msw\filerepl.bat %oldName %newName %wxwin\distrib\msw\vc.rsp +echo Done. + diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt index ce290c2c1f..fe1eb4f1fb 100644 --- a/docs/gtk/changes.txt +++ b/docs/gtk/changes.txt @@ -1,4 +1,25 @@ -10th July 2000: wxWindows 2.2 released + +22nd July 2000: wxWindows 2.2.1 released + +Minor build fixes. + +Corrected guffow-scrolling so that no surplus expose +events are generated. + +Corrected bug in wxMask creation on 16-bit displays. + +Minor correction to wxDC::DrawRoundedRectangle. + +Added support for and menu accelerators. + +Use the wxCommmandEvent::IsChecked() function for checkable +menu items. + +Made wxComboBox case-sensitive. + +Minor correction to doc-view architecture. + +10th July 2000: wxWindows 2.2.0 released Added code for writing BMP images. diff --git a/docs/html/news.htm b/docs/html/news.htm index 0ac1d66ea8..538e5b4e37 100644 --- a/docs/html/news.htm +++ b/docs/html/news.htm @@ -18,6 +18,16 @@ News +

July 28th, 2000

+ +

    +
  • Vaclav Slavik has recently written an +article about wxWindows for a Czech ezine. +
  • Hurray! There is a lot of traffic on the wxStudio mailing list, and +Gerd Mueller has offered to make the WipeOut IDE +open source and merge it with wxStudio. +
+

July 9th, 2000