activating DrawRectangle optimization

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index a06217ab45365a51eb772427f9c0bcc31d72a893..34f58e266258b14b9217967f81c14a118c62e9d3 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -30,6 +30,7 @@
 #include "wx/math.h"
 #include "wx/image.h"
 #include "wx/region.h"
 #include "wx/math.h"
 #include "wx/image.h"
 #include "wx/region.h"

+#include "wx/affinematrix2d.h"

 
 #define wxUSE_NEW_DC 1
 
 
 #define wxUSE_NEW_DC 1
 


@@ -42,6 +43,10 @@ class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
 class WXDLLIMPEXP_FWD_CORE wxPrintData;
 
 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
 class WXDLLIMPEXP_FWD_CORE wxPrintData;
 

+#if wxUSE_GRAPHICS_CONTEXT
+class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
+#endif
+

 //  Logical ops
 enum wxRasterOperationMode
 {
 //  Logical ops
 enum wxRasterOperationMode
 {


@@ -278,6 +283,8 @@ public:
         return NULL;
     }
 
         return NULL;
     }
 

+    virtual void* GetHandle() const { return NULL; }
+    

     // query dimension, colour deps, resolution
 
     virtual void DoGetSize(int *width, int *height) const = 0;
     // query dimension, colour deps, resolution
 
     virtual void DoGetSize(int *width, int *height) const = 0;


@@ -426,8 +433,12 @@ public:
 
     // clipping
 
 
     // clipping
 

+    // Note that this pure virtual method has an implementation that updates
+    // the values returned by DoGetClippingBox() and so can be called from the
+    // derived class overridden version if it makes sense (i.e. if the clipping
+    // box coordinates are not already updated in some other way).

     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,

-                                     wxCoord width, wxCoord height) = 0;
+                                     wxCoord w, wxCoord h) = 0;

 
     // NB: this function works with device coordinates, not the logical ones!
     virtual void DoSetDeviceClippingRegion(const wxRegion& region) = 0;
 
     // NB: this function works with device coordinates, not the logical ones!
     virtual void DoSetDeviceClippingRegion(const wxRegion& region) = 0;


@@ -470,7 +481,7 @@ public:
     }
 
     virtual void SetLogicalScale(double x, double y);
     }
 
     virtual void SetLogicalScale(double x, double y);

-    virtual void GetLogicalScale(double *x, double *y)
+    virtual void GetLogicalScale(double *x, double *y) const

     {
         if ( x ) *x = m_logicalScaleX;
         if ( y ) *y = m_logicalScaleY;
     {
         if ( x ) *x = m_logicalScaleX;
         if ( y ) *y = m_logicalScaleY;


@@ -490,6 +501,20 @@ public:
         if ( y ) *y = m_deviceOriginY;
     }
 
         if ( y ) *y = m_deviceOriginY;
     }
 

+#if wxUSE_DC_TRANSFORM_MATRIX
+    // Transform matrix support is not available in most ports right now
+    // (currently only wxMSW provides it) so do nothing in these methods by
+    // default.
+    virtual bool CanUseTransformMatrix() const
+        { return false; }
+    virtual bool SetTransformMatrix(const wxAffineMatrix2D& WXUNUSED(matrix))
+        { return false; }
+    virtual wxAffineMatrix2D GetTransformMatrix() const
+        { return wxAffineMatrix2D(); }
+    virtual void ResetTransformMatrix()
+        { }
+#endif // wxUSE_DC_TRANSFORM_MATRIX
+

     virtual void SetDeviceLocalOrigin( wxCoord x, wxCoord y );
 
     virtual void ComputeScaleAndOrigin();
     virtual void SetDeviceLocalOrigin( wxCoord x, wxCoord y );
 
     virtual void ComputeScaleAndOrigin();


@@ -497,6 +522,19 @@ public:
     // this needs to overidden if the axis is inverted
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 
     // this needs to overidden if the axis is inverted
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 

+#ifdef __WXMSW__
+    // Native Windows functions using the underlying HDC don't honour GDI+
+    // transformations which may be applied to it. Using this function we can
+    // transform the coordinates manually before passing them to such functions
+    // (as in e.g. wxRendererMSW code). It doesn't do anything if this is not a
+    // wxGCDC.
+    virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const
+    {
+        return r;
+    }
+#endif // __WXMSW__
+
+

     // ---------------------------------------------------------
     // the actual drawing API
 
     // ---------------------------------------------------------
     // the actual drawing API
 


@@ -612,6 +650,13 @@ public:
     virtual int GetResolution() const
         { return -1; }
 
     virtual int GetResolution() const
         { return -1; }
 

+#if wxUSE_GRAPHICS_CONTEXT
+    virtual wxGraphicsContext* GetGraphicsContext() const
+        { return NULL; }
+    virtual void SetGraphicsContext( wxGraphicsContext* WXUNUSED(ctx) )
+        {}
+#endif
+

 private:
     wxDC       *m_owner;
 
 private:
     wxDC       *m_owner;
 


@@ -748,6 +793,9 @@ public:
     wxWindow *GetWindow() const
         { return m_pimpl->GetWindow(); }
 
     wxWindow *GetWindow() const
         { return m_pimpl->GetWindow(); }
 

