added wxStandardPaths::GetAppDocumentsDir() and use it by default for loading/saving...

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

diff --git a/interface/wx/bitmap.h b/interface/wx/bitmap.h
index ef1996453ca5aa229cee54f931e1c1fad233f6af..b0a215917ee9024b92482f2f955da99e04137b43 100644 (file)
--- a/interface/wx/bitmap.h
+++ b/interface/wx/bitmap.h
@@ -23,6 +23,11 @@
     wxBitmapHandler and add the handler using wxBitmap::AddHandler() in your
     application initialisation.
 
     wxBitmapHandler and add the handler using wxBitmap::AddHandler() in your
     application initialisation.
 

+    Note that all wxBitmapHandlers provided by wxWidgets are part of the
+    @ref page_libs_wxcore library.
+    For details about the default handlers, please see the note in the
+    wxBitmap class documentation.
+

     @library{wxcore}
     @category{misc}
 
     @library{wxcore}
     @category{misc}
 


@@ -431,10 +436,12 @@ public:
 
         @see wxBitmapHandler
     */
 
         @see wxBitmapHandler
     */

-    static wxList GetHandlers();
+    static wxList& GetHandlers();

 
     /**
         Gets the height of the bitmap in pixels.
 
     /**
         Gets the height of the bitmap in pixels.

+
+        @see GetWidth(), GetSize()

     */
     virtual int GetHeight() const;
 
     */
     virtual int GetHeight() const;
 


@@ -460,10 +467,19 @@ public:
     */
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 
     */
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 

+    /**
+        Returns the size of the bitmap in pixels.
+
+        @since 2.9.0
+
+        @see GetHeight(), GetWidth()
+    */
+    wxSize GetSize() const;
+

     /**
         Gets the width of the bitmap in pixels.
 
     /**
         Gets the width of the bitmap in pixels.
 

-        @see GetHeight()
+        @see GetHeight(), GetSize()

     */
     virtual int GetWidth() const;
 
     */
     virtual int GetWidth() const;
 


@@ -492,7 +508,7 @@ public:
     /**
         Returns @true if bitmap data is present.
     */
     /**
         Returns @true if bitmap data is present.
     */

-    bool IsOk() const;
+    virtual bool IsOk() const;

 
     /**
         Loads a bitmap from a file or resource.
 
     /**
         Loads a bitmap from a file or resource.