some conflicts resolved

[wxWidgets.git] / src / common / dcbase.cpp

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 114771cbb9ccfe6bcd29f2242d38e6d32512df07..a95db6adcca844f52bf34685f1a06fd72ace51a3 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     05/25/99
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -17,17 +17,20 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
    #include "wx/window.h"
+#endif
+
+#ifdef __WXMSW__
    #include "wx/msw/private.h"
 #endif
 
 #include "wx/dc.h"
 
-void wxDCBase::DrawLines(const wxList *list, long xoffset, long yoffset)
+void wxDCBase::DrawLines(const wxList *list, wxCoord xoffset, wxCoord yoffset)
 {
     int n = list->Number();
     wxPoint *points = new wxPoint[n];
@@ -47,7 +50,7 @@ void wxDCBase::DrawLines(const wxList *list, long xoffset, long yoffset)
 
 
 void wxDCBase::DrawPolygon(const wxList *list,
-                           long xoffset, long yoffset,
+                           wxCoord xoffset, wxCoord yoffset,
                            int fillStyle)
 {
     int n = list->Number();
@@ -70,7 +73,7 @@ void wxDCBase::DrawPolygon(const wxList *list,
 #if wxUSE_SPLINES
 
 // TODO: this API needs fixing (wxPointList, why (!const) "wxList *"?)
-void wxDCBase::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3)
+void wxDCBase::DrawSpline(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord x3, wxCoord y3)
 {
     wxList point_list;