+    void *GetHandle() const
+        { return m_pimpl->GetHandle(); }
+

     bool IsOk() const
         { return m_pimpl && m_pimpl->IsOk(); }
 
     bool IsOk() const
         { return m_pimpl && m_pimpl->IsOk(); }
 


@@ -981,7 +1029,7 @@ public:
 
     void SetLogicalScale(double x, double y)
         { m_pimpl->SetLogicalScale( x, y ); }
 
     void SetLogicalScale(double x, double y)
         { m_pimpl->SetLogicalScale( x, y ); }

-    void GetLogicalScale(double *x, double *y)
+    void GetLogicalScale(double *x, double *y) const

         { m_pimpl->GetLogicalScale( x, y ); }
 
     void SetLogicalOrigin(wxCoord x, wxCoord y)
         { m_pimpl->GetLogicalScale( x, y ); }
 
     void SetLogicalOrigin(wxCoord x, wxCoord y)


@@ -1001,6 +1049,20 @@ public:
     void SetAxisOrientation(bool xLeftRight, bool yBottomUp)
         { m_pimpl->SetAxisOrientation(xLeftRight, yBottomUp); }
 
     void SetAxisOrientation(bool xLeftRight, bool yBottomUp)
         { m_pimpl->SetAxisOrientation(xLeftRight, yBottomUp); }
 

+#if wxUSE_DC_TRANSFORM_MATRIX
+    bool CanUseTransformMatrix() const
+        { return m_pimpl->CanUseTransformMatrix(); }
+
+    bool SetTransformMatrix(const wxAffineMatrix2D &matrix)
+        { return m_pimpl->SetTransformMatrix(matrix); }
+
+    wxAffineMatrix2D GetTransformMatrix() const
+        { return m_pimpl->GetTransformMatrix(); }
+
+    void ResetTransformMatrix()
+        { m_pimpl->ResetTransformMatrix(); }
+#endif // wxUSE_DC_TRANSFORM_MATRIX
+

     // mostly internal
     void SetDeviceLocalOrigin( wxCoord x, wxCoord y )
         { m_pimpl->SetDeviceLocalOrigin( x, y ); }
     // mostly internal
     void SetDeviceLocalOrigin( wxCoord x, wxCoord y )
         { m_pimpl->SetDeviceLocalOrigin( x, y ); }


@@ -1287,6 +1349,17 @@ public:
     TempHDC GetTempHDC() { return TempHDC(*this); }
 #endif // __WXMSW__
 
     TempHDC GetTempHDC() { return TempHDC(*this); }
 #endif // __WXMSW__
 

+#if wxUSE_GRAPHICS_CONTEXT
+    virtual wxGraphicsContext* GetGraphicsContext() const
+    {
+        return m_pimpl->GetGraphicsContext();
+    }
+    virtual void SetGraphicsContext( wxGraphicsContext* ctx )
+    {
+        m_pimpl->SetGraphicsContext(ctx);
+    }
+#endif
+

 protected:
     // ctor takes ownership of the pointer
     wxDC(wxDCImpl *pimpl) : m_pimpl(pimpl) { }
 protected:
     // ctor takes ownership of the pointer
     wxDC(wxDCImpl *pimpl) : m_pimpl(pimpl) { }


@@ -1315,13 +1388,13 @@ public:
 
     ~wxDCTextColourChanger()
     {
 
     ~wxDCTextColourChanger()
     {

-        if ( m_colFgOld.Ok() )
+        if ( m_colFgOld.IsOk() )

             m_dc.SetTextForeground(m_colFgOld);
     }
 
     void Set(const wxColour& col)
     {
             m_dc.SetTextForeground(m_colFgOld);
     }
 
     void Set(const wxColour& col)
     {

-        if ( !m_colFgOld.Ok() )
+        if ( !m_colFgOld.IsOk() )

             m_colFgOld = m_dc.GetTextForeground();
         m_dc.SetTextForeground(col);
     }
             m_colFgOld = m_dc.GetTextForeground();
         m_dc.SetTextForeground(col);
     }


@@ -1349,7 +1422,7 @@ public:
 
     ~wxDCPenChanger()
     {
 
     ~wxDCPenChanger()
     {

-        if ( m_penOld.Ok() )
+        if ( m_penOld.IsOk() )

             m_dc.SetPen(m_penOld);
     }
 
             m_dc.SetPen(m_penOld);
     }
 


@@ -1376,7 +1449,7 @@ public:
 
     ~wxDCBrushChanger()
     {
 
     ~wxDCBrushChanger()
     {

-        if ( m_brushOld.Ok() )
+        if ( m_brushOld.IsOk() )

             m_dc.SetBrush(m_brushOld);
     }
 
             m_dc.SetBrush(m_brushOld);
     }
 


@@ -1432,14 +1505,14 @@ public:
 
     void Set(const wxFont& font)
     {
 
     void Set(const wxFont& font)
     {

-        if ( !m_fontOld.Ok() )
+        if ( !m_fontOld.IsOk() )

             m_fontOld = m_dc.GetFont();
         m_dc.SetFont(font);
     }
 
     ~wxDCFontChanger()
     {
             m_fontOld = m_dc.GetFont();
         m_dc.SetFont(font);
     }
 
     ~wxDCFontChanger()
     {

-        if ( m_fontOld.Ok() )
+        if ( m_fontOld.IsOk() )

             m_dc.SetFont(m_fontOld);
     }
 
             m_dc.SetFont(m_fontOld);
     }