diff --git a/contrib/src/ogl/makefile.vc b/contrib/src/ogl/makefile.vc
index f06aaec6e4..f4d62a3a74 100644
--- a/contrib/src/ogl/makefile.vc
+++ b/contrib/src/ogl/makefile.vc
@@ -133,6 +133,7 @@ DOCSOURCES=$(LOCALDOCDIR)\ogl.tex \
 
 html: $(DOCDIR)\html\ogl\ogl.htm
 htmlhelp: $(DOCDIR)\htmlhelp\ogl.chm
+htb:	$(DOCDIR)\htb\ogl.htb
 hlp: $(DOCDIR)\winhelp\ogl.hlp
 pdfrtf: $(DOCDIR)\pdf\ogl.rtf
 ps: $(DOCDIR)\ps\ogl.ps
@@ -176,6 +177,18 @@ $(DOCDIR)\htmlhelp\ogl.chm: $(DOCDIR)\html\ogl\ogl.htm $(DOCDIR)\html\ogl\ogl.hh
     move ogl.chm $(DOCDIR)\htmlhelp\ogl.chm
 	cd $(THISDIR)
 
+# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
+# files, renamed to htb.
+# This can then be used with e.g. helpview.
+# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
+$(DOCDIR)\htb\ogl.htb: $(DOCDIR)\html\ogl\ogl.htm
+	cd $(DOCDIR)\html\ogl
+    -erase /Y ogl.zip ogl.htb
+    zip32 ogl.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -mkdir $(DOCDIR)\htb
+    move ogl.zip $(DOCDIR)\htb\ogl.htb
+    cd $(THISDIR)
+
 $(LOCALDOCDIR)\ogl.dvi:	$(DOCSOURCES)
 	cd $(LOCALDOCDIR)
         -latex ogl
diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 78d48b0c0d..8219ff56b8 100644
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -461,8 +461,9 @@ rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:	wxhtml
-wxhtml:	$(DOCDIR)\html\wx\wx.htm htb
-htmlhelp: $(DOCDIR)\html\wx\wx.chm
+htb:	$(DOCDIR)\htb\wx.htb
+wxhtml:	$(DOCDIR)\html\wx\wx.htm
+htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 ps:     wxps referencps
 wxps:	$(WXDIR)\docs\ps\wx.ps
 referencps:	$(WXDIR)\docs\ps\referenc.ps
@@ -573,6 +574,7 @@ $(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
 $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
+        copy *.gif $(DOCDIR)\html\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
         -erase $(DOCDIR)\html\wx\*.con
         -erase $(DOCDIR)\html\wx\*.ref
@@ -580,7 +582,7 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
-$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
+$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
 	cd $(DOCDIR)\html\wx
 	-hhc wx.hhp
     -mkdir ..\..\htmlhelp
@@ -623,7 +625,7 @@ $(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
 # files, renamed to htb.
 # This can then be used with e.g. helpview.
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-htb:
+$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm
 	cd $(WXDIR)\docs\html\wx
     -erase /Y wx.zip wx.htb
     zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk
diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index e226569099..6aa88cee81 100644
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -2870,7 +2870,11 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
         // take this date as default
         tmDef = dateDef.GetTm();
     }
+#ifdef __WIN16__
+    else if ( m_time != 0 )
+#else
     else if ( m_time != wxLongLong(0) )
+#endif
     {
         // if this date is valid, don't change it
         tmDef = GetTm();
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index c1244394d0..de2f622607 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -1258,9 +1258,9 @@ void wxListHeaderWindow::DrawCurrent()
 
 void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 {
-    wxCoord x = (wxCoord)event.GetX();
-    wxCoord y = (wxCoord)event.GetY();
-    
+    int x = event.GetX();
+    int y = event.GetY();
+
     m_owner->CalcUnscrolledPosition( x, 0, &x, NULL );
     
     if (m_isDragging)
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 67a43b8bc5..8bd01adcee 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -667,7 +667,8 @@ rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:	wxhtml
-wxhtml:	$(DOCDIR)\html\wx\wx.htm htb
+htb:	$(DOCDIR)\htb\wx.htb
+wxhtml:	$(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 ps:     wxps referencps
 wxps:	$(WXDIR)\docs\ps\wx.ps
@@ -830,7 +831,7 @@ $(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
 # files, renamed to htb.
 # This can then be used with e.g. helpview.
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-htb:
+$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm
 	cd $(WXDIR)\docs\html\wx
     -erase /Y wx.zip wx.htb
     zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk
diff --git a/utils/dialoged/src/makefile.vc b/utils/dialoged/src/makefile.vc
index 7c9b9fc7d7..83b6066167 100644
--- a/utils/dialoged/src/makefile.vc
+++ b/utils/dialoged/src/makefile.vc
@@ -85,6 +85,7 @@ DOCSOURCES=$(LOCALDOCDIR)\dialoged.tex $(LOCALDOCDIR)\body.tex\
 
 html: $(DOCDIR)\html\dialoged\dlged.htm
 htmlhelp: $(DOCDIR)\htmlhelp\dialoged.chm
+htb:	$(DOCDIR)\htb\dialoged.htb
 hlp: $(DOCDIR)\winhelp\dialoged.hlp
 pdfrtf: $(DOCDIR)\pdf\dialoged.rtf
 ps: $(DOCDIR)\ps\dialoged.ps
@@ -123,6 +124,18 @@ $(DOCDIR)\htmlhelp\dialoged.chm : $(DOCDIR)\html\dialoged\dlged.htm $(DOCDIR)\ht
     move $(DOCDIR)\html\dialoged\dlged.chm $(DOCDIR)\htmlhelp\dialoged.chm
 	cd $(THISDIR)
 
+# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
+# files, renamed to htb.
+# This can then be used with e.g. helpview.
+# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
+$(DOCDIR)\htb\dialoged.htb: $(DOCDIR)\html\dialoged\dlged.htm
+	cd $(DOCDIR)\html\dialoged
+    -erase /Y dialoged.zip dialoged.htb
+    zip32 dialoged.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -mkdir $(DOCDIR)\htb
+    move dialoged.zip $(DOCDIR)\htb\dialoged.htb
+    cd $(THISDIR)
+
 $(LOCALDOCDIR)\dialoged.dvi:	$(DOCSOURCES)
 	cd $(LOCALDOCDIR)
         -latex dialoged
diff --git a/utils/tex2rtf/src/makefile.vc b/utils/tex2rtf/src/makefile.vc
index 4dca797a52..9552bd1bf8 100644
--- a/utils/tex2rtf/src/makefile.vc
+++ b/utils/tex2rtf/src/makefile.vc
@@ -92,6 +92,7 @@ DOCSOURCES=$(LOCALDOCDIR)\tex2rtf.tex
 
 html: $(DOCDIR)\html\tex2rtf\t2rtf.htm
 htmlhelp: $(DOCDIR)\htmlhelp\tex2rtf.chm
+htb:	$(DOCDIR)\htb\tex2rtf.htb
 hlp: $(DOCDIR)\winhelp\tex2rtf.hlp
 pdfrtf: $(DOCDIR)\pdf\tex2rtf.rtf
 ps: $(WXDIR)\docs\ps\tex2rtf.ps
@@ -131,6 +132,18 @@ $(DOCDIR)\htmlhelp\tex2rtf.chm : $(DOCDIR)\html\tex2rtf\t2rtf.htm $(DOCDIR)\html
     move t2rtf.chm $(DOCDIR)\htmlhelp\tex2rtf.chm
 	cd $(THISDIR)
 
+# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
+# files, renamed to htb.
+# This can then be used with e.g. helpview.
+# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
+$(DOCDIR)\htb\tex2rtf.htb: $(DOCDIR)\html\tex2rtf\t2rtf.htm
+	cd $(DOCDIR)\html\tex2rtf
+    -erase /Y tex2rtf.zip tex2rtf.htb
+    zip32 tex2rtf.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -mkdir $(DOCDIR)\htb
+    move tex2rtf.zip $(DOCDIR)\htb\tex2rtf.htb
+    cd $(THISDIR)
+
 $(LOCALDOCDIR)\tex2rtf.dvi:	$(DOCSOURCES)
 	cd $(LOCALDOCDIR)
         -latex tex2rtf