Added a note about bug in Mingw32 headers.

Other Mingw32-related fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-09-08 14:46:17 +00:00
parent cd6b752b83
commit 6b978929d5
8 changed files with 61 additions and 16 deletions

View File

@@ -156,6 +156,24 @@ $TAR cf $2/wxMac-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER} rm -f -r wxWindows-${WXVER}
gzip $2/wxMac-${WXVER}.tar gzip $2/wxMac-${WXVER}.tar
### wxAll: all distributions in one giant archive
cd $1
cat $1/distrib/msw/generic.rsp $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/mac.rsp $1/distrib/msw/os2.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/utilmake.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/mmedia.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
expandlines /tmp/wxall_in.txt /tmp/wxall.txt
$TAR cf $2/wxAll-${WXVER}.tar -T /tmp/wxall.txt
echo Re-tarring wxAll in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxAll-${WXVER}.tar
cd ..
rm -f wxAll-${WXVER}.tar
$TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $2/wxAll-${WXVER}.tar
### Doc sources ### Doc sources
#cd $1 #cd $1
#cat $1/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt #cat $1/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt

View File

@@ -76,7 +76,7 @@ zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
Rem Rearchive under wxWindows-%version% Rem Rearchive under wxWindows-%version%
if direxist %dest%\wxWindows-%version% erase /sxyz %dirname%\wxWindows-%version% if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
mkdir %dest%\wxWindows-%version% mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%version% cd %dest%\wxWindows-%version%
@@ -120,7 +120,7 @@ zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
erase /Y %src%\include\wx\setup.h erase /Y %src%\include\wx\setup.h
if direxist %dest%\wxWindows-%version% erase /sxyz %dirname%\wxWindows-%version% if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
mkdir %dest%\wxWindows-%version% mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%version% cd %dest%\wxWindows-%version%

View File

@@ -47,7 +47,7 @@ zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
erase /Y %src%\include\wx\setup.h erase /Y %src%\include\wx\setup.h
if direxist %dest%\wxWindows-%version% erase /sxyz %dirname%\wxWindows-%version% if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
mkdir %dest%\wxWindows-%version% mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%version% cd %dest%\wxWindows-%version%

View File

@@ -44,7 +44,7 @@ zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
Rem erase /Y %src%\include\wx\setup.h Rem erase /Y %src%\include\wx\setup.h
if direxist %dest%\wxWindows-%version% erase /sxyz %dirname%\wxWindows-%version% if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
mkdir %dest%\wxWindows-%version% mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%version% cd %dest%\wxWindows-%version%

View File

@@ -193,6 +193,7 @@ wxBase:
- added wxEXPLICIT macro - added wxEXPLICIT macro
- IPC classes improved and memory leaks fixed (Michael Fielding). - IPC classes improved and memory leaks fixed (Michael Fielding).
Global buffer removed, duplication in docs removed Global buffer removed, duplication in docs removed
- debug new/free implementations made thread-safe
Unix (Base/GUI): Unix (Base/GUI):
@@ -301,6 +302,7 @@ wxGTK:
- implemented wxChoice::Delete() - implemented wxChoice::Delete()
- fixed bad memory leak in wxFileDialog (Chris Elliott) - fixed bad memory leak in wxFileDialog (Chris Elliott)
- made internal GC pool dynamically growable - made internal GC pool dynamically growable
- added GTK+ 2 and Unicode support
wxMotif: wxMotif:
@@ -312,6 +314,19 @@ wxMotif:
- fixed wxSpinCtrl and wxStaticLine when used with sizers - fixed wxSpinCtrl and wxStaticLine when used with sizers
- wxStaticBitmap now shows transparent icons correctly - wxStaticBitmap now shows transparent icons correctly
wxX11:
- added generic MDI implementation (Hans Van Leemputten)
- first cut at wxSocket support (not yet working)
wxMac:
- Many improvements
wxOS2:
- First alpha-quality release
wxHTML: wxHTML:
- fixed wxHtmlHelpController's cache files handling on big endian machines - fixed wxHtmlHelpController's cache files handling on big endian machines

View File

@@ -601,10 +601,19 @@ Notes:
1. See also the Cygwin/Mingw32 on the web site or CD-ROM for 1. See also the Cygwin/Mingw32 on the web site or CD-ROM for
further information about using wxWindows with these compilers. further information about using wxWindows with these compilers.
2. libwx.a is 48 MB or more - but much less if compiled with no 2. libwx.a is 100 MB or more - but much less if compiled with no
debug info (-g0) and level 4 optimization (-O4). debug info (-g0) and level 4 optimization (-O4).
3. There's a bug in Mingw32 headers for some early distributions. 3. If you get a link error under Mingw32 2.95.2 referring to:
EnumDAdvise__11IDataObjectPP13IEnumSTATDATA@8
then you need to edit the file objidl.h at line 663 and add
a missing PURE keyword:
STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**) PURE;
4. There's a bug in Mingw32 headers for some early distributions.
in include/windows32/defines.h, where it says: in include/windows32/defines.h, where it says:
@@ -616,14 +625,14 @@ Notes:
(a missing bracket). (a missing bracket).
4. If there's a problem with the copy or remove commands in 5. If there's a problem with the copy or remove commands in
src/msw/makefile.g95, you may need to change the COPY and src/msw/makefile.g95, you may need to change the COPY and
RM variables in makeg95.env. RM variables in makeg95.env.
5. If there's a problem executing the windres program, try 6. If there's a problem executing the windres program, try
commenting out RCPREPROCESSOR in makeg95.env. commenting out RCPREPROCESSOR in makeg95.env.
6. OpenGL support should work with Mingw32 as-is. However, 7. OpenGL support should work with Mingw32 as-is. However,
if you wish to generate import libraries appropriate either for if you wish to generate import libraries appropriate either for
the MS OpenGL libraries or the SGI OpenGL libraries, go to the MS OpenGL libraries or the SGI OpenGL libraries, go to
include/wx/msw/gl and use: include/wx/msw/gl and use:

View File

@@ -588,16 +588,20 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
wxString type(variant.GetType()); wxString type(variant.GetType());
if (type == wxT("char"))
{ if (type == wxT("long"))
oleVariant.vt=VT_I1; // Signed Char
oleVariant.cVal=variant.GetChar();
}
else if (type == wxT("long"))
{ {
oleVariant.vt = VT_I4; oleVariant.vt = VT_I4;
oleVariant.lVal = variant.GetLong() ; oleVariant.lVal = variant.GetLong() ;
} }
// cVal not always present
#ifndef __GNUWIN32__
else if (type == wxT("char"))
{
oleVariant.vt=VT_I1; // Signed Char
oleVariant.cVal=variant.GetChar();
}
#endif
else if (type == wxT("double")) else if (type == wxT("double"))
{ {
oleVariant.vt = VT_R8; oleVariant.vt = VT_R8;

View File

@@ -1067,7 +1067,6 @@ bool wxFileDataObject::GetDataHere(void *pData) const
// wxURLDataObject // wxURLDataObject
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class CFSTR_SHELLURLDataObject : public wxCustomDataObject class CFSTR_SHELLURLDataObject : public wxCustomDataObject
{ {
public: public: