diff --git a/distrib/msw/wisetop.txt b/distrib/msw/wisetop.txt
index 81da20b1da..07c0b9a517 100644
--- a/distrib/msw/wisetop.txt
+++ b/distrib/msw/wisetop.txt
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=5.0
-  Title=wxWindows 2.1.16 Installation
+  Title=wxWindows 2.2.0 Installation
   Flags=00000100
   Split=1420
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -47,7 +47,7 @@ item: End Block
 end
 item: Set Variable
   Variable=APPTITLE
-  Value=wxWindows 2.1.16
+  Value=wxWindows 2.2.0
 end
 item: Set Variable
   Variable=GROUP
diff --git a/docs/changes.txt b/docs/changes.txt
index 3af4b746b9..3af65ba2e0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,6 +1,83 @@
 wxWindows 2 Change Log
 ----------------------
 
+2.2.0
+-----
+
+wxBase:
+
+- Fixed bug with directories with trailing (back)slashes in wxPathExists
+- wxString: added wxArrayString::operator==() and !=()
+- Fixes for wxCmdLineParser
+- Added wxGetLocalTimeMillis
+- Completed Czech translations
+- Some stream corrections
+- added missing consts to wxPoint operators
+- wxDateTime ParseFormat fixes
+- wxFile::Open(write_append) will create file if it doesn't exist
+- small fixes to MIME mailcap test command handling, more MIME tests in the sample
+
+All (GUI):
+
+- wxGenericDragImage now allows virtual image drawing, and
+  flicker-free dragging is now possible
+- Added wxPrinter::GetLastError
+- Fixed wxLogGui reentrancy problem
+- Paper names now translated
+- wxGrid fixes
+- Generic validator now caters for more cases (integers in
+  wxTextCtrl, strings in wxChoice, wxComboBox)
+- Fixed crash when docview On... functions return FALSE. Show
+  error message when an non-existent filename is typed into the Open
+  File dialog.
+- Corrected Baltic font encoding handling
+- wxImage: enhanced TIFF code, added new platform-independent BMP
+  writing code
+- wxKeyEvent::GetKeyCode() and HasModifiers() added and documented
+- Fixed wxPropertyForm crashes in sample
+- wxWizard now calls TransferDataFromWindow() before calling
+  wxWizardPage::GetNext() fixing an obvious bug
+
+wxMSW:
+
+- wxWindow::GetCharWidth/Height now calculated accurately.
+  This will affect all .wxr dialog resources, so for
+  backward compatibility, please set
+  wxDIALOG_UNIT_COMPATIBILITY to 1 in setup.h
+- wxListCtrl: set item text in LIST_ITEM_ACTIVATED events
+- wxTextCtrl: implemented setting colours for rich edit controls
+- wxColour now accepts both grey and gray
+- BC++ DLL compilation fixed
+- Watcom C++ makefiles improved for JPEG and TIFF compilation
+- Fixed submenu accelerator bug
+- Fixed dialog focus bug (crash if the previous window to have
+  the focus was destroyed before the dialog closed)
+- Too-small default wxTextCtrl height fixed
+- fixed "missing" initial resize of wxMDIChildFrame
+- wxFrame restores focus better
+- Now ignore wxTHICK_FRAME in wxWindow constructor: only relevant to
+  frames anddialogs, interferes with other window styles otherwise
+  (sometimes you'd get a thick frame in a subwindow)
+- wxTextCtrl insertion point set to the beginning of the control by SetValue
+- Fix so wxMDIParentFrame is actually shown when Show(TRUE) is called.
+- wxFileDialog: adjusts struct size if there's an error (struct
+  sizes can be different on different versions of Windows)
+- wxImageList::GetSize() documented and added to wxMSW
+- fixed default dialog style to make them non resizeable again
+- fixed wxFrame::IsShown() which always returned TRUE before
+
+wxGTK:
+
+- Please see docs/gtk/changes.txt.
+
+wxMotif:
+
+- Small compilation fixes
+
+Documentation:
+
+- wxCaret documented
+
 2.1.16
 ------
 
diff --git a/docs/html/news.htm b/docs/html/news.htm
index 515685d396..0ac1d66ea8 100644
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -18,6 +18,13 @@ News
 </tr>
 </table>
 
+<H3><a name="release2_2_0">July 9th, 2000</H3><P>
+
+<ul>
+<li><a href="download.htm" target=wxmain>wxWindows 2.2.0</a> is the result of many
+fixes and enhancements to 2.1, and is an official stable release.
+</ul>
+
 <H3><a name="release2_1_16">June 4th, 2000</H3><P>
 
 <ul>
diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index b141ee69ae..18099a48a4 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -31,7 +31,7 @@
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
-\date{June 10th 2000}
+\date{July 9th 2000}
 }
 \makeindex
 \begin{document}
diff --git a/docs/readme.txt b/docs/readme.txt
index 0c1481e51c..0b0acafcc5 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,5 +1,5 @@
-wxWindows 2.1.16
-----------------
+wxWindows 2.2.0
+---------------
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
 framework for writing advanced GUI applications using (where
@@ -12,7 +12,7 @@ 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 1100-page reference manual is supplied in HTML, PDF and
+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
@@ -23,16 +23,6 @@ Changes in this release
 
 Please see changes.txt for details.
 
-Note that there is a new contrib hierarchy for contributions,
-which mirrors the regular wxWindows hierarchy. The Object
-Graphics Library and MMedia library have been moved under
-contrib, so you may need to change your makefiles or project
-files, together with your source files. E.g. change #include "ogl.h"
-to #include <wx/ogl/ogl>.
-
-Also VC++ project files and makefiles have been made more
-consistent, so some paths and library names have changed.
-
 Platforms supported
 -------------------
 
@@ -46,6 +36,7 @@ wxWindows 2 currently supports the following platforms:
 
 Most popular C++ compilers are supported; see the install.txt
 file for each platform (available via docs/html/index.htm) for details.
+See also http://www.lpthe.jussieu.fr/~zeitlin/wxWindows/platform.html.
 
 Files
 -----
@@ -215,5 +206,5 @@ web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
 
 Good luck!
 
-The wxWindows Team, 4th June, 2000
+The wxWindows Team, 9th July, 2000
 
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index fa8bd303d8..43b63db14f 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -803,6 +803,10 @@
 
 #undef wxUSE_MS_HTML_HELP
 #define wxUSE_MS_HTML_HELP 0
+
+#undef wxUSE_WCHAR_T
+#define wxUSE_WCHAR_T 0
+
 #endif // Win16
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 15872c1912..fe2909b43f 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -548,6 +548,18 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
     return FALSE;
 }
 
+#if wxUSE_GUI
+class ReentrancyBlocker
+{
+public:
+    ReentrancyBlocker(bool& b) : m_b(b) { m_b = TRUE; }
+    ~ReentrancyBlocker() { m_b = FALSE; }
+
+private:
+    bool& m_b;
+};
+#endif
+
 bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                                      wxNativeEncodingInfo *info,
                                      const wxString& facename,
@@ -568,15 +580,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     if ( interactive && s_inGetAltForEncoding )
         return FALSE;
 
-    class ReentrancyBlocker
-    {
-    public:
-        ReentrancyBlocker(bool& b) : m_b(b) { m_b = TRUE; }
-       ~ReentrancyBlocker() { m_b = FALSE; }
-
-    private:
-       bool& m_b;
-    } blocker(s_inGetAltForEncoding);
+    ReentrancyBlocker blocker(s_inGetAltForEncoding);
 #endif // wxUSE_GUI
 
     wxCHECK_MSG( info, FALSE, wxT("bad pointer in GetAltForEncoding") );
diff --git a/src/makeb32.env b/src/makeb32.env
index a9a4114bfa..28da42ee5f 100644
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -43,7 +43,7 @@ DLL=0
 
 !if "$(WXMAKINGDLL)" == "1"
 DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
-WXLIB= $(WXLIBDIR)\wx200.lib
+WXLIB= $(WXLIBDIR)\wx220.lib
 
 !else
 
@@ -51,7 +51,7 @@ LINK_FLAGS= /aa /c
 
 !if "$(WXUSINGDLL)" == "1"
 DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
-WXLIB= $(WXLIBDIR)\wx200.lib
+WXLIB= $(WXLIBDIR)\wx220.lib
 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib
diff --git a/src/makeg95.env b/src/makeg95.env
index 3d091c3035..72f8ce0e0b 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -18,7 +18,7 @@ MINGW32=1
 MINGW32VERSION=2.95
 
 # If building DLL, the version
-WXVERSION=21_16
+WXVERSION=22_0
 
 # Say yes if you have a "modern" linker that supports --shared option.
 # Note that you're probably going to wait forever for dlltool/gcc/etc
diff --git a/src/makevc.env b/src/makevc.env
index d0531d9e81..189d215d2e 100644
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,7 +8,7 @@
 #
 !include <ntwin32.mak>
 
-WXVERSION=21_16
+WXVERSION=22_0
 WIN95=1
 
 !if "$(WIN95)" == "0"
diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index ffa1f75955..c81dfcdf52 100644
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -328,6 +328,7 @@ int wxFileDialog::ShowModal()
 
     DWORD errCode = CommDlgExtendedError();
 
+#ifdef __WIN32__
     if (!success && (errCode == CDERR_STRUCTSIZE))
     {
         // The struct size has changed so try a smaller or bigger size
@@ -345,6 +346,7 @@ int wxFileDialog::ShowModal()
                                             : (GetOpenFileName(&of) != 0);
         }
     }
+#endif
 
     if ( success )
     {
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 40f3d05537..635b50885c 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1097,11 +1097,14 @@ void wxWindow::DoGetSize(int *x, int *y) const
 {
     HWND hWnd = GetHwnd();
     RECT rect;
+#ifdef __WIN16__
+    ::GetWindowRect(hWnd, &rect);
+#else
     if ( !::GetWindowRect(hWnd, &rect) )
     {
         wxLogLastError(_T("GetWindowRect"));
     }
-
+#endif
     if ( x )
         *x = rect.right - rect.left;
     if ( y )
@@ -3060,10 +3063,14 @@ bool wxWindow::HandleGetMinMaxInfo(void *mmInfo)
 void wxWindow::SendSizeEvent()
 {
     RECT r;
+#ifdef __WIN16__
+    ::GetWindowRect(GetHwnd(), &r);
+#else
     if ( !::GetWindowRect(GetHwnd(), &r) )
     {
         wxLogLastError(_T("GetWindowRect"));
     }
+#endif
 
     (void)::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED,
                         MAKELPARAM(r.right - r.left, r.bottom - r.top));