Don't interpret '&' specially in wxTextWrapper.

[wxWidgets.git] / include / wx / osx / icon.h

diff --git a/include/wx/osx/icon.h b/include/wx/osx/icon.h
index 76113f712130ece3d612e0fe6dce3eaac1633ce5..d0b2d80be80ae23ab039a3e987309c3190d077ae 100644 (file)
--- a/include/wx/osx/icon.h
+++ b/include/wx/osx/icon.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        icon.h
+// Name:        wx/osx/icon.h

 // Purpose:     wxIcon class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxIcon class
 // Author:      Stefan Csomor
 // Modified by:


@@ -50,6 +50,8 @@ public:
     void SetDepth(int d);
     void SetOk(bool isOk);
 
     void SetDepth(int d);
     void SetOk(bool isOk);
 

+    wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
+

     WXHICON GetHICON() const;
 
 protected:
     WXHICON GetHICON() const;
 
 protected:


@@ -58,6 +60,11 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)

+
+    bool LoadIconFromSystemResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
+    bool LoadIconFromBundleResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
+    bool LoadIconFromFile(const wxString& filename, int desiredWidth, int desiredHeight);
+    bool LoadIconAsBitmap(const wxString& filename, wxBitmapType flags = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1);

 };
 
 class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler
 };
 
 class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler