Apply [ 1713345 ] combobox: cmd accelerators shouldn't steal editing hotkeys

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

diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h
index 93e822526db4e00d5473938017af3e40cc4a4059..8e4214f31d604a9b3921ce233e7989749f05a3de 100644 (file)
--- a/include/wx/cocoa/icon.h
+++ b/include/wx/cocoa/icon.h
@@ -6,7 +6,7 @@
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_ICON_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_ICON_H__


@@ -33,7 +33,7 @@ public:
     {
         LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
     }
     {
         LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
     }

-    ~wxIcon();
+    virtual ~wxIcon();

 
     bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
         int desiredWidth /* = -1 */ , int desiredHeight = -1);
 
     bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
         int desiredWidth /* = -1 */ , int desiredHeight = -1);


@@ -49,7 +49,8 @@ public:
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     int GetWidth() const;
     int GetHeight() const;
 
     int GetWidth() const;
     int GetHeight() const;
 


@@ -57,4 +58,5 @@ public:
     bool CreateFromXpm(const char **bits);
 };
 
     bool CreateFromXpm(const char **bits);
 };
 

-#endif // _WX_COCOA_ICON_H__
+#endif
+    // _WX_COCOA_ICON_H__