X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..32a95f9f1a4a0ed0f569394e379f220666a8e47f:/include/wx/msw/dc.h

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 8d90a1797b..07d81cb653 100644
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -21,6 +21,20 @@
 #include "wx/icon.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
+#include "wx/window.h"
+
+// Clash with Windows header files
+#ifdef StartDoc
+#undef StartDoc
+#endif
+
+#ifdef DrawText
+#undef DrawText
+#endif
+
+#ifdef GetCharWidth
+#undef GetCharWidth
+#endif
 
 class WXDLLEXPORT wxDC: public wxObject
 {
@@ -30,8 +44,13 @@ public:
   wxDC(void);
   ~wxDC(void);
 
+#ifdef WX_COMP_INLINE_NO_CLASS
+  inline void BeginDrawing(void) {}
+  inline void EndDrawing(void) {}
+#else
   inline void wxDC::BeginDrawing(void) {}
   inline void wxDC::EndDrawing(void) {}
+#endif
 
   virtual void FloodFill(long x1, long y1, const wxColour& col, int style=wxFLOOD_SURFACE) ;
   inline void FloodFill(const wxPoint& pt, const wxColour& col, int style=wxFLOOD_SURFACE)
@@ -52,15 +71,15 @@ public:
   }
 
   virtual void CrossHair(long x, long y) ;
-  virtual void CrossHair(const wxPoint& pt)
+  inline void CrossHair(const wxPoint& pt)
   {
     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);
@@ -115,6 +134,8 @@ public:
     DrawIcon(icon, pt.x, pt.y);
   }
 
+  virtual void DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask=FALSE );
+
   inline void DrawPoint(wxPoint& point) { DrawPoint(point.x, point.y); }
   virtual void DrawLines(wxList *list, long xoffset = 0, long yoffset = 0);
   virtual void DrawPolygon(wxList *list, long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE);
@@ -133,7 +154,7 @@ public:
     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);
@@ -158,6 +179,7 @@ public:
   {
     SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
   }
+  virtual void SetClippingRegion(const wxRegion& region);
 
   virtual void SetPalette(const wxPalette& palette);
 #if WXWIN_COMPATIBILITY
@@ -177,10 +199,14 @@ public:
 
   // Size in device units
   virtual void GetSize(int* width, int* height) const;
-  inline wxSize GetSize(void) const { int w, h; GetSize(&w, &h); return wxSize(w, h); }
+  inline wxSize GetSize() const { int w, h; GetSize(&w, &h); return wxSize(w, h); }
 
   // Size in mm
-  virtual void GetSizeMM(long* width, long* height) const ;
+  virtual void GetSizeMM(int* width, int* height) const ;
+  inline wxSize GetSizeMM() const { int w, h; GetSizeMM(&w, &h); return wxSize(w, h); }
+
+  // Resolution in Pixels per inch
+  virtual wxSize GetPPI(void) const ;
 
   // Compatibility
 #if WXWIN_COMPATIBILITY
@@ -232,11 +258,11 @@ public:
   inline virtual bool Ok(void) const {return m_ok;};
   inline virtual int  GetMapMode(void) const {return m_mappingMode;};
 
-  inline virtual wxBrush *GetBackground(void) const { return (wxBrush*) &m_backgroundBrush ;}
-  inline virtual wxBrush *GetBrush(void) const { return (wxBrush*) &m_brush ;}
-  inline virtual wxFont  *GetFont(void) const { return (wxFont*) &m_font ;}
+  inline virtual wxBrush& GetBackground(void) const { return (wxBrush&) m_backgroundBrush ;}
+  inline virtual wxBrush& GetBrush(void) const { return (wxBrush&) m_brush ;}
+  inline virtual wxFont& GetFont(void) const { return (wxFont&) m_font ;}
   inline virtual int      GetLogicalFunction(void) const { return m_logicalFunction ;}
-  inline virtual wxPen   *GetPen(void) const { return (wxPen*) &m_pen ;}
+  inline virtual wxPen&   GetPen(void) const { return (wxPen&) m_pen ;}
   inline virtual wxColour&GetTextBackground(void) const { return (wxColour&) m_textBackgroundColour ;}
   inline virtual wxColour&GetTextForeground(void) const { return (wxColour&) m_textForegroundColour ;}
 
@@ -261,6 +287,14 @@ public:
     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
+#ifdef WX_COMP_INLINE_NO_CLASS
+  int GetDepth(void) const ;
+#else
+  int wxDC::GetDepth(void) const ;
+#endif
+
+// Implementation
   virtual void SetRop(WXHDC cdc);
   virtual void DoClipping(WXHDC cdc);
   virtual void SelectOldObjects(WXHDC dc);
@@ -321,7 +355,6 @@ protected:
 
   wxWindow *        m_canvas;
   wxBitmap          m_selectedBitmap;
-  wxString          m_filename;
 
   // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
   bool              m_bOwnsDC;
@@ -390,8 +423,8 @@ protected:
 #define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x)
 #define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y)
 
-#define MM_POINTS      7
-#define MM_METRIC      8
+#define MM_POINTS      9
+#define MM_METRIC     10
 
 extern int wxPageNumber;