merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -104,6 +104,9 @@ wxMetafile::~wxMetafile()
|
||||
|
||||
bool wxMetafile::SetClipboard(int width, int height)
|
||||
{
|
||||
#if !wxUSE_CLIPBOARD
|
||||
return FALSE;
|
||||
#else
|
||||
if (!m_refData)
|
||||
return FALSE;
|
||||
|
||||
@@ -119,6 +122,7 @@ bool wxMetafile::SetClipboard(int width, int height)
|
||||
wxCloseClipboard();
|
||||
|
||||
return success;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool wxMetafile::Play(wxDC *dc)
|
||||
@@ -375,12 +379,12 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
|
||||
p < (WORD *)&pMFHead ->checksum; ++p)
|
||||
pMFHead ->checksum ^= *p;
|
||||
|
||||
FILE *fd = fopen(filename.fn_str(), "rb");
|
||||
FILE *fd = wxFopen(filename.fn_str(), "rb");
|
||||
if (!fd) return FALSE;
|
||||
|
||||
wxChar tempFileBuf[256];
|
||||
wxGetTempFileName(wxT("mf"), tempFileBuf);
|
||||
FILE *fHandle = fopen(wxConvFile.cWX2MB(tempFileBuf), "wb");
|
||||
FILE *fHandle = wxFopen(wxConvFile.cWX2MB(tempFileBuf), "wb");
|
||||
if (!fHandle)
|
||||
return FALSE;
|
||||
fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
|
||||
|
Reference in New Issue
Block a user