projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in last commit
[wxWidgets.git]
/
src
/
palmos
/
metafile.cpp
diff --git
a/src/palmos/metafile.cpp
b/src/palmos/metafile.cpp
index 475c50d7ad6046106cf26087bdde4f1899dff36d..7626591e7793a2b9fcd2ea04dcebdf59d0db9139 100644
(file)
--- a/
src/palmos/metafile.cpp
+++ b/
src/palmos/metafile.cpp
@@
-1,10
+1,10
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: palmos/metafile.cpp
+// Name:
src/
palmos/metafile.cpp
// Purpose: wxMetafileDC etc.
// Purpose: wxMetafileDC etc.
-// Author: William Osborne
+// Author: William Osborne
- minimal working wxPalmOS port
// Modified by:
// Created: 10/13/04
// Modified by:
// Created: 10/13/04
-// RCS-ID: $Id
:
+// RCS-ID: $Id
$
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "metafile.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-28,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"
@@
-127,7
+119,8
@@
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 WXUNUSED(use16bit)) const
+ long *descent, long *externalLeading,
+ const wxFont *theFont, bool WXUNUSED(use16bit)) const
{
}
{
}
@@
-136,31
+129,13
@@
wxMetafile *wxMetafileDC::Close()
return NULL;
}
return NULL;
}
-void wxMetafileDC::SetMapMode(
int
mode)
+void wxMetafileDC::SetMapMode(
wxMappingMode
mode)
{
}
// ----------------------------------------------------------------------------
// wxMakeMetafilePlaceable
// ----------------------------------------------------------------------------
{
}
// ----------------------------------------------------------------------------
// wxMakeMetafilePlaceable
// ----------------------------------------------------------------------------
-#ifdef __WIN32__
-struct RECT32
-{
- short left;
- short top;
- short right;
- short bottom;
-};
-
-struct mfPLACEABLEHEADER {
- DWORD key;
- short hmf;
- RECT32 bbox;
- WORD inch;
- DWORD reserved;
- WORD checksum;
-};
-#else
struct mfPLACEABLEHEADER {
DWORD key;
HANDLE hmf;
struct mfPLACEABLEHEADER {
DWORD key;
HANDLE hmf;
@@
-169,7
+144,6
@@
struct mfPLACEABLEHEADER {
DWORD reserved;
WORD checksum;
};
DWORD reserved;
WORD checksum;
};
-#endif
/*
* Pass filename of existing non-placeable metafile, and bounding box.
/*
* Pass filename of existing non-placeable metafile, and bounding box.
@@
-213,4
+187,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
-