merged in the commit from the 2.2 branch

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

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 3ad130904a4b1633091f0da6955d786e49d8040f..e625e91d072de0ad739c22b1a26ccce09eba6a75 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$
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,16 +17,41 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
+   #include "wx/window.h"
+#endif
+
+#ifdef __WXMSW__
+   #include "wx/msw/private.h"

 #endif
 
 #include "wx/dc.h"
 
 #endif
 
 #include "wx/dc.h"
 

-void wxDCBase::DrawLines(const wxList *list, long xoffset, long yoffset)
+void wxDCBase::DoDrawCheckMark(wxCoord x1, wxCoord y1,
+                               wxCoord width, wxCoord height)
+{
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    wxCoord x2 = x1 + width,
+            y2 = y1 + height;
+
+    // this is to yield width of 3 for width == height == 10
+    SetPen(wxPen(GetTextForeground(), (width + height + 1) / 7, wxSOLID));
+
+    // we're drawing a scaled version of wx/generic/tick.xpm here
+    wxCoord x3 = x1 + (4*width) / 10,   // x of the tick bottom
+            y3 = y1 + height / 2;       // y of the left tick branch
+    DoDrawLine(x1, y3, x3, y2);
+    DoDrawLine(x3, y2, x2, y1);
+
+    CalcBoundingBox(x1, y1);
+    CalcBoundingBox(x2, y2);
+}
+
+void wxDCBase::DrawLines(const wxList *list, wxCoord xoffset, wxCoord yoffset)

 {
     int n = list->Number();
     wxPoint *points = new wxPoint[n];
 {
     int n = list->Number();
     wxPoint *points = new wxPoint[n];


@@ -46,7 +71,7 @@ void wxDCBase::DrawLines(const wxList *list, long xoffset, long yoffset)
 
 
 void wxDCBase::DrawPolygon(const wxList *list,
 
 
 void wxDCBase::DrawPolygon(const wxList *list,

-                           long xoffset, long yoffset,
+                           wxCoord xoffset, wxCoord yoffset,

                            int fillStyle)
 {
     int n = list->Number();
                            int fillStyle)
 {
     int n = list->Number();


@@ -69,7 +94,7 @@ void wxDCBase::DrawPolygon(const wxList *list,
 #if wxUSE_SPLINES
 
 // TODO: this API needs fixing (wxPointList, why (!const) "wxList *"?)
 #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;
 
 {
     wxList point_list;