diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index db77bc7d2f..58026c0d84 100644
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -247,11 +247,12 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
delayimp.lib
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
- /delayload:oleaut32.dll /delayload:rpcrt4.dll /delayload:winmm.dll $(GL_LIBS_DELAY)
+ /delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY)
<<
!endif
+# /delayload:winmm.dll # Removed because it can cause a crash for some people
########################################################
# Windows-specific objects
diff --git a/docs/html/news.htm b/docs/html/news.htm
index 0ac1d66ea8..538e5b4e37 100644
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -18,6 +18,16 @@ News
+
July 28th, 2000
+
+
+- Vaclav Slavik has recently written an
+article about wxWindows for a Czech ezine.
+
- Hurray! There is a lot of traffic on the wxStudio mailing list, and
+Gerd Mueller has offered to make the WipeOut IDE
+open source and merge it with wxStudio.
+
+
diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex
index 5a3caed12a..7a5069793e 100644
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -375,7 +375,7 @@ Ends a document page (only relevant when outputting to a printer).
\membersection{wxDC::FloodFill}\label{wxdcfloodfill}
-\func{void}{FloodFill}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxColour *}{colour}, \param{int}{ style=wxFLOOD\_SURFACE}}
+\func{void}{FloodFill}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{const wxColour\&}{ colour}, \param{int}{ style=wxFLOOD\_SURFACE}}
Flood fills the device context starting from the given point, in the given colour,
and using a style:
diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex
index 3b161649a9..f05d95e848 100644
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -187,6 +187,10 @@ on program start-up to look up colors. This ensures a very fast conversion, but
the image quality won't be perfect (and could be better for photo images using more
sophisticated dithering algorithms).
+On Windows, if there is a palette present (set with SetPalette), it will be used when
+creating the wxBitmap (most useful in 8-bit display mode). On other platforms,
+the palette is currently ignored.
+
\membersection{wxImage::Copy}\label{wximagecopy}
\constfunc{wxImage}{Copy}{\void}
@@ -309,6 +313,15 @@ Gets the green value of the mask colour.
Gets the red value of the mask colour.
+\membersection{wxImage::GetPalette}\label{wximagegetpalette}
+
+\constfunc{const wxPalette\&}{GetPalette}{\void}
+
+Returns the palette associated with the image. Currently the palette is only
+used in ConvertToBitmap under Windows.
+
+Eventually wxImage handlers will set the palette if one exists in the image file.
+
\membersection{wxImage::GetSubImage}\label{wximagegetsubimage}
\constfunc{wxImage}{GetSubImage}{\param{const wxRect\&}{ rect}}
@@ -597,6 +610,12 @@ Specifies whether there is a mask or not. The area of the mask is determined by
Sets the mask colour for this image (and tells the image to use the mask).
+\membersection{wxImage::SetPalette}\label{wximagesetpalette}
+
+\func{void}{SetPalette}{\param{const wxPalette\&}{ palette}}
+
+Associates a palette with the image. Currently, the palette is not used.
+
\membersection{wxImage::SetRGB}\label{wximagesetrgb}
\func{void}{SetRGB}{\param{int }{x}, \param{int }{y}, \param{unsigned char }{red}, \param{unsigned char }{green}, \param{unsigned char }{blue}}
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 4f1ef863a2..6983661d1d 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -450,11 +450,13 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
delayimp.lib
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
- /delayload:oleaut32.dll /delayload:rpcrt4.dll /delayload:winmm.dll $(GL_LIBS_DELAY)
+ /delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY)
<<
!endif
+# /delayload:winmm.dll # Removed because it can cause a crash for some people
+
########################################################
# Windows-specific objects