1. new wxList code

[wxWidgets.git] / include / wx / msw / dc.h

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 1b4c0457a2b3b8c4bacf29f12cdfdff19789ef3a..983845e5a80372f9ee9cee5d97bc83e3d29804bd 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DCH__
-#define __DCH__
+#ifndef _WX_DC_H_
+#define _WX_DC_H_

 
 #ifdef __GNUG__
 #pragma interface "dc.h"
 
 #ifdef __GNUG__
 #pragma interface "dc.h"


@@ -52,15 +52,15 @@ public:
   }
 
   virtual void CrossHair(long x, long y) ;
   }
 
   virtual void CrossHair(long x, long y) ;

-  virtual void CrossHair(const wxPoint& pt)
+  inline void CrossHair(const wxPoint& pt)

   {
     CrossHair(pt.x, pt.y);
   }
 
   {
     CrossHair(pt.x, pt.y);
   }
 

-  virtual void DrawArc(long x1,long y1,long x2,long y2,double xc, double yc);
-  inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, double xc, double yc)
+  virtual void DrawArc(long x1,long y1,long x2,long y2,long xc, long yc);
+  inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)

   {
   {

-    DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, xc, yc);
+    DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y);

   }
 
   virtual void DrawEllipticArc (long x, long y, long w, long h, double sa, double ea);
   }
 
   virtual void DrawEllipticArc (long x, long y, long w, long h, double sa, double ea);


@@ -133,7 +133,7 @@ public:
     return Blit(destPt.x, destPt.y, sz.x, sz.y, source, srcPt.x, srcPt.y, rop, useMask);
   }
 
     return Blit(destPt.x, destPt.y, sz.x, sz.y, source, srcPt.x, srcPt.y, rop, useMask);
   }
 

-#if USE_SPLINES
+#if wxUSE_SPLINES

   // Splines
   // 3-point spline
   virtual void DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3);
   // Splines
   // 3-point spline
   virtual void DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3);


@@ -261,6 +261,10 @@ public:
     GetClippingBox(&x, &y, &w, &h); rect.x = x; rect.y = y; rect.width = w; rect.height = h;
   }
 
     GetClippingBox(&x, &y, &w, &h); rect.x = x; rect.y = y; rect.width = w; rect.height = h;
   }
 

+  // This should probably be made available on other platforms
+  int wxDC::GetDepth(void) const ;
+
+// Implementation

   virtual void SetRop(WXHDC cdc);
   virtual void DoClipping(WXHDC cdc);
   virtual void SelectOldObjects(WXHDC dc);
   virtual void SetRop(WXHDC cdc);
   virtual void DoClipping(WXHDC cdc);
   virtual void SelectOldObjects(WXHDC dc);


@@ -412,4 +416,4 @@ extern int wxPageNumber;
 
 
 #endif
 
 
 #endif

-    // __DCH__
+    // _WX_DC_H_