changed choice to properly inherit from wxChoiceBase , added msg compatible calls to wxStaticBitmap

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/statbmp.h

@@ -52,6 +52,20 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
 
   inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
 
+    // for compatibility with wxMSW
+    const wxIcon& GetIcon() const
+    {
+        // don't use wxDynamicCast, icons and bitmaps are really the same thing
+        // in wxGTK
+        return (const wxIcon &)m_messageBitmap;
+    }
+
+    // for compatibility with wxMSW
+    void  SetIcon(const wxIcon& icon)
+    {
+        SetBitmap( icon );
+    }
+
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }
 	wxSize DoGetBestSize() const ;