wxDateTime timezone functions now dynamic (no caching).

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 1fd9da829b5c1a2912131772ba6f074df75cffa7..aa5110066df80a6335d2fd4432b9f88e6e9f838e 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -104,19 +104,14 @@ 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
@@ -373,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
@@ -707,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()
@@ -1134,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,
@@ -1142,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,
@@ -1162,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,
@@ -1212,7 +1210,7 @@ protected:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxDC)
-    DECLARE_NO_COPY_CLASS(wxDC)
+    wxDECLARE_NO_COPY_CLASS(wxDC);
 };
 
 // ----------------------------------------------------------------------------
@@ -1248,7 +1246,7 @@ private:
 
     wxColour m_colFgOld;
 
-    DECLARE_NO_COPY_CLASS(wxDCTextColourChanger)
+    wxDECLARE_NO_COPY_CLASS(wxDCTextColourChanger);
 };
 
 // ----------------------------------------------------------------------------
@@ -1275,7 +1273,7 @@ private:
 
     wxPen m_penOld;
 
-    DECLARE_NO_COPY_CLASS(wxDCPenChanger)
+    wxDECLARE_NO_COPY_CLASS(wxDCPenChanger);
 };
 
 // ----------------------------------------------------------------------------
@@ -1302,7 +1300,7 @@ private:
 
     wxBrush m_brushOld;
 
-    DECLARE_NO_COPY_CLASS(wxDCBrushChanger)
+    wxDECLARE_NO_COPY_CLASS(wxDCBrushChanger);
 };
 
 // ----------------------------------------------------------------------------
@@ -1325,7 +1323,7 @@ public:
 private:
     wxDC& m_dc;
 
-    DECLARE_NO_COPY_CLASS(wxDCClipper)
+    wxDECLARE_NO_COPY_CLASS(wxDCClipper);
 };
 
 // ----------------------------------------------------------------------------
@@ -1352,7 +1350,7 @@ private:
 
     wxFont m_fontOld;
 
-    DECLARE_NO_COPY_CLASS(wxDCFontChanger)
+    wxDECLARE_NO_COPY_CLASS(wxDCFontChanger);
 };