Removed winmm.dll from delayload list.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -247,11 +247,12 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
|
|||||||
delayimp.lib
|
delayimp.lib
|
||||||
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
|
/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: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
|
!endif
|
||||||
|
|
||||||
|
# /delayload:winmm.dll # Removed because it can cause a crash for some people
|
||||||
|
|
||||||
########################################################
|
########################################################
|
||||||
# Windows-specific objects
|
# Windows-specific objects
|
||||||
|
@@ -18,6 +18,16 @@ News
|
|||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
<H3>July 28th, 2000</H3><P>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<li>Vaclav Slavik has recently written an
|
||||||
|
<a href="http://www.root.cz/clanek.phtml?id=425" target=_top>article about wxWindows</a> for a Czech ezine.
|
||||||
|
<li>Hurray! There is a lot of traffic on the wxStudio mailing list, and
|
||||||
|
Gerd Mueller has offered to make the <a href="http://www.softwarebuero.de" target=_top>WipeOut</a> IDE
|
||||||
|
open source and merge it with wxStudio.
|
||||||
|
</ul>
|
||||||
|
|
||||||
<H3><a name="release2_2_0">July 9th, 2000</H3><P>
|
<H3><a name="release2_2_0">July 9th, 2000</H3><P>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
|
@@ -375,7 +375,7 @@ Ends a document page (only relevant when outputting to a printer).
|
|||||||
|
|
||||||
\membersection{wxDC::FloodFill}\label{wxdcfloodfill}
|
\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,
|
Flood fills the device context starting from the given point, in the given colour,
|
||||||
and using a style:
|
and using a style:
|
||||||
|
@@ -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
|
the image quality won't be perfect (and could be better for photo images using more
|
||||||
sophisticated dithering algorithms).
|
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}
|
\membersection{wxImage::Copy}\label{wximagecopy}
|
||||||
|
|
||||||
\constfunc{wxImage}{Copy}{\void}
|
\constfunc{wxImage}{Copy}{\void}
|
||||||
@@ -309,6 +313,15 @@ Gets the green value of the mask colour.
|
|||||||
|
|
||||||
Gets the red 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}
|
\membersection{wxImage::GetSubImage}\label{wximagegetsubimage}
|
||||||
|
|
||||||
\constfunc{wxImage}{GetSubImage}{\param{const wxRect\&}{ rect}}
|
\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).
|
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}
|
\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}}
|
\func{void}{SetRGB}{\param{int }{x}, \param{int }{y}, \param{unsigned char }{red}, \param{unsigned char }{green}, \param{unsigned char }{blue}}
|
||||||
|
@@ -450,11 +450,13 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
|
|||||||
delayimp.lib
|
delayimp.lib
|
||||||
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
|
/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: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
|
!endif
|
||||||
|
|
||||||
|
# /delayload:winmm.dll # Removed because it can cause a crash for some people
|
||||||
|
|
||||||
########################################################
|
########################################################
|
||||||
# Windows-specific objects
|
# Windows-specific objects
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user