cvs to svn

[wxWidgets.git] / src / cocoa / dc.mm

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index 4c1ad172aa2dfe62d23f81e45dd9b9012360bf43..375bf3a3dd27e618228d4bb9eba159d483a818c8 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -15,6 +15,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/math.h" //math constants
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
@@ -30,7 +31,6 @@
 #import <AppKit/NSTypesetter.h>
 #import <AppKit/NSImage.h>
 
-#include "wx/math.h" //math constants
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxCocoaDCStack);
 
@@ -230,7 +230,7 @@ void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
     [bezpath stroke];
 }
 
-void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, wxFont *theFont) const
+void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, const wxFont *theFont) const
 {
     wxAutoNSAutoreleasePool pool;
 // FIXME: Cache this so it can be used for DoDrawText
@@ -323,47 +323,6 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
     [context restoreGraphicsState];
 }
 
-// wxDCBase functions
-int wxDCBase::DeviceToLogicalX(int x) const
-{
-    return x;
-}
-
-int wxDCBase::DeviceToLogicalY(int y) const
-{
-    return y;
-}
-
-int wxDCBase::DeviceToLogicalXRel(int x) const
-{
-    return x;
-}
-
-int wxDCBase::DeviceToLogicalYRel(int y) const
-{
-    return y;
-}
-
-int wxDCBase::LogicalToDeviceX(int x) const
-{
-    return x;
-}
-
-int wxDCBase::LogicalToDeviceY(int y) const
-{
-    return y;
-}
-
-int wxDCBase::LogicalToDeviceXRel(int x) const
-{
-    return x;
-}
-
-int wxDCBase::LogicalToDeviceYRel(int y) const
-{
-    return y;
-}
-
 ///////////////////////////////////////////////////////////////////////////
 // cut here, the rest is stubs
 ///////////////////////////////////////////////////////////////////////////