anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 15:46:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compile fix for cygwin and shut up gcc warning about NULL

Browse Source 
used for non-pointer type.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24145 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2008-04-07 11:37:50 +00:00
parent 753aa0451d
commit 40535cb302
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/qt4/GuiClipboard.cpp
View File

@ -43,6 +43,9 @@
#ifdef Q_WS_WIN
#include <QWindowsMime>
#ifdef Q_CYGWIN_WIN
#include <wtypes.h>
#endif
#include <objidl.h>
#endif // Q_WS_WIN
@ -153,11 +156,11 @@ QVariant QWindowsMimeMetafile::convertToMime(
if (pDataObj->GetData(&formatetc, &s) == S_OK) {
if (s.tymed == TYMED_ENHMF) {
dataSize = GetEnhMetaFileBits(s.hEnhMetaFile, NULL, NULL);
dataSize = GetEnhMetaFileBits(s.hEnhMetaFile, 0, 0);
data.resize(dataSize);
dataSize = GetEnhMetaFileBits(s.hEnhMetaFile, dataSize, (LPBYTE)data.data());
} else if (s.tymed == TYMED_MFPICT) {
dataSize = GetMetaFileBitsEx((HMETAFILE)s.hMetaFilePict, NULL, NULL);
dataSize = GetMetaFileBitsEx((HMETAFILE)s.hMetaFilePict, 0, 0);
data.resize(dataSize);
dataSize = GetMetaFileBitsEx((HMETAFILE)s.hMetaFilePict, dataSize, (LPBYTE)data.data());
}