A number of focus handling improvements:

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 8a76d39eb5fa28b3dbf6fa1f0d86d80db700205b..d7e037b23ba20bbb0067815a85ceb93b88924c11 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -18,10 +18,10 @@
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 

-class WXDLLIMPEXP_CORE wxIcon;
-class WXDLLIMPEXP_BASE wxString;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_BASE wxString;

 
 

-class WXDLLEXPORT wxIconBundle;
+class WXDLLIMPEXP_FWD_CORE wxIconBundle;

 
 WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 


@@ -64,10 +64,15 @@ public:
     // returns the first icon in the bundle
     wxIcon GetIcon(const wxSize& size) const;
 
     // returns the first icon in the bundle
     wxIcon GetIcon(const wxSize& size) const;
 

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

     wxIcon GetIcon(wxCoord size = wxDefaultCoord) const
     wxIcon GetIcon(wxCoord size = wxDefaultCoord) const

-        { return GetIcon( wxSize( size, size ) ); }
+        { return GetIcon(wxSize(size, size)); }

 
 

+    // returns the icon exactly of the specified size or wxNullIcon if no icon
+    // of exactly given size are available
+    wxIcon GetIconOfExactSize(const wxSize& size) const;
+    wxIcon GetIconOfExactSize(wxCoord size) const
+        { return GetIconOfExactSize(wxSize(size, size)); }

 
     // enumerate all icons in the bundle: don't use these functions if ti can
     // be avoided, using GetIcon() directly is better
 
     // enumerate all icons in the bundle: don't use these functions if ti can
     // be avoided, using GetIcon() directly is better


@@ -78,6 +83,9 @@ public:
     // return the icon at index (must be < GetIconCount())
     wxIcon GetIconByIndex(size_t n) const;
 
     // return the icon at index (must be < GetIconCount())
     wxIcon GetIconByIndex(size_t n) const;
 

+    // check if we have any icons at all
+    bool IsEmpty() const { return GetIconCount() == 0; }
+

 protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;