diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 69f8de0516..e970aa0771 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -236,6 +236,8 @@ samples/sockets/client.b32
 samples/sockets/server.b32
 samples/sockets/client.bcc
 samples/sockets/server.bcc
+samples/sockets/client.g95
+samples/sockets/server.g95
 samples/sockets/*.xbm
 samples/sockets/*.xpm
 samples/sockets/*.ico
@@ -670,6 +672,8 @@ samples/ipc/client.bcc
 samples/ipc/server.bcc
 samples/ipc/client.dos
 samples/ipc/server.dos
+samples/ipc/client.g95
+samples/ipc/server.g95
 samples/ipc/*.rc
 samples/ipc/*.def
 samples/ipc/*.bmp
diff --git a/distrib/msw/patch.rsp b/distrib/msw/patch.rsp
index bc2643ce0b..30718cb8f3 100644
--- a/distrib/msw/patch.rsp
+++ b/distrib/msw/patch.rsp
@@ -1,4 +1,21 @@
 include/wx/datetime.inl
+include/wx/sckipc.h
+include/wx/ipcbase.h
+include/wx/gtk/pen.h
+include/wx/defs.h
 src/msw/treectrl.cpp
+src/common/sckipc.cpp
+src/common/intl.cpp
+src/generic/scrolwin.cpp
+src/gtk/settings.cpp
 samples/treectrl/TreectrlVC.dsp
+samples/sockets/client.g95
+samples/sockets/server.g95
+samples/ipc/client.g95
+samples/ipc/server.g95
+
+src/xpm/makefile.b32
+configure
+configure.in
+docs/msw/install.txt
 
diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 97f19d896b..1c572ed897 100644
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -457,7 +457,7 @@ rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:	wxhtml
-wxhtml:	$(DOCDIR)\html\wx\wx.htm
+wxhtml:	$(DOCDIR)\html\wx\wx.htm htb
 htmlhelp: $(DOCDIR)\html\wx\wx.chm
 ps:     wxps referencps
 wxps:	$(WXDIR)\docs\ps\wx.ps
@@ -621,7 +621,8 @@ htb:
 	cd $(WXDIR)\docs\html\wx
     -erase /Y wx.zip wx.htb
     zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk
-    ren wx.zip wx.htb
+    -mkdir $(DOCDIR)\html\htb
+    move wx.zip $(DOCDIR)\html\htb\wx.htb
     cd $(THISDIR)
 
 # In order to force document reprocessing
diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 846fd6f117..8cb7038b8f 100755
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -22,6 +22,7 @@ echo CTRL-C if this is not correct.
 pause
 
 erase %dest\wx*.zip
+erase %dest\*.htb
 erase %dest\ogl3.zip
 erase %dest\tex2rtf2.zip
 erase %dest\jpeg.zip
@@ -51,6 +52,7 @@ zip32 -@ %dest\wx%version%_hlp.zip < %src\distrib\msw\wx_hlp.rsp
 zip32 -@ %dest\wx%version%_htm.zip < %src\distrib\msw\wx_html.rsp
 zip32 -@ %dest\wx%version%_pdf.zip < %src\distrib\msw\wx_pdf.rsp
 zip32 -@ %dest\wx%version%_wrd.zip < %src\distrib\msw\wx_word.rsp
+zip32 -@ %dest\wx%version%_htb.zip < %src\distrib\msw\wx_htb.rsp
 
 Rem PDF/HTML docs that should go into the Windows setup because
 Rem there are no WinHelp equivalents
diff --git a/docs/changes.txt b/docs/changes.txt
index 2409dab2be..750092303f 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -50,7 +50,7 @@ all (GUI):
   MIME types if available (Unix only)
 - wxDC::DrawRotatedText() (based on contribution by Hans-Joachim Baader)
 - TIFF support added (libtiff required and included in the distribution)
-- PCX files can now be written (24 bit only so far)
+- PCX files can now be written (256 and 24 bits)
 - validators may work recursively if wxWS_EX_VALIDATE_RECURSIVELY is set
 - wxScrolledWindow now has keyboard interface
 - wxTextEntryDialog may be used for entering passwords (supports wxTE_PASSWORD)
diff --git a/docs/html/roadmap.htm b/docs/html/roadmap.htm
index 8462fa7c50..c066c92475 100644
--- a/docs/html/roadmap.htm
+++ b/docs/html/roadmap.htm
@@ -59,7 +59,7 @@ available at dates convenient to the developers.<P>
 
 <H4>Release 2.1.14</H4>
 
-Release date: March 12, 2000<P>
+Release date: March 21st, 2000<P>
 
 This will be the final beta release before the final 2.2 release. It will be
 synchronized for as many platforms as possible (at least Windows and GTK,
@@ -94,8 +94,8 @@ This is the next stable version of wxWindows. No new features since
 
 <ul>
 <li>bugs found during 2.1.14 will be fixed.
-<li>translations of text strings used in wxWindows
-<li>documentation updated to include all new classes
+<li>translations of text strings used in wxWindows.
+<li>documentation updated to include all new classes.
 </ul>
 
 <P>
diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index ba5403b81d..f513a29563 100644
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -23,7 +23,10 @@
 #include "wx/font.h"        // for wxFont and wxFontEncoding
 #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 
+#if wxUSE_CONFIG
 class WXDLLEXPORT wxConfigBase;
+#endif
+
 class WXDLLEXPORT wxWindow;
 
 // ----------------------------------------------------------------------------
@@ -102,6 +105,7 @@ public:
     // GetDefaultConfigPath()
     // ----------------------------------------------------------------------
 
+#if wxUSE_CONFIG
     // set the config object to use (may be NULL to use default)
     void SetConfig(wxConfigBase *config) { m_config = config; }
 
@@ -110,8 +114,11 @@ public:
 
     // return default config path
     static const wxChar *GetDefaultConfigPath();
+#endif
 
 protected:
+
+#if wxUSE_CONFIG
     // get the config object we're using - if it wasn't set explicitly, this
     // function will use wxConfig::Get() to get the global one
     wxConfigBase *GetConfig();
@@ -119,6 +126,7 @@ protected:
     // gets the root path for our settings - if itwasn't set explicitly, use
     // GetDefaultConfigPath()
     const wxString& GetConfigPath();
+#endif
 
     // change to the given (relative) path in the config, return TRUE if ok
     // (then GetConfig() will return something !NULL), FALSE if no config
@@ -142,8 +150,11 @@ protected:
                          wxFontEncoding encReplacement,
                          wxNativeEncodingInfo *info);
 
+#if wxUSE_CONFIG
     // config object and path (in it) to use
     wxConfigBase *m_config;
+#endif
+
     wxString  m_configRootPath;
 
     // the title for our dialogs
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index d2b150d449..d6219e5262 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -631,6 +631,11 @@
 #define wxUSE_NATIVE_STATUSBAR 0
 #endif
 
+#if !wxUSE_OWNER_DRAWN
+#undef wxUSE_CHECKLISTBOX
+#define wxUSE_CHECKLISTBOX 0
+#endif
+
 // Salford C++ doesn't like some of the memory operator definitions
 #ifdef __SALFORDC__
 #undef  wxUSE_MEMORY_TRACING
diff --git a/include/wx/process.h b/include/wx/process.h
index f88b6a85c7..55dc613e5d 100644
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -19,7 +19,10 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/event.h"
+
+#if wxUSE_STREAMS
 #include "wx/stream.h"
+#endif
 
 // Process Event handling
 class WXDLLEXPORT wxProcessEvent : public wxEvent
@@ -72,20 +75,24 @@ public:
     // before the process it started terminates
     void Detach();
 
+#if wxUSE_STREAMS
     // Pipe handling
     wxInputStream *GetInputStream() const { return m_inputStream; }
     wxOutputStream *GetOutputStream() const { return m_outputStream; }
 
     // implementation only (for wxExecute)
     void SetPipeStreams(wxInputStream *inStream, wxOutputStream *outStream);
+#endif
 
 protected:
     void Init(wxEvtHandler *parent, int id, bool redirect);
 
     int m_id;
 
+#if wxUSE_STREAMS
     wxInputStream  *m_inputStream;
     wxOutputStream *m_outputStream;
+#endif
 
     bool m_redirect;
 };
diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 61538ec230..888c6ce5c1 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -35,8 +35,11 @@
 #endif // PCH
 
 #include "wx/fontmap.h"
+
+#if wxUSE_CONFIG
 #include "wx/config.h"
 #include "wx/memconf.h"
+#endif
 
 #include "wx/msgdlg.h"
 #include "wx/fontdlg.h"
@@ -188,7 +191,10 @@ private:
 
 wxFontMapper::wxFontMapper()
 {
+#if wxUSE_CONFIG
     m_config = NULL;
+#endif
+
     m_windowParent = NULL;
 }
 
@@ -200,6 +206,8 @@ wxFontMapper::~wxFontMapper()
 // customisation
 // ----------------------------------------------------------------------------
 
+#if wxUSE_CONFIG
+
 /* static */ const wxChar *wxFontMapper::GetDefaultConfigPath()
 {
     return FONTMAPPER_ROOT_PATH;
@@ -213,7 +221,6 @@ void wxFontMapper::SetConfigPath(const wxString& prefix)
     m_configRootPath = prefix;
 }
 
-
 // ----------------------------------------------------------------------------
 // get config object and path for it
 // ----------------------------------------------------------------------------
@@ -250,9 +257,11 @@ const wxString& wxFontMapper::GetConfigPath()
 
     return m_configRootPath;
 }
+#endif
 
 bool wxFontMapper::ChangePath(const wxString& pathNew, wxString *pathOld)
 {
+#if wxUSE_CONFIG
     wxConfigBase *config = GetConfig();
     if ( !config )
         return FALSE;
@@ -273,11 +282,17 @@ bool wxFontMapper::ChangePath(const wxString& pathNew, wxString *pathOld)
     config->SetPath(path);
 
     return TRUE;
+#else
+    return FALSE;
+#endif
 }
 
 void wxFontMapper::RestorePath(const wxString& pathOld)
 {
+#if wxUSE_CONFIG
     GetConfig()->SetPath(pathOld);
+#else
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -338,6 +353,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
     // we're going to modify it, make a copy
     wxString cs = charset;
 
+#if wxUSE_CONFIG
     // first try the user-defined settings
     wxString pathOld;
     if ( ChangePath(FONTMAPPER_CHARSET_PATH, &pathOld) )
@@ -375,6 +391,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
 
         RestorePath(pathOld);
     }
+#endif
 
     // if didn't find it there, try to reckognise it ourselves
     if ( encoding == wxFONTENCODING_SYSTEM )
@@ -473,7 +490,8 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
         {
             encoding = gs_encodings[n];
 
-            // save the result in the config now
+#if wxUSE_CONFIG
+        // save the result in the config now
             if ( ChangePath(FONTMAPPER_CHARSET_PATH, &pathOld) )
             {
                 wxConfigBase *config = GetConfig();
@@ -487,6 +505,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
 
                 RestorePath(pathOld);
             }
+#endif
         }
         //else: cancelled
     }
@@ -507,6 +526,7 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
     if ( wxGetNativeFontEncoding(encReplacement, info) &&
          wxTestFontEncoding(*info) )
     {
+#if wxUSE_CONFIG
         // remember the mapping in the config
         wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);
 
@@ -514,7 +534,7 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
         {
             GetConfig()->Write(configEntry, info->ToString());
         }
-
+#endif
         return TRUE;
     }
 
@@ -553,6 +573,8 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     }
     configEntry += encName;
 
+#if wxUSE_CONFIG
+
     // do we have a font spec for this encoding?
     wxString pathOld;
     if ( ChangePath(FONTMAPPER_FONT_FROM_ENCODING_PATH, &pathOld) )
@@ -588,6 +610,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
         }
         //else: there is no information in config about this encoding
     }
+#endif
 
     // ask the user
     if ( interactive )
@@ -624,13 +647,15 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                 *info = retData.EncodingInfo();
                 info -> encoding = retData.GetEncoding();
 
-                // remember this in the config
+#if wxUSE_CONFIG
+            // remember this in the config
                 if ( ChangePath(FONTMAPPER_FONT_FROM_ENCODING_PATH, &pathOld) )
                 {
                     GetConfig()->Write(configEntry, info->ToString());
 
                     RestorePath(pathOld);
                 }
+#endif
 
                 return TRUE;
             }
diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index e9db032f8e..f4a1b3843a 100644
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -20,7 +20,9 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_SOCKETS
+#include "wx/setup.h"
+
+#if wxUSE_SOCKETS && wxUSE_STREAMS
 
 #ifndef __MWERKS__
 #include <memory.h>
diff --git a/src/common/http.cpp b/src/common/http.cpp
index 606bc340ec..90d5db12a8 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_SOCKETS
+#if wxUSE_SOCKETS && wxUSE_STREAMS
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/common/process.cpp b/src/common/process.cpp
index dd80b31466..3166d2b19c 100644
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -36,14 +36,19 @@ void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect)
 
     m_id         = id;
     m_redirect   = redirect;
+
+#if wxUSE_STREAMS
     m_inputStream  = NULL;
     m_outputStream = NULL;
+#endif
 }
 
 wxProcess::~wxProcess()
 {
+#if wxUSE_STREAMS
     delete m_inputStream;
     delete m_outputStream;
+#endif
 }
 
 void wxProcess::OnTerminate(int pid, int status)
@@ -61,9 +66,10 @@ void wxProcess::Detach()
     SetNextHandler(NULL);
 }
 
+#if wxUSE_STREAMS
 void wxProcess::SetPipeStreams(wxInputStream *in_stream, wxOutputStream *out_stream)
 {
     m_inputStream  = in_stream;
     m_outputStream = out_stream;
 }
-
+#endif
diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 220f95294c..99e029f03d 100644
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -23,6 +23,8 @@
   #include "wx/defs.h"
 #endif
 
+#if wxUSE_STREAMS
+
 #include <stdio.h>
 #include "wx/wfstream.h"
 #include "wx/protocol/file.h"
@@ -44,3 +46,4 @@ wxInputStream *wxFileProto::GetInputStream(const wxString& path)
   return new wxFileInputStream(path);
 }
 
+#endif
\ No newline at end of file
diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index d72f9e93b8..b116b7f1f1 100644
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -36,7 +36,7 @@
 #include "wx/defs.h"
 #endif
 
-#if wxUSE_SOCKETS && wxUSE_IPC
+#if wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 0eb8453bd6..b698c8adc2 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1219,6 +1219,8 @@ long wxExecute(const wxString& command, wxArrayString& output)
     process->Redirect();
 
     long rc = wxExecute(command, TRUE /* sync */, process);
+
+#if wxUSE_STREAMS
     if ( rc != -1 )
     {
         wxInputStream& is = *process->GetInputStream();
@@ -1232,6 +1234,7 @@ long wxExecute(const wxString& command, wxArrayString& output)
             output.Add(line);
         }
     }
+#endif
 
     return rc;
 #endif
diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 05134307bc..76cd16ca88 100644
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -46,8 +46,10 @@
 
 #ifndef __WIN16__
   #include "wx/spinbutt.h"
+#if wxUSE_CHECKLISTBOX
   #include "wx/checklst.h"
 #endif
+#endif
 
 #include "wx/valgen.h"
 
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 491cf8c470..f753638730 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -38,11 +38,13 @@
 #include "wx/string.h"
 #include "wx/variant.h"
 
+#if wxUSE_TIMEDATE
 IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
 
 wxTime::tFormat    wxTime::ms_Format    = wxTime::wx12h;
 wxTime::tPrecision wxTime::ms_Precision  = wxTime::wxStdMinSec;
+#endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index 955dcd87e8..62bc8c21c0 100644
--- a/src/generic/helpwxht.cpp
+++ b/src/generic/helpwxht.cpp
@@ -19,7 +19,7 @@
 #   pragma hdrstop
 #endif
 
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WX_PRECOMP
 #   include "wx/string.h"
diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index d40d36daad..96bbc485bf 100644
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -45,7 +45,9 @@
   #include "wx/statline.h"
 #endif
 
+#if !defined(__WIN16__) && wxUSE_SPINCTRL
 #include "wx/spinctrl.h"
+#endif
 
 // this is where wxGetNumberFromUser() is declared
 #include "wx/textdlg.h"
@@ -129,7 +131,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     wxString valStr;
     valStr.Printf(wxT("%lu"), m_value);
     m_spinctrl = new wxSpinCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) );
-#ifndef __WIN16__
+#if !defined(__WIN16__) && wxUSE_SPINCTRL
     m_spinctrl->SetRange((int)m_min, (int)m_max);
 #endif
     inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 1a8af01547..f73c8875c8 100644
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -534,10 +534,10 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
         m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition );
         m_xScrollPosition = wxMax( 0, m_xScrollPosition );
 
-        if (old_x == m_xScrollPosition) return;
-
-        m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
-        m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
+        if (old_x != m_xScrollPosition) {
+            m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
+            m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
+        }
     }
     if ((y_pos != -1) && (m_yScrollPixelsPerLine))
     {
@@ -554,10 +554,10 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
         m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition );
         m_yScrollPosition = wxMax( 0, m_yScrollPosition );
         
-        if (old_y == m_yScrollPosition) return;
-
-        m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
-        m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
+        if (old_y != m_yScrollPosition) {
+            m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
+            m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
+        }
     }
 
 #ifdef __WXMAC__
diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index af0ba923d8..a83b80fb91 100644
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -22,7 +22,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #include "wx/html/helpctrl.h"
 #include "wx/wx.h"
diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index cb5eb0e862..a3759e410f 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -22,7 +22,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index b36d1c62e6..48c8c5d867 100644
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -23,7 +23,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 #ifndef WXPRECOMP
 #include "wx/wx.h"
 #endif
diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 0ca4bb2524..da669b5b18 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -14,7 +14,8 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 95f90552d1..0a814cb1a0 100644
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -15,7 +15,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 4cec1c5cd1..7986e96101 100644
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -15,7 +15,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index e8f244474f..19584d465b 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -15,7 +15,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index ed299f645d..ddf57fb31a 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -26,7 +26,7 @@
 #include "wx/wx.h"
 #endif
 
-#if wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE
+#if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS
 
 #include "wx/print.h"
 #include "wx/printdlg.h"
diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index fd13d8040a..3625e1adfb 100644
--- a/src/html/m_dflist.cpp
+++ b/src/html/m_dflist.cpp
@@ -15,7 +15,7 @@
 
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index 161cbd450c..4f7471622e 100644
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -14,7 +14,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index fdb5a1fa48..ba68587175 100644
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -15,7 +15,7 @@
 
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 06a78d6b82..09396542cb 100644
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -14,7 +14,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index df2615cf1d..08157beaba 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -14,7 +14,7 @@
 
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index a20252dfd1..e21c9e2f69 100644
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -14,7 +14,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index 58425f35c2..3e4b9023e3 100644
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -14,7 +14,7 @@
 
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/html/m_meta.cpp b/src/html/m_meta.cpp
index 7c0c379b88..bcb95e5840 100644
--- a/src/html/m_meta.cpp
+++ b/src/html/m_meta.cpp
@@ -15,7 +15,7 @@
 
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index b7f283a224..df51c4246a 100644
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -14,7 +14,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 24a2d5c151..a651ba407d 100644
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -14,7 +14,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index f358cf14c5..da93089791 100644
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -15,7 +15,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
diff --git a/src/makewat.env b/src/makewat.env
index 11c5031607..abe4a43297 100644
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -29,7 +29,7 @@ PRECOMP     = /fh=$(WXDIR)\src\msw\watcom.pch
 !endif
 
 !ifeq WXDEBUG 1
-DEBUGFLAGS     = /D__WXDEBUG__
+DEBUGFLAGS     = /D__WXDEBUG__ /o1
 DEBUGINFO   = debug all
 !else
 DEBUGFLAGS     =
@@ -70,7 +70,7 @@ RESFLAGS2   = -R $(name) /i$(WXDIR)\include /i$(WXDIR)\contrib\include
 OPTFLAGS=/ox /5r
 
 # /d1 for line numbers only: anything else produces an enormous wx32.lib
-CPPFLAGS    = /bt=nt /w1 /DWIN32 /D__WIN32__ /D__WIN95__ /D__WINDOWS__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 $(DEBUGFLAGS) /d__WXMSW__ $(EXTRACPPFLAGS) # /d__WATCOMC__
+CPPFLAGS    = /bt=nt /w1 /DWIN32 /D__WIN32__ /D__WIN95__ /D__WINDOWS__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) $(DEBUGFLAGS) /d__WXMSW__ $(EXTRACPPFLAGS) # /d__WATCOMC__
 
 .cpp.obj: # $< # .AUTODEPEND
     *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 37f71481b5..d58e6f84af 100644
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -823,6 +823,6 @@ bool wxClipboard::GetData( wxDataObject& data )
 }
 
 #else
-    #error "Please turn wxUSE_CLIPBOARD on to compile this file."
+//    #error "Please turn wxUSE_CLIPBOARD on to compile this file."
 #endif // wxUSE_CLIPBOARD
 
diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index c39d15dc3f..18388991dd 100644
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -35,6 +35,8 @@
     #include "wx/dcmemory.h"
 #endif
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #include "wx/msw/private.h"
 #include "wx/dcprint.h"
 #include "math.h"
@@ -593,3 +595,6 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
 
     return success;
 }
+
+#endif
+    // wxUSE_PRINTING_ARCHITECTURE
diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index cc177eab52..56339e1bb1 100644
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -28,6 +28,8 @@
   #include  "wx/utils.h"
 #endif  //WX_PRECOMP
 
+#if wxUSE_CONFIG
+
 #include  "wx/dynarray.h"
 #include  "wx/log.h"
 #include  "wx/config.h"
@@ -487,3 +489,6 @@ bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName)
     // Not implemented
     return FALSE;
 }
+
+#endif
+    // wxUSE_CONFIG
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index f3a5e7e367..536fe6c0a1 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -664,7 +664,7 @@ rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:	wxhtml
-wxhtml:	$(DOCDIR)\html\wx\wx.htm
+wxhtml:	$(DOCDIR)\html\wx\wx.htm htb
 htmlhelp: $(DOCDIR)\html\wx\wx.chm
 ps:     wxps referencps
 wxps:	$(WXDIR)\docs\ps\wx.ps
@@ -828,7 +828,8 @@ htb:
 	cd $(WXDIR)\docs\html\wx
     -erase /Y wx.zip wx.htb
     zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk
-    ren wx.zip wx.htb
+    -mkdir $(DOCDIR)\html\htb
+    move wx.zip $(DOCDIR)\html\htb\wx.htb
     cd $(THISDIR)
 
 # In order to force document reprocessing
diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index f8bea1184f..e7c7270724 100644
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -104,6 +104,9 @@ wxMetafile::~wxMetafile()
 
 bool wxMetafile::SetClipboard(int width, int height)
 {
+#if !wxUSE_CLIPBOARD
+    return FALSE;
+#else
     if (!m_refData)
         return FALSE;
 
@@ -119,6 +122,7 @@ bool wxMetafile::SetClipboard(int width, int height)
         wxCloseClipboard();
 
     return success;
+#endif
 }
 
 bool wxMetafile::Play(wxDC *dc)
diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index ce9a5db6b8..9ce9195d15 100644
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -239,7 +239,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
     {
         win = new wxScrollBar;
     }
-#if defined(__WIN95__) && !defined(__TWIN32__)
+#if defined(__WIN95__) && !defined(__TWIN32__) && wxUSE_SPINBTN
     else if (str == wxT("MSCTLS_UPDOWN32"))
     {
         win = new wxSpinButton;
diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index e29b9ab51e..f7e069bc01 100644
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -650,7 +650,8 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 		}
 	case VT_DATE:
 		{
-			struct tm tmTemp;
+#if wxUSE_TIMEDATE
+            struct tm tmTemp;
 			if (!TmFromOleDate(oleVariant.date, tmTemp))
 				return FALSE;
 
@@ -658,7 +659,9 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 			wxTime time(date, tmTemp.tm_hour, tmTemp.tm_min, tmTemp.tm_sec);
 
 			variant = time;
-			break;
+#endif
+
+            break;
 		}
 	case VT_I4:
 		{
diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 17f7a55d2b..388c857c17 100644
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -28,6 +28,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/setup.h"
+
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #include "wx/printdlg.h"
 #include "wx/dcprint.h"
 
@@ -182,3 +186,5 @@ int wxPageSetupDialog::ShowModal()
 #endif
 }
 
+#endif
+    // wxUSE_PRINTING_ARCHITECTURE
\ No newline at end of file
diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index f46993f88a..80d21a6959 100644
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -30,6 +30,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/msw/private.h"
@@ -419,3 +421,5 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
         return (!wxPrinterBase::sm_abortIt);
 }
 
+#endif
+    // wxUSE_PRINTING_ARCHITECTURE
diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index e62511ca68..404fb0d2d2 100644
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -27,6 +27,9 @@
 #include "wx/event.h"
 #include "wx/app.h"
 #include "wx/log.h"
+
+#if wxUSE_CONFIG
+
 #include "wx/config.h"
 
 #ifndef __WIN16__
@@ -577,3 +580,5 @@ bool wxRegConfig::DeleteAll()
 #endif
   // __WIN16__
 
+#endif
+  // wxUSE_CONFIG
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index e48ba50b35..7f60dda0ef 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -38,6 +38,8 @@
     #include "wx/app.h"
 #endif
 
+#include "wx/module.h"
+
 #if wxUSE_CLIPBOARD
     #include "wx/clipbrd.h"
 #endif
diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 453b7efc5d..da7b353200 100644
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -122,7 +122,7 @@ public:
 };
 
 
-#ifdef __WIN32__
+#if defined(__WIN32__) && wxUSE_STREAMS
 // ----------------------------------------------------------------------------
 // wxPipeStreams
 // ----------------------------------------------------------------------------
@@ -499,11 +499,13 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
         ::CloseHandle(hpipeWrite[1]);
         ::CloseHandle(hpipeRead[0]);
 
+#if wxUSE_STREAMS
         // We can now initialize the wxStreams
         wxInputStream *inStream = new wxPipeInputStream(hpipeWrite[0]);
         wxOutputStream *outStream = new wxPipeOutputStream(hpipeRead[1]);
 
         handler->SetPipeStreams(inStream, outStream);
+#endif
     }
 
     // register the class for the hidden window used for the notifications