synchronize GTK2 minimum version in docs

[wxWidgets.git] / interface / wx / graphics.h

diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h
index 086bf1e952a1b5e64d470dd7a3ab6c08b365ee62..ac46f91a3135155f0cb71b76f9f4b0a3a8aaded1 100644 (file)
--- a/interface/wx/graphics.h
+++ b/interface/wx/graphics.h
@@ -296,6 +296,14 @@ public:
         @since 2.9.3
      */
     wxImage ConvertToImage() const;
         @since 2.9.3
      */
     wxImage ConvertToImage() const;

+
+    /**
+        Return the pointer to the native bitmap data. (CGImageRef for Core Graphics, 
+        cairo_surface_t for Cairo, Bitmap* for GDI+.)
+
+        @since 2.9.4
+     */
+    void* GetNativeBitmap() const;

 };
 
 /**
 };
 
 /**


@@ -512,6 +520,14 @@ public:
                                           wxDouble tx = 0.0,
                                           wxDouble ty = 0.0) const;
 
                                           wxDouble tx = 0.0,
                                           wxDouble ty = 0.0) const;
 

+    /**
+        Creates a native affine transformation matrix from the passed
+        generic one.
+
+        @since 2.9.4
+    */
+    wxGraphicsMatrix CreateMatrix(const wxAffineMatrix2DBase& mat) const;
+

     /**
         Creates a native graphics path which is initially empty.
     */
     /**
         Creates a native graphics path which is initially empty.
     */


@@ -787,15 +803,17 @@ public:
     virtual wxAntialiasMode GetAntialiasMode() const ;
 
     /**
     virtual wxAntialiasMode GetAntialiasMode() const ;
 
     /**

-        Sets the interpolation quality, returns true if it supported
+        Sets the interpolation quality, returns true if it is supported.
+
+        Not implemented in Cairo backend currently.

      */
     virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) = 0;
      */
     virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) = 0;

-    
+

     /**
     /**

-        Returns the current interpolation quality
+        Returns the current interpolation quality.

      */
     virtual wxInterpolationQuality GetInterpolationQuality() const;
      */
     virtual wxInterpolationQuality GetInterpolationQuality() const;

-    
+

     /**
         Sets the compositing operator, returns true if it supported
     */
     /**
         Sets the compositing operator, returns true if it supported
     */


@@ -807,6 +825,23 @@ public:
     virtual wxCompositionMode GetCompositionMode() const;
 
 
     virtual wxCompositionMode GetCompositionMode() const;
 
 

+    /**
+       Push the current state of the context's transformation matrix on a
+       stack.
+
+       @see wxGraphicsContext::PopState
+    */
+    virtual void PushState() = 0;
+
+    /**
+       Pops a stored state from the stack and sets the current transformation
+       matrix to that state.
+
+       @see wxGraphicsContext::PopState
+    */
+    virtual void PopState() = 0;
+
+

     virtual void EnableOffset(bool enable = true);
     void DisableOffset();
     bool OffsetEnabled();
     virtual void EnableOffset(bool enable = true);
     void DisableOffset();
     bool OffsetEnabled();


@@ -969,6 +1004,13 @@ public:
      */
     virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) = 0;
 
      */
     virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) = 0;
 

+    /**
+       Creates a wxImage from a wxGraphicsBitmap.
+
+       This method is used by the more convenient wxGraphicsBitmap::ConvertToImage.
+    */
+    virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) = 0;
+

     /**
         Creates wxGraphicsBitmap from a native bitmap handle.
 
     /**
         Creates wxGraphicsBitmap from a native bitmap handle.
 


@@ -1257,7 +1299,10 @@ public:
     virtual bool IsIdentity() const;
 
     /**
     virtual bool IsIdentity() const;
 
     /**

-        Rotates this matrix (in radians).
+        Rotates this matrix clockwise (in radians).
+
+        @param radians
+            Rotation angle in radians, clockwise.

     */
     virtual void Rotate(wxDouble angle);
 
     */
     virtual void Rotate(wxDouble angle);