extract event handler body in a separate function instead of using a hack to call...

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index eb12f06efbfd91b9d1acafee135a8e9c9d326e2e..aa5110066df80a6335d2fd4432b9f88e6e9f838e 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -104,21 +104,18 @@ enum wxFloodFillStyle
     wxFLOOD_BORDER
 };
 
-//  Mapping modes (same values as used by Windows, don't change)
+//  Mapping modes
 enum wxMappingMode
 {
     wxMM_TEXT = 1,
+    wxMM_METRIC,
     wxMM_LOMETRIC,
-    wxMM_HIMETRIC,
-    wxMM_LOENGLISH,
-    wxMM_HIENGLISH,
     wxMM_TWIPS,
-    wxMM_ISOTROPIC,
-    wxMM_ANISOTROPIC,
-    wxMM_POINTS,
-    wxMM_METRIC
+    wxMM_POINTS
 };
 
+#if WXWIN_COMPATIBILITY_2_8
+
 //-----------------------------------------------------------------------------
 // wxDrawObject helper class
 //-----------------------------------------------------------------------------
@@ -126,8 +123,7 @@ enum wxMappingMode
 class WXDLLIMPEXP_CORE wxDrawObject
 {
 public:
-
-    wxDrawObject()
+    wxDEPRECATED_CONSTRUCTOR(wxDrawObject)()
         : m_isBBoxValid(false)
         , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0)
     { }
@@ -180,6 +176,8 @@ protected:
     wxCoord m_minX, m_minY, m_maxX, m_maxY;
 };
 
+#endif // WXWIN_COMPATIBILITY_2_8
+
 
 //-----------------------------------------------------------------------------
 // wxDCFactory
@@ -370,7 +368,7 @@ public:
     // logical functions
 
     virtual void SetLogicalFunction(wxRasterOperationMode function) = 0;
-    virtual wxRasterOperationMode GetLogicalFunction() const 
+    virtual wxRasterOperationMode GetLogicalFunction() const
                                       { return m_logicalFunction; }
 
     // text measurement
@@ -704,6 +702,9 @@ private:
 class WXDLLIMPEXP_CORE wxDC : public wxObject
 {
 public:
+    // copy attributes (font, colours and writing direction) from another DC
+    void CopyAttributes(const wxDC& dc);
+
     virtual ~wxDC() { delete m_pimpl; }
 
     wxDCImpl *GetImpl()
@@ -963,15 +964,6 @@ public:
         { m_pimpl->SetDeviceLocalOrigin( x, y ); }
 
 
-    // draw generic object
-
-    void DrawObject(wxDrawObject* drawobject)
-    {
-        drawobject->Draw(*this);
-        CalcBoundingBox(drawobject->MinX(),drawobject->MinY());
-        CalcBoundingBox(drawobject->MaxX(),drawobject->MaxY());
-    }
-
     // -----------------------------------------------
     // the actual drawing API
 
@@ -1140,7 +1132,7 @@ public:
 
     bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
               wxDC *source, wxCoord xsrc, wxCoord ysrc,
-              wxRasterOperationMode rop = wxCOPY, bool useMask = false, 
+              wxRasterOperationMode rop = wxCOPY, bool useMask = false,
               wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
     {
         return m_pimpl->DoBlit(xdest, ydest, width, height,
@@ -1148,7 +1140,7 @@ public:
     }
     bool Blit(const wxPoint& destPt, const wxSize& sz,
               wxDC *source, const wxPoint& srcPt,
-              wxRasterOperationMode rop = wxCOPY, bool useMask = false, 
+              wxRasterOperationMode rop = wxCOPY, bool useMask = false,
               const wxPoint& srcPtMask = wxDefaultPosition)
     {
         return m_pimpl->DoBlit(destPt.x, destPt.y, sz.x, sz.y,
@@ -1168,7 +1160,7 @@ public:
     }
     bool StretchBlit(const wxPoint& dstPt, const wxSize& dstSize,
                      wxDC *source, const wxPoint& srcPt, const wxSize& srcSize,
-                     wxRasterOperationMode rop = wxCOPY, bool useMask = false, 
+                     wxRasterOperationMode rop = wxCOPY, bool useMask = false,
                      const wxPoint& srcMaskPt = wxDefaultPosition)
     {
         return m_pimpl->DoStretchBlit(dstPt.x, dstPt.y, dstSize.x, dstSize.y,
@@ -1203,6 +1195,7 @@ public:
     wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const );
     wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const );
 
+    wxDEPRECATED( void DrawObject(wxDrawObject* drawobject) );
 #endif  // WXWIN_COMPATIBILITY_2_8
 
 #ifdef __WXMSW__
@@ -1217,7 +1210,7 @@ protected:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxDC)
-    DECLARE_NO_COPY_CLASS(wxDC)
+    wxDECLARE_NO_COPY_CLASS(wxDC);
 };
 
 // ----------------------------------------------------------------------------
@@ -1253,7 +1246,7 @@ private:
 
     wxColour m_colFgOld;
 
-    DECLARE_NO_COPY_CLASS(wxDCTextColourChanger)
+    wxDECLARE_NO_COPY_CLASS(wxDCTextColourChanger);
 };
 
 // ----------------------------------------------------------------------------
@@ -1280,7 +1273,7 @@ private:
 
     wxPen m_penOld;
 
-    DECLARE_NO_COPY_CLASS(wxDCPenChanger)
+    wxDECLARE_NO_COPY_CLASS(wxDCPenChanger);
 };
 
 // ----------------------------------------------------------------------------
@@ -1307,7 +1300,7 @@ private:
 
     wxBrush m_brushOld;
 
-    DECLARE_NO_COPY_CLASS(wxDCBrushChanger)
+    wxDECLARE_NO_COPY_CLASS(wxDCBrushChanger);
 };
 
 // ----------------------------------------------------------------------------
@@ -1330,7 +1323,7 @@ public:
 private:
     wxDC& m_dc;
 
-    DECLARE_NO_COPY_CLASS(wxDCClipper)
+    wxDECLARE_NO_COPY_CLASS(wxDCClipper);
 };
 
 // ----------------------------------------------------------------------------
@@ -1357,7 +1350,7 @@ private:
 
     wxFont m_fontOld;
 
-    DECLARE_NO_COPY_CLASS(wxDCFontChanger)
+    wxDECLARE_NO_COPY_CLASS(wxDCFontChanger);
 };