projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fix for gcc4 (patch 1428840)
[wxWidgets.git]
/
src
/
msw
/
metafile.cpp
diff --git
a/src/msw/metafile.cpp
b/src/msw/metafile.cpp
index dfe59cc8f5f71097dce4ddacf2b1218c42453bf8..0092107a7c6306b666c73aed7846819a30cec94d 100644
(file)
--- a/
src/msw/metafile.cpp
+++ b/
src/msw/metafile.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/metafile.cpp
+// Name:
src/
msw/metafile.cpp
// Purpose: wxMetafileDC etc.
// Author: Julian Smart
// Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
// Purpose: wxMetafileDC etc.
// Author: Julian Smart
// Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
@@
-24,10
+24,6
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#ifndef WX_PRECOMP
- #include "wx/setup.h"
-#endif
-
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/app.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/app.h"
@@
-126,8
+122,6
@@
bool wxMetafile::Play(wxDC *dc)
if (!m_refData)
return false;
if (!m_refData)
return false;
- dc->BeginDrawing();
-
if (dc->GetHDC() && M_METAFILEDATA->m_metafile)
{
if ( !::PlayMetaFile(GetHdcOf(*dc), (HMETAFILE)
if (dc->GetHDC() && M_METAFILEDATA->m_metafile)
{
if ( !::PlayMetaFile(GetHdcOf(*dc), (HMETAFILE)
@@
-137,8
+131,6
@@
bool wxMetafile::Play(wxDC *dc)
}
}
}
}
- dc->EndDrawing();
-
return true;
}
return true;
}
@@
-197,7
+189,7
@@
wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, i
m_minY = 10000;
m_maxX = -10000;
m_maxY = -10000;
m_minY = 10000;
m_maxX = -10000;
m_maxY = -10000;
- if ( !file.
IsE
mpty() && wxFileExists(file))
+ if ( !file.
e
mpty() && wxFileExists(file))
wxRemoveFile(file);
m_hDC = (WXHDC) CreateMetaFile(file);
wxRemoveFile(file);
m_hDC = (WXHDC) CreateMetaFile(file);
@@
-521,4
+513,3
@@
bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
#endif // wxUSE_DRAG_AND_DROP
#endif // wxUSE_METAFILE
#endif // wxUSE_DRAG_AND_DROP
#endif // wxUSE_METAFILE
-