projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully fixed library names generated by wx-config for OS/2's PM port.
[wxWidgets.git]
/
src
/
msw
/
metafile.cpp
diff --git
a/src/msw/metafile.cpp
b/src/msw/metafile.cpp
index ce2568c2c2ec34e8c662f4bc0fb3c3f654351cf9..7e48d2c979a0fff0da6a65e9166ef2cc994ca7bd 100644
(file)
--- a/
src/msw/metafile.cpp
+++ b/
src/msw/metafile.cpp
@@
-5,8
+5,8
@@
// Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
// Created: 04/01/98
// RCS-ID: $Id$
// Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
and Markus Holzem
-// Licence: wxWindows licen
s
e
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-17,7
+17,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "metafile.h"
#endif
#pragma implementation "metafile.h"
#endif
@@
-94,7
+94,7
@@
wxMetafile::wxMetafile(const wxString& file)
M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
M_METAFILEDATA->m_metafile = 0;
M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
M_METAFILEDATA->m_metafile = 0;
- if (!file.
IsNull() && (file.Cmp(wxT("")) == 0
))
+ if (!file.
empty(
))
M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
}
M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
}
@@
-105,17
+105,17
@@
wxMetafile::~wxMetafile()
bool wxMetafile::SetClipboard(int width, int height)
{
#if !wxUSE_CLIPBOARD
bool wxMetafile::SetClipboard(int width, int height)
{
#if !wxUSE_CLIPBOARD
- return
FALSE
;
+ return
false
;
#else
if (!m_refData)
#else
if (!m_refData)
- return
FALSE
;
+ return
false
;
bool alreadyOpen = wxClipboardOpen();
if (!alreadyOpen)
{
wxOpenClipboard();
if (!wxEmptyClipboard())
bool alreadyOpen = wxClipboardOpen();
if (!alreadyOpen)
{
wxOpenClipboard();
if (!wxEmptyClipboard())
- return
FALSE
;
+ return
false
;
}
bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
if (!alreadyOpen)
}
bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
if (!alreadyOpen)
@@
-128,7
+128,7
@@
bool wxMetafile::SetClipboard(int width, int height)
bool wxMetafile::Play(wxDC *dc)
{
if (!m_refData)
bool wxMetafile::Play(wxDC *dc)
{
if (!m_refData)
- return
FALSE
;
+ return
false
;
dc->BeginDrawing();
dc->BeginDrawing();
@@
-143,7
+143,7
@@
bool wxMetafile::Play(wxDC *dc)
dc->EndDrawing();
dc->EndDrawing();
- return
TRUE
;
+ return
true
;
}
void wxMetafile::SetHMETAFILE(WXHANDLE mf)
}
void wxMetafile::SetHMETAFILE(WXHANDLE mf)
@@
-180,7
+180,7
@@
wxMetafileDC::wxMetafileDC(const wxString& file)
if (!file.IsNull() && wxFileExists(file))
wxRemoveFile(file);
if (!file.IsNull() && wxFileExists(file))
wxRemoveFile(file);
- if (!file.IsNull() && (file != wx
T("")
))
+ if (!file.IsNull() && (file != wx
EmptyString
))
m_hDC = (WXHDC) CreateMetaFile(file);
else
m_hDC = (WXHDC) CreateMetaFile(NULL);
m_hDC = (WXHDC) CreateMetaFile(file);
else
m_hDC = (WXHDC) CreateMetaFile(NULL);
@@
-201,11
+201,11
@@
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
&& wxFileExists(file))
+ if ( !
file.IsEmpty()
&& wxFileExists(file))
wxRemoveFile(file);
m_hDC = (WXHDC) CreateMetaFile(file);
wxRemoveFile(file);
m_hDC = (WXHDC) CreateMetaFile(file);
- m_ok =
TRUE
;
+ m_ok =
true
;
::SetWindowOrgEx((HDC) m_hDC,xorg,yorg, NULL);
::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL);
::SetWindowOrgEx((HDC) m_hDC,xorg,yorg, NULL);
::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL);
@@
-222,7
+222,7
@@
wxMetafileDC::~wxMetafileDC()
}
void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
}
void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
- long *descent, long *externalLeading, wxFont *theFont, bool
use16bit
) const
+ long *descent, long *externalLeading, wxFont *theFont, bool
WXUNUSED(use16bit)
) const
{
wxFont *fontToUse = theFont;
if (!fontToUse)
{
wxFont *fontToUse = theFont;
if (!fontToUse)
@@
-232,7
+232,7
@@
void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
SIZE sizeRect;
TEXTMETRIC tm;
SIZE sizeRect;
TEXTMETRIC tm;
-
GetTextExtentPoint
(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
+
::GetTextExtentPoint32
(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
GetTextMetrics(dc, &tm);
ReleaseDC(NULL, dc);
GetTextMetrics(dc, &tm);
ReleaseDC(NULL, dc);
@@
-308,8
+308,6
@@
void wxMetafileDC::SetMapMode(int mode)
break;
}
}
break;
}
}
- m_windowExtX = 100;
- m_windowExtY = 100;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-353,7
+351,7
@@
struct mfPLACEABLEHEADER {
bool wxMakeMetafilePlaceable(const wxString& filename, float scale)
{
bool wxMakeMetafilePlaceable(const wxString& filename, float scale)
{
-
return wxMakeMetafilePlaceable(filename, 0, 0, 0, 0, scale, FALSE
);
+
return wxMakeMetafilePlaceable(filename, 0, 0, 0, 0, scale, false
);
}
bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale, bool useOriginAndExtent)
}
bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale, bool useOriginAndExtent)
@@
-379,14
+377,14
@@
bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
p < (WORD *)&pMFHead ->checksum; ++p)
pMFHead ->checksum ^= *p;
p < (WORD *)&pMFHead ->checksum; ++p)
pMFHead ->checksum ^= *p;
- FILE *fd = wxFopen(filename.fn_str(),
"rb"
);
- if (!fd) return
FALSE
;
+ FILE *fd = wxFopen(filename.fn_str(),
_T("rb")
);
+ if (!fd) return
false
;
wxChar tempFileBuf[256];
wxGetTempFileName(wxT("mf"), tempFileBuf);
wxChar tempFileBuf[256];
wxGetTempFileName(wxT("mf"), tempFileBuf);
- FILE *fHandle = wxFopen(wx
ConvFile.cWX2MB(tempFileBuf), "wb"
);
+ FILE *fHandle = wxFopen(wx
FNCONV(tempFileBuf), _T("wb")
);
if (!fHandle)
if (!fHandle)
- return
FALSE
;
+ return
false
;
fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
// Calculate origin and extent
fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
// Calculate origin and extent
@@
-451,7
+449,7
@@
bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
wxRemoveFile(filename);
wxCopyFile(tempFileBuf, filename);
wxRemoveFile(tempFileBuf);
wxRemoveFile(filename);
wxCopyFile(tempFileBuf, filename);
wxRemoveFile(tempFileBuf);
- return
TRUE
;
+ return
true
;
}
}
@@
-471,7
+469,7
@@
bool wxMetafileDataObject::GetDataHere(void *buf) const
METAFILEPICT *mfpict = (METAFILEPICT *)buf;
const wxMetafile& mf = GetMetafile();
METAFILEPICT *mfpict = (METAFILEPICT *)buf;
const wxMetafile& mf = GetMetafile();
- wxCHECK_MSG( mf.GetHMETAFILE(),
FALSE
, _T("copying invalid metafile") );
+ wxCHECK_MSG( mf.GetHMETAFILE(),
false
, _T("copying invalid metafile") );
// doesn't seem to work with any other mapping mode...
mfpict->mm = MM_ANISOTROPIC; //mf.GetWindowsMappingMode();
// doesn't seem to work with any other mapping mode...
mfpict->mm = MM_ANISOTROPIC; //mf.GetWindowsMappingMode();
@@
-484,7
+482,7
@@
bool wxMetafileDataObject::GetDataHere(void *buf) const
mfpict->hMF = CopyMetaFile((HMETAFILE)mf.GetHMETAFILE(), NULL);
mfpict->hMF = CopyMetaFile((HMETAFILE)mf.GetHMETAFILE(), NULL);
- return
TRUE
;
+ return
true
;
}
bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
}
bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
@@
-507,11
+505,11
@@
bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
mf.SetHeight(h);
mf.SetHMETAFILE((WXHANDLE)mfpict->hMF);
mf.SetHeight(h);
mf.SetHMETAFILE((WXHANDLE)mfpict->hMF);
- wxCHECK_MSG( mfpict->hMF,
FALSE
, _T("pasting invalid metafile") );
+ wxCHECK_MSG( mfpict->hMF,
false
, _T("pasting invalid metafile") );
SetMetafile(mf);
SetMetafile(mf);
- return
TRUE
;
+ return
true
;
}
#endif // wxUSE_DRAG_AND_DROP
}
#endif // wxUSE_DRAG_AND_DROP