unset the window as invoking window of wxCurrentPopupMenu (which now exists in all...

[wxWidgets.git] / include / wx / mac / carbon / icon.h

diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h
index 2e9e0d0af93d8dca084dc7352571b8edc5d70a5e..ead16ba56bea2799a7d6d5e8c8e7c7d1da5c2d0f 100644 (file)
--- a/include/wx/mac/carbon/icon.h
+++ b/include/wx/mac/carbon/icon.h
@@ -15,7 +15,7 @@
 #include "wx/bitmap.h"
 
 // Icon
-class WXDLLEXPORT wxIcon: public wxGDIObject
+class WXDLLEXPORT wxIcon : public wxGDIObject
 {
 public:
     wxIcon();
@@ -29,6 +29,9 @@ public:
     {
       LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
     }
+
+    wxIcon(WXHICON icon, const wxSize& size);
+
     virtual ~wxIcon();
 
     bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
@@ -42,8 +45,6 @@ public:
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;
@@ -54,6 +55,11 @@ public:
 
     WXHICON GetHICON() const ;
 
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };