Don't return a dangling pointer from wxDateTime::ParseXXX(wxCStrData).

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 75aa51c653a53131bf3e11159644b90d06dd3766..0955e716546bee1d6b3409fbf83c7ad4a0a5764c 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -13,10 +13,13 @@
 #define _WX_ICONBNDL_H_
 
 #include "wx/gdiobj.h"
 #define _WX_ICONBNDL_H_
 
 #include "wx/gdiobj.h"

-// for wxSize
-#include "wx/gdicmn.h"
+#include "wx/gdicmn.h"      // for wxSize

 #include "wx/icon.h"
 
 #include "wx/icon.h"
 

+#include "wx/dynarray.h"
+
+class WXDLLIMPEXP_FWD_BASE wxInputStream;
+

 WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 
 // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE,
 WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 
 // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE,


@@ -25,11 +28,33 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 class WXDLLIMPEXP_CORE wxIconBundle : public wxGDIObject
 {
 public:
 class WXDLLIMPEXP_CORE wxIconBundle : public wxGDIObject
 {
 public:

+    // Flags that determine what happens if GetIcon() doesn't find the icon of
+    // exactly the requested size.
+    enum
+    {
+        // Return invalid icon if exact size is not found.
+        FALLBACK_NONE = 0,
+
+        // Return the icon of the system icon size if exact size is not found.
+        // May be combined with other non-NONE enum elements to determine what
+        // happens if the system icon size is not found neither.
+        FALLBACK_SYSTEM = 1,
+
+        // Return the icon of closest larger size or, if there is no icon of
+        // larger size in the bundle, the closest icon of smaller size.
+        FALLBACK_NEAREST_LARGER = 2
+    };
+

     // default constructor
     wxIconBundle();
 
     // initializes the bundle with the icon(s) found in the file
     // default constructor
     wxIconBundle();
 
     // initializes the bundle with the icon(s) found in the file

-    wxIconBundle(const wxString& file, wxBitmapType type);
+#if wxUSE_STREAMS && wxUSE_IMAGE
+#if wxUSE_FFILE || wxUSE_FILE
+    wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
+#endif // wxUSE_FFILE || wxUSE_FILE
+    wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
+#endif // wxUSE_STREAMS && wxUSE_IMAGE

 
     // initializes the bundle with a single icon
     wxIconBundle(const wxIcon& icon);
 
     // initializes the bundle with a single icon
     wxIconBundle(const wxIcon& icon);


@@ -39,7 +64,12 @@ public:
     // adds all the icons contained in the file to the collection,
     // if the collection already contains icons with the same
     // width and height, they are replaced
     // adds all the icons contained in the file to the collection,
     // if the collection already contains icons with the same
     // width and height, they are replaced

-    void AddIcon(const wxString& file, wxBitmapType type);
+#if wxUSE_STREAMS && wxUSE_IMAGE
+#if wxUSE_FFILE || wxUSE_FILE
+    void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
+#endif // wxUSE_FFILE || wxUSE_FILE
+    void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
+#endif // wxUSE_STREAMS && wxUSE_IMAGE

 
     // adds the icon to the collection, if the collection already
     // contains an icon with the same width and height, it is
 
     // adds the icon to the collection, if the collection already
     // contains an icon with the same width and height, it is


@@ -47,13 +77,13 @@ public:
     void AddIcon(const wxIcon& icon);
 
     // returns the icon with the given size; if no such icon exists,
     void AddIcon(const wxIcon& icon);
 
     // returns the icon with the given size; if no such icon exists,

-    // returns the icon with size wxSYS_ICON_[XY]; if no such icon exists,
-    // returns the first icon in the bundle
-    wxIcon GetIcon(const wxSize& size) const;
+    // behavior is specified by the flags.
+    wxIcon GetIcon(const wxSize& size, int flags = FALLBACK_SYSTEM) const;

 
     // equivalent to GetIcon(wxSize(size, size))
 
     // equivalent to GetIcon(wxSize(size, size))

-    wxIcon GetIcon(wxCoord size = wxDefaultCoord) const
-        { return GetIcon(wxSize(size, size)); }
+    wxIcon GetIcon(wxCoord size = wxDefaultCoord,
+                   int flags = FALLBACK_SYSTEM) const
+        { return GetIcon(wxSize(size, size), flags); }

 
     // returns the icon exactly of the specified size or wxNullIcon if no icon
     // of exactly given size are available
 
     // returns the icon exactly of the specified size or wxNullIcon if no icon
     // of exactly given size are available


@@ -74,18 +104,19 @@ public:
     bool IsEmpty() const { return GetIconCount() == 0; }
 
 #if WXWIN_COMPATIBILITY_2_8
     bool IsEmpty() const { return GetIconCount() == 0; }
 
 #if WXWIN_COMPATIBILITY_2_8

+#if wxUSE_STREAMS && wxUSE_IMAGE && (wxUSE_FFILE || wxUSE_FILE)

     wxDEPRECATED( void AddIcon(const wxString& file, long type)
         {
             AddIcon(file, (wxBitmapType)type);
         }
     )
     wxDEPRECATED( void AddIcon(const wxString& file, long type)
         {
             AddIcon(file, (wxBitmapType)type);
         }
     )

-    // explicitly specifying inline allows gcc < 3.4 to
-    // handle the deprecation attribute even in the constructor.
-    wxDEPRECATED( inline wxIconBundle (const wxString& file, long type)
+
+    wxDEPRECATED_CONSTRUCTOR( wxIconBundle (const wxString& file, long type)

         {
             AddIcon(file, (wxBitmapType)type);
         }
     )
         {
             AddIcon(file, (wxBitmapType)type);
         }
     )

+#endif // wxUSE_STREAMS && wxUSE_IMAGE && (wxUSE_FFILE || wxUSE_FILE)

 #endif // WXWIN_COMPATIBILITY_2_8
 
 protected:
 #endif // WXWIN_COMPATIBILITY_2_8
 
 protected: