RCS-IDs

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

diff --git a/interface/wx/image.h b/interface/wx/image.h
index 9982ee2044e94af25147e755183e3ced5882ddea..9e7028b0ccc1427a8ee2ee3f47ea4e426e847684 100644 (file)
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -39,7 +39,7 @@ public:
     /**
         Destroys the wxImageHandler object.
     */
-    ~wxImageHandler();
+    virtual ~wxImageHandler();
 
     /**
         Gets the file extension associated with this handler.
@@ -58,7 +58,7 @@ public:
         @return Number of available images. For most image handlers, this is 1
                  (exceptions are TIFF and ICO formats).
     */
-    int GetImageCount(wxInputStream& stream);
+    virtual int GetImageCount(wxInputStream& stream);
 
     /**
         Gets the MIME type associated with this handler.
@@ -312,7 +312,7 @@ public:
         See @ref overview_refcountdestruct "reference-counted object destruction" for
         more info.
     */
-    ~wxImage();
+    virtual ~wxImage();
 
     /**
         Register an image handler.
@@ -326,7 +326,7 @@ public:
 
         @see BlurHorizontal(), BlurVertical()
     */
-    wxImage Blur(int blurRadius);
+    wxImage Blur(int blurRadius) const;
 
     /**
         Blurs the image in the horizontal direction only. This should not be used
@@ -334,7 +334,7 @@ public:
 
         @see Blur(), BlurVertical()
     */
-    wxImage BlurHorizontal(int blurRadius);
+    wxImage BlurHorizontal(int blurRadius) const;
 
     /**
         Blurs the image in the vertical direction only. This should not be used
@@ -342,12 +342,12 @@ public:
 
         @see Blur(), BlurHorizontal()
     */
-    wxImage BlurVertical(int blurRadius);
+    wxImage BlurVertical(int blurRadius) const;
 
     /**
         Returns @true if the current image handlers can read this file
     */
-    bool CanRead(const wxString& filename);
+    static bool CanRead(const wxString& filename);
 
     /**
         Deletes all image handlers.
@@ -436,10 +436,9 @@ public:
         @return Returns @false if there is no unused colour left, @true on success.
     */
     bool FindFirstUnusedColour(unsigned char* r, unsigned char* g,
-                               unsigned char* b,
-                               unsigned char startR = 1,
+                               unsigned char* b, unsigned char startR = 1,
                                unsigned char startG = 0,
-                               unsigned char startB = 0);
+                               unsigned char startB = 0) const;
 
     //@{
     /**
@@ -853,7 +852,7 @@ public:
     */
     wxImage Rotate(double angle, const wxPoint& rotationCentre,
                    bool interpolating = true,
-                   wxPoint* offsetAfterRotation = NULL);
+                   wxPoint* offsetAfterRotation = NULL) const;
 
     /**
         Returns a copy of the image rotated 90 degrees in the direction
@@ -1027,6 +1026,25 @@ public:
                 unsigned char green,
                 unsigned char blue);
 
+    /**
+        Set the type of image returned by GetType().
+
+        This method is mostly used internally by the library but can also be
+        called from the user code if the image was created from data in the
+        given bitmap format without using LoadFile() (which would set the type
+        correctly automatically).
+
+        Notice that the image must be created before this function is called.
+
+        @since 2.9.0
+
+        @param type
+            One of bitmap type constants, @c wxBITMAP_TYPE_INVALID is a valid
+            value for it and can be used to reset the bitmap type to default
+            but @c wxBITMAP_TYPE_MAX is not allowed here.
+    */
+    void SetType(wxBitmapType type);
+
     /**
         Returns a resized version of this image without scaling it by adding either a
         border