Changes for Watcom; updates to readme.txt and changes.txt

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/changes.txt

@@ -1,6 +1,60 @@
 wxWindows 2 Change Log
 ----------------------
 
+2.2.1
+-----
+
+wxBase:
+
+- Fixed logic bug in wxDateTime::ParseDate.
+- wxDB: replaced German variable names with English.
+- wxDbGetConnection() did not check for the correct scrolling
+  of cursors when re-using a cached database connection.
+    
+All (GUI):
+
+- Corrected uninitialized variable in wxDocument constructor.
+- DocView now finds more appropriate parent frame for dialogs.
+- Filter index checked, then path to find correct doc template.
+- Unicode compile fixes.
+- Generic list control column sizing bug fixed.
+- Corrected wxComboBox validation behaviour.
+- Added EVT_UPDATE_UI_RANGE macro.
+- Some DB sample problems corrected.
+- wxGrid fixes.
+- Fixed low resolution problem with wxPostScriptDC.
+
+wxMSW:
+
+- Removed delayed loading for winmm in VC++ makefile (problems
+  reported); USE_GLCANVAS now a variable in makefile.vc.
+- Comments added to setup.h.
+- wxCommandEvent::IsChecked now works for menu items.
+- wxDEFAULT font size handled properly.
+- Mods for Cygwin 1.1.
+- Updated VC++ project and makefiles for consistency. DLL now
+  has version number in name.
+- Added insertion point functions implementation for wxComboBox.
+- Handle wxNO_FULL_REPAINT_ON_RESIZE for MDI children.
+- Fixed problem with iconizing miniframes.
+- Fixed bug with radiobox size being miscalculated if the label was
+  too long.
+- The MSW radiobutton now informs about its state in the event (m_int)
+  as wxGTK did.
+
+wxGTK:
+
+- Please see docs/gtk/changes.txt.
+
+wxMotif:
+
+- Small compilation fixes
+
+Documentation:
+
+- Added preliminary wxGrid documentation.
+- Added notes for Cygwin 1.1 to MSW install.txt.
+
 2.2.0
 -----
 

docs/latex/wx/wx.hpj

@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=d:\wx2\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxWind~1\docs\latex\wx ; Assume that bitmaps are where the source is
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH

docs/msw/install.txt

@@ -398,9 +398,11 @@ Watcom C++ 10.6/11 compilation
 
 1. Make sure your WXWIN variable is set, and uses the DOS short
    name form.
-2. Change directory to wx\src\msw. Type 'wmake -f makefile.wat' to
+2. Change directory to wx\src\msw. Type
+   'wmake -f makefile.wat all' to
    make the wxWindows core library.
-3. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat'
+3. Change directory to wx\samples\minimal and type
+   'wmake -f makefile.wat all'
    to make this sample. Repeat for other samples of interest.
 
 Note (1): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom

docs/readme.txt

@@ -1,4 +1,4 @@
-wxWindows 2.2.0
+wxWindows 2.2.1
 ---------------
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
@@ -206,5 +206,5 @@ web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
 
 Good luck!
 
-The wxWindows Team, 9th July, 2000
+The wxWindows Team, 13th August, 2000
 

src/msw/printwin.cpp

@@ -89,7 +89,7 @@ wxWindowsPrinter::~wxWindowsPrinter()
 {
     // avoids mingw warning about statement with no effect (FreeProcInstance
     // doesn't do anything under Win32)
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__WATCOMC__)
     FreeProcInstance((FARPROC) m_lpAbortProc);
 #endif
 }

src/wxvc_dll.dsp

@@ -53,7 +53,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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx22_0.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx22_1.dll"
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -79,7 +79,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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx22_0d.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx22_1d.dll" /pdbtype:sept
 
 !ENDIF 
 

src/zlib/makefile.wat

@@ -25,9 +25,9 @@ LIBTARGET=..\..\lib\zlib.lib
 OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) 
 OBJ2=trees$(O) zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) 
 OBJ3=infutil$(O) inffast$(O)
-OBJP1=adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)
+OBJP1=adler32$(O) +compress$(O) +crc32$(O) +gzio$(O) +uncompr$(O) +deflate$(O)
-OBJP2=trees$(O)+zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)
+OBJP2=trees$(O) +zutil$(O) +inflate$(O) +infblock$(O) +inftrees$(O) +infcodes$(O)
-OBJP3=infutil$(O)+inffast$(O)
+OBJP3=infutil$(O) +inffast$(O)
 
 # all: test
 

src/zlib/zutil.h

@@ -73,7 +73,15 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 
         /* target dependencies */
 
-#ifdef MSDOS
+#ifdef OS2
+#  define OS_CODE  0x06
+#endif
+
+#ifdef WIN32 /* Window 95 & Windows NT */
+#  define OS_CODE  0x0b
+#endif
+
+#if defined(MSDOS) && !defined(OS_CODE)
 #  define OS_CODE  0x00
 #  ifdef __TURBOC__
 #    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
@@ -88,14 +96,6 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#ifdef OS2
-#  define OS_CODE  0x06
-#endif
-
-#ifdef WIN32 /* Window 95 & Windows NT */
-#  define OS_CODE  0x0b
-#endif
-
 #if defined(VAXC) || defined(VMS)
 #  define OS_CODE  0x02
 #  define F_OPEN(name, mode) \