Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / palmos / metafile.cpp

diff --git a/src/palmos/metafile.cpp b/src/palmos/metafile.cpp
index 67497d22e24ffc22c45433beb58aaaf984f3f7ea..7626591e7793a2b9fcd2ea04dcebdf59d0db9139 100644 (file)
--- a/src/palmos/metafile.cpp
+++ b/src/palmos/metafile.cpp
@@ -24,10 +24,6 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/setup.h"
-#endif
-
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
@@ -123,7 +119,8 @@ wxMetafileDC::~wxMetafileDC()
 }
 
 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
 {
 }
 
@@ -132,7 +129,7 @@ wxMetafile *wxMetafileDC::Close()
     return NULL;
 }
 
-void wxMetafileDC::SetMapMode(int mode)
+void wxMetafileDC::SetMapMode(wxMappingMode mode)
 {
 }
 
@@ -190,4 +187,3 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 #endif // wxUSE_DRAG_AND_DROP
 
 #endif // wxUSE_METAFILE
-