diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index 49c3c8957c..9e9f629805 100644
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -30,9 +30,6 @@
     }
 
     foreach $file (sort keys %wxCommon) {
-        #! doesn't compile, apparently
-        next if $file =~ /^imagjpeg\./;
-
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= $file . " ";
@@ -85,11 +82,13 @@ LIBTARGET   = $(WXLIB)\wx.lib
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 
-EXTRATARGETS = xpm png zlib
-EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
+EXTRATARGETS = xpm png zlib jpeg tiff
+EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib clean_jpeg clean_tiff
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 XPMDIR=$(WXDIR)\src\xpm
+JPEGDIR=$(WXDIR)\src\jpeg
+TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
 OLEDIR=$(MSWDIR)\ole
 
@@ -354,6 +353,26 @@ clean_zlib:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
+jpeg:    .SYMBOLIC
+    cd $(WXDIR)\src\jpeg
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_jpeg:   .SYMBOLIC
+    cd $(WXDIR)\src\jpeg
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+tiff:    .SYMBOLIC
+    cd $(WXDIR)\src\tiff
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_tiff:   .SYMBOLIC
+    cd $(WXDIR)\src\tiff
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
 MFTYPE=wat
 self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
 	cd $(WXDIR)\distrib\msw\tmake
diff --git a/docs/latex/wx/colour.tex b/docs/latex/wx/colour.tex
index 2cd926e19a..b3e69e5ee7 100644
--- a/docs/latex/wx/colour.tex
+++ b/docs/latex/wx/colour.tex
@@ -222,7 +222,7 @@ The default colour is black.
 
 \membersection{wxColourData::SetCustomColour}\label{wxcolourdatasetcustomcolour}
 
-\func{void}{SetColour}{\param{int}{ i}, \param{const wxColour\&}{ colour}}
+\func{void}{SetCustomColour}{\param{int}{ i}, \param{const wxColour\&}{ colour}}
 
 Sets the {\it i}th custom colour for the colour dialog. {\it i} should
 be an integer between 0 and 15.
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index a1b15781f8..ee57bfb7e7 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -405,18 +405,16 @@ Watcom C++ 10.6/11 compilation
 3. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat'
    to make this sample. Repeat for other samples of interest.
 
-Note (1): setup.h overrides wxUSE_LIBJPEG and sets it to 0, since
-imagjpeg.cpp doesn't compile.
-Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
+Note (1): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
 directory. See the notes in that directory.
-Note (3): if variant.cpp is compiled with date/time class
+Note (2): if variant.cpp is compiled with date/time class
 options, the linker gives up. So the date/time option is switched
 off for Watcom C++. Also, wxAutomationObject is not compiled with
 Watcom C++.
-Note (4): if Watcom can't read the precompiled header when
+Note (3): if Watcom can't read the precompiled header when
 building a sample, try deleting src\msw\watcom.pch and
 compiling the sample again.
-Note (5): if you get _popen_ and _pclose_ link errors, try
+Note (4): if you get _popen_ and _pclose_ link errors, try
 recompiling wxWindows with XPM support disabled in setup.h.
 Alternatively, make sure these lines exist at the top of
 src\xpm\xpmi.h:
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index f00f76941b..7feaf2e3ea 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -740,14 +740,10 @@
 #endif
 
 #if defined(__WXMSW__) && defined(__WATCOMC__)
-#undef wxUSE_LIBJPEG
-#define wxUSE_LIBJPEG 0
-
-#undef wxUSE_LIBTIFF
-#define wxUSE_LIBTIFF 0
-
+/*
 #undef  wxUSE_GLCANVAS
 #define wxUSE_GLCANVAS 0
+*/
 
 #undef wxUSE_MS_HTML_HELP
 #define wxUSE_MS_HTML_HELP 0
diff --git a/src/jpeg/makefile.wat b/src/jpeg/makefile.wat
index d953e466f8..d1f309c5b3 100644
--- a/src/jpeg/makefile.wat
+++ b/src/jpeg/makefile.wat
@@ -1,41 +1,22 @@
-# Makefile for Independent JPEG Group's software
+#!/binb/wmake.exe
+#
+# File:		makefile.wat
+# Author:	Julian Smart
+# Created:	1998
+#
+# Makefile : Builds JPEG library for Watcom C++, WIN32
 
-# This makefile is suitable for Watcom C/C++ 10.0 on MS-DOS (using
-# dos4g extender), OS/2, and Windows NT console mode.
-# Thanks to Janos Haide, jhaide@btrvtech.com.
+WXDIR = ..\..
+EXTRACPPFLAGS=-i=..\zlib
 
-# Read installation instructions before saying "wmake" !!
+!include $(WXDIR)\src\makewat.env
 
-# Uncomment line for desired system
-SYSTEM=DOS
-#SYSTEM=OS2
-#SYSTEM=NT
+WXLIB = $(WXDIR)\lib
 
-# The name of your C compiler:
-CC= wcl386
+LIBTARGET   = $(WXLIB)\jpeg.lib
 
-# You may need to adjust these cc options:
-CFLAGS= -4r -ort -wx -zq -bt=$(SYSTEM)
-# Caution: avoid -ol or -ox; these generate bad code with 10.0 or 10.0a.
-# Generally, we recommend defining any configuration symbols in jconfig.h,
-# NOT via -D switches here.
-
-# Link-time cc options:
-!ifeq SYSTEM DOS
-LDFLAGS= -zq -l=dos4g
-!else ifeq SYSTEM OS2
-LDFLAGS= -zq -l=os2v2
-!else ifeq SYSTEM NT
-LDFLAGS= -zq -l=nt
-!endif
-
-# Put here the object file name for the correct system-dependent memory
-# manager file.  jmemnobs should work fine for dos4g or OS/2 environment.
 SYSDEPMEM= jmemnobs.obj
 
-# End of configurable options.
-
-
 # source files: JPEG library proper
 LIBSOURCES= jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c &
         jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c &
@@ -87,147 +68,26 @@ DLIBOBJECTS= jdapimin.obj jdapistd.obj jdtrans.obj jdatasrc.obj &
         jidctflt.obj jidctint.obj jidctred.obj jdsample.obj jdcolor.obj &
         jquant1.obj jquant2.obj jdmerge.obj
 # These objectfiles are included in libjpeg.lib
-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
+OBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
 # object files for sample applications (excluding library files)
 COBJECTS= cjpeg.obj rdppm.obj rdgif.obj rdtarga.obj rdrle.obj rdbmp.obj &
         rdswitch.obj cdjpeg.obj
 DOBJECTS= djpeg.obj wrppm.obj wrgif.obj wrtarga.obj wrrle.obj wrbmp.obj &
         rdcolmap.obj cdjpeg.obj
 TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj
+all:        $(OBJECTS) $(LIBTARGET)
 
+$(LIBTARGET) : $(OBJECTS)
+    %create tmp.lbc
+    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
+    wlib /b /c /n /p=512 $^@ @tmp.lbc
 
-all: libjpeg.lib cjpeg.exe djpeg.exe jpegtran.exe rdjpgcom.exe wrjpgcom.exe
+clean:   .SYMBOLIC
+    -erase *.obj
+    -erase $(LIBTARGET)
+    -erase *.pch
+    -erase *.err
+    -erase *.lbc
 
-libjpeg.lib: $(LIBOBJECTS)
-	- del libjpeg.lib
-	* wlib -n libjpeg.lib $(LIBOBJECTS)
+cleanall:   clean
 
-cjpeg.exe: $(COBJECTS) libjpeg.lib
-	$(CC) $(LDFLAGS) $(COBJECTS) libjpeg.lib
-
-djpeg.exe: $(DOBJECTS) libjpeg.lib
-	$(CC) $(LDFLAGS) $(DOBJECTS) libjpeg.lib
-
-jpegtran.exe: $(TROBJECTS) libjpeg.lib
-	$(CC) $(LDFLAGS) $(TROBJECTS) libjpeg.lib
-
-rdjpgcom.exe: rdjpgcom.c
-	$(CC) $(CFLAGS) $(LDFLAGS) rdjpgcom.c
-
-wrjpgcom.exe: wrjpgcom.c
-	$(CC) $(CFLAGS) $(LDFLAGS) wrjpgcom.c
-
-.c.obj:
-	$(CC) $(CFLAGS) -c $<
-
-jconfig.h: jconfig.doc
-	echo You must prepare a system-dependent jconfig.h file.
-	echo Please read the installation directions in install.doc.
-	exit 1
-
-clean: .SYMBOLIC
-	- del *.obj
-	- del libjpeg.lib
-	- del cjpeg.exe
-	- del djpeg.exe
-	- del jpegtran.exe
-	- del rdjpgcom.exe
-	- del wrjpgcom.exe
-	- del testout*.*
-
-test: cjpeg.exe djpeg.exe jpegtran.exe  .SYMBOLIC
-	- del testout*.*
-	djpeg -dct int -ppm -outfile testout.ppm  testorig.jpg
-	djpeg -dct int -bmp -colors 256 -outfile testout.bmp  testorig.jpg
-	cjpeg -dct int -outfile testout.jpg  testimg.ppm
-	djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg
-	cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm
-	jpegtran -outfile testoutt.jpg testprog.jpg
-!ifeq SYSTEM DOS
-	fc /b testimg.ppm testout.ppm
-	fc /b testimg.bmp testout.bmp
-	fc /b testimg.jpg testout.jpg
-	fc /b testimg.ppm testoutp.ppm
-	fc /b testimgp.jpg testoutp.jpg
-	fc /b testorig.jpg testoutt.jpg
-!else
-	echo n > n.tmp
-	comp testimg.ppm testout.ppm < n.tmp
-	comp testimg.bmp testout.bmp < n.tmp
-	comp testimg.jpg testout.jpg < n.tmp
-	comp testimg.ppm testoutp.ppm < n.tmp
-	comp testimgp.jpg testoutp.jpg < n.tmp
-	comp testorig.jpg testoutt.jpg < n.tmp
-	del n.tmp
-!endif
-
-
-jcapimin.obj: jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jcapistd.obj: jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jccoefct.obj: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jccolor.obj: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jcdctmgr.obj: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
-jchuff.obj: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jchuff.h
-jcinit.obj: jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jcmainct.obj: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jcmarker.obj: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jcmaster.obj: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jcomapi.obj: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jcparam.obj: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jcphuff.obj: jcphuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jchuff.h
-jcprepct.obj: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jcsample.obj: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jctrans.obj: jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdapimin.obj: jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdapistd.obj: jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdatadst.obj: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h
-jdatasrc.obj: jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h
-jdcoefct.obj: jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdcolor.obj: jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jddctmgr.obj: jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
-jdhuff.obj: jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdhuff.h
-jdinput.obj: jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdmainct.obj: jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdmarker.obj: jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdmaster.obj: jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdmerge.obj: jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdphuff.obj: jdphuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdhuff.h
-jdpostct.obj: jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdsample.obj: jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jdtrans.obj: jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jerror.obj: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h
-jfdctflt.obj: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
-jfdctfst.obj: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
-jfdctint.obj: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
-jidctflt.obj: jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
-jidctfst.obj: jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
-jidctint.obj: jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
-jidctred.obj: jidctred.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
-jquant1.obj: jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jquant2.obj: jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jutils.obj: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
-jmemmgr.obj: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h
-jmemansi.obj: jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h
-jmemname.obj: jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h
-jmemnobs.obj: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h
-jmemdos.obj: jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h
-jmemmac.obj: jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h
-cjpeg.obj: cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h
-djpeg.obj: djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h
-jpegtran.obj: jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h
-rdjpgcom.obj: rdjpgcom.c jinclude.h jconfig.h
-wrjpgcom.obj: wrjpgcom.c jinclude.h jconfig.h
-cdjpeg.obj: cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-rdcolmap.obj: rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-rdswitch.obj: rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-transupp.obj: transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h
-rdppm.obj: rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-wrppm.obj: wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-rdgif.obj: rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-wrgif.obj: wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-rdtarga.obj: rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-wrtarga.obj: wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-rdbmp.obj: rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-wrbmp.obj: wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-rdrle.obj: rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
-wrrle.obj: wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h
diff --git a/src/makewat.env b/src/makewat.env
index abe4a43297..6519f7472a 100644
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -51,9 +51,9 @@ WATLIBDIR   = $(WATCOMDIR)\lib386\nt
 MINDATA     =
 MAXDATA     =
 STACK       = option stack=64k
-LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\xpm.lib &
+LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\xpm.lib &
       $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
-      $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib &
+      $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\opengl32.lib &
       $(WATLIBDIR)\uuid.lib $(WXDIR)\lib\watcom\odbc32.lib 
 IFLAGS      = -i=$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\nt;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff;$(WXDIR)\include\wx\msw\gnuwin32
 RESFLAGS1   = -r -bt=nt /i$(WXDIR)\include /i$(WXDIR)\contrib\include
diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 608a008611..9842ec4ab7 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -331,6 +331,13 @@ void wxDialog::DoShowModal()
 
     wxWindow* oldFocus = m_oldFocus;
 
+    // We have to remember the HWND because we need to check
+    // the HWND still exists (oldFocus can be garbage when the dialog
+    // exits, if it has been destroyed)
+    HWND hwndOldFocus = 0;
+    if (oldFocus)
+        hwndOldFocus = (HWND) oldFocus->GetHWND();
+
     // inside this block, all app windows are disabled
     {
         wxWindowDisabler wd(this);
@@ -339,6 +346,7 @@ void wxDialog::DoShowModal()
         if ( !oldFocus )
         {
             oldFocus = parent;
+            hwndOldFocus = (HWND) parent->GetHWND();
         }
 
         // enter the modal loop
@@ -365,7 +373,7 @@ void wxDialog::DoShowModal()
     // Note that this code MUST NOT access the dialog object's data
     // in case the object has been deleted (which will be the case
     // for a modal dialog that has been destroyed before calling EndModal).
-    if ( oldFocus && (oldFocus != this) )
+    if ( oldFocus && (oldFocus != this) && ::IsWindow(hwndOldFocus))
     {
         oldFocus->SetFocus();
     }
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 1dad987e9d..2a31747017 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 20:13, 2000/03/31
+# This file was automatically generated by tmake at 11:50, 2000/06/26
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -29,11 +29,13 @@ LIBTARGET   = $(WXLIB)\wx.lib
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 
-EXTRATARGETS = xpm png zlib
-EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
+EXTRATARGETS = xpm png zlib jpeg tiff
+EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib clean_jpeg clean_tiff
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 XPMDIR=$(WXDIR)\src\xpm
+JPEGDIR=$(WXDIR)\src\jpeg
+TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
 OLEDIR=$(MSWDIR)\ole
 
@@ -58,6 +60,7 @@ GENERICOBJS= busyinfo.obj &
 	scrolwin.obj &
 	splitter.obj &
 	statusbr.obj &
+	tabg.obj &
 	tbarsmpl.obj &
 	textdlgg.obj &
 	tipdlg.obj &
@@ -83,7 +86,6 @@ NONESSENTIALOBJS= caret.obj &
 	printps.obj &
 	prntdlgg.obj &
 	statline.obj &
-	tabg.obj &
 	treectrl.obj
 
 COMMONOBJS = &
@@ -133,6 +135,7 @@ COMMONOBJS = &
 	imagbmp.obj &
 	image.obj &
 	imaggif.obj &
+	imagjpeg.obj &
 	imagpcx.obj &
 	imagpng.obj &
 	imagpnm.obj &
@@ -465,6 +468,9 @@ gsocket.obj:     $(MSWDIR)\gsocket.c
 gsockmsw.obj:     $(MSWDIR)\gsockmsw.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
+helpchm.obj:     $(MSWDIR)\helpchm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 helpwin.obj:     $(MSWDIR)\helpwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -770,6 +776,9 @@ image.obj:     $(COMMDIR)\image.cpp
 imaggif.obj:     $(COMMDIR)\imaggif.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagpcx.obj:     $(COMMDIR)\imagpcx.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1003,6 +1012,9 @@ splitter.obj:     $(GENDIR)\splitter.cpp
 statusbr.obj:     $(GENDIR)\statusbr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+tabg.obj:     $(GENDIR)\tabg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tbarsmpl.obj:     $(GENDIR)\tbarsmpl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1166,6 +1178,26 @@ clean_zlib:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
+jpeg:    .SYMBOLIC
+    cd $(WXDIR)\src\jpeg
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_jpeg:   .SYMBOLIC
+    cd $(WXDIR)\src\jpeg
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+tiff:    .SYMBOLIC
+    cd $(WXDIR)\src\tiff
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_tiff:   .SYMBOLIC
+    cd $(WXDIR)\src\tiff
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
 MFTYPE=wat
 self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
 	cd $(WXDIR)\distrib\msw\tmake
diff --git a/src/tiff/makefile.wat b/src/tiff/makefile.wat
new file mode 100644
index 0000000000..4f8d5cfc38
--- /dev/null
+++ b/src/tiff/makefile.wat
@@ -0,0 +1,141 @@
+#!/binb/wmake.exe
+#
+# File:		makefile.wat
+# Author:	Julian Smart
+# Created:	1998
+#
+# Makefile : Builds TIFF library for Watcom C++, WIN32
+# This makefile has to rename files because apparently Watcom C++
+# can't deal with greater than 8.3 filenames (can't
+# make tif_close.c, for example)
+
+WXDIR = ..\..
+EXTRACPPFLAGS=-i=..\zlib
+
+!include $(WXDIR)\src\makewat.env
+
+WXLIB = $(WXDIR)\lib
+
+LIBTARGET   = $(WXLIB)\tiff.lib
+
+OBJECTS= &
+		_aux.obj &
+		close.obj &
+		codec.obj &
+		compress.obj &
+		dir.obj &
+		dirinfo.obj &
+		dirread.obj &
+		dirwrite.obj &
+		dumpmode.obj &
+		error.obj &
+		fax3.obj &
+		fax3sm.obj &
+		flush.obj &
+		getimage.obj &
+		jpeg.obj &
+		luv.obj &
+		lzw.obj &
+		next.obj &
+		open.obj &
+		packbits.obj &
+		pixarlog.obj &
+		predict.obj &
+		print.obj &
+		read.obj &
+		strip.obj &
+		swab.obj &
+		thunder.obj &
+		tile.obj &
+		version.obj &
+		warning.obj &
+		win32.obj &
+		write.obj &
+		zip.obj
+
+rename: .SYMBOLIC
+		copy tif_predict.h tif_pred.h
+		copy tif_aux.c _aux.c 
+		copy tif_close.c close.c 
+		copy tif_codec.c codec.c 
+		copy tif_compress.c compress.c 
+		copy tif_dir.c dir.c 
+		copy tif_dirinfo.c dirinfo.c 
+		copy tif_dirread.c dirread.c 
+		copy tif_dirwrite.c dirwrite.c 
+		copy tif_dumpmode.c dumpmode.c 
+		copy tif_error.c error.c 
+		copy tif_fax3.c fax3.c 
+		copy tif_fax3sm.c fax3sm.c 
+		copy tif_flush.c flush.c 
+		copy tif_getimage.c getimage.c 
+		copy tif_jpeg.c jpeg.c 
+		copy tif_luv.c luv.c 
+		copy tif_lzw.c lzw.c 
+		copy tif_next.c next.c 
+		copy tif_open.c open.c 
+		copy tif_packbits.c packbits.c 
+		copy tif_pixarlog.c pixarlog.c 
+		copy tif_predict.c predict.c 
+		copy tif_print.c print.c 
+		copy tif_read.c read.c 
+		copy tif_strip.c strip.c 
+		copy tif_swab.c swab.c 
+		copy tif_thunder.c thunder.c 
+		copy tif_tile.c tile.c 
+		copy tif_version.c version.c 
+		copy tif_warning.c warning.c 
+		copy tif_win32.c win32.c 
+		copy tif_write.c write.c 
+		copy tif_zip.c zip.c
+
+all:        rename $(OBJECTS) $(LIBTARGET)
+
+$(LIBTARGET) : $(OBJECTS)
+    %create tmp.lbc
+    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
+    wlib /b /c /n /p=512 $^@ @tmp.lbc
+
+clean:   .SYMBOLIC
+    -erase *.obj
+    -erase $(LIBTARGET)
+    -erase *.pch
+    -erase *.err
+    -erase *.lbc
+	-erase tif_pred.h
+	-erase _aux.c 
+	-erase close.c 
+	-erase codec.c 
+	-erase compress.c 
+	-erase dir.c 
+	-erase dirinfo.c 
+	-erase dirread.c 
+	-erase dirwrite.c 
+	-erase dumpmode.c 
+	-erase error.c 
+	-erase fax3.c 
+	-erase fax3sm.c 
+	-erase flush.c 
+	-erase getimage.c 
+	-erase jpeg.c 
+	-erase luv.c 
+	-erase lzw.c 
+	-erase next.c 
+	-erase open.c 
+	-erase packbits.c 
+	-erase pixarlog.c 
+	-erase predict.c 
+	-erase print.c 
+	-erase read.c 
+	-erase strip.c 
+	-erase swab.c 
+	-erase thunder.c 
+	-erase tile.c 
+	-erase version.c 
+	-erase warning.c 
+	-erase win32.c 
+	-erase write.c 
+	-erase zip.c
+
+cleanall:   clean
+
diff --git a/src/tiff/tif_lzw.c b/src/tiff/tif_lzw.c
index e41314a6a3..663b216c53 100644
--- a/src/tiff/tif_lzw.c
+++ b/src/tiff/tif_lzw.c
@@ -36,7 +36,12 @@
  *
  * The original Berkeley copyright notice appears below in its entirety.
  */
+// Watcom C++ (or its make utility) doesn't like long filenames
+#ifdef __WATCOMC__
+#include "tif_pred.h"
+#else
 #include "tif_predict.h"
+#endif
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/tiff/tif_pixarlog.c b/src/tiff/tif_pixarlog.c
index 27f2a9d775..668508710e 100644
--- a/src/tiff/tif_pixarlog.c
+++ b/src/tiff/tif_pixarlog.c
@@ -84,7 +84,13 @@
  * 
  */
 
+// Watcom C++ (or its make utility) doesn't like long filenames
+#ifdef __WATCOMC__
+#include "tif_pred.h"
+#else
 #include "tif_predict.h"
+#endif
+
 #include "zlib.h"
 #include "zutil.h"
 
diff --git a/src/tiff/tif_predict.c b/src/tiff/tif_predict.c
index 3dd7c98747..2e67281233 100644
--- a/src/tiff/tif_predict.c
+++ b/src/tiff/tif_predict.c
@@ -30,7 +30,12 @@
  * Predictor Tag Support (used by multiple codecs).
  */
 #include "tiffiop.h"
+// Watcom C++ (or its make utility) doesn't like long filenames
+#ifdef __WATCOMC__
+#include "tif_pred.h"
+#else
 #include "tif_predict.h"
+#endif
 
 #include <assert.h>
 
diff --git a/src/tiff/tif_zip.c b/src/tiff/tif_zip.c
index 89cfdbde18..2099dc8623 100644
--- a/src/tiff/tif_zip.c
+++ b/src/tiff/tif_zip.c
@@ -46,7 +46,13 @@
  * directory ftp://ftp.uu.net/pub/archiving/zip/doc.  The library was
  * last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz.
  */
+// Watcom C++ (or its make utility) doesn't like long filenames
+#ifdef __WATCOMC__
+#include "tif_pred.h"
+#else
 #include "tif_predict.h"
+#endif
+
 #include "zlib.h"
 
 #include <stdio.h>