1. fixed bug with MDI child frames changign state when parent frame was

[wxWidgets.git] / include / wx / gtk / statbmp.h

diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h
index c24b2128705a0dbba740a6432fa782fbf53028d2..f56a5d4d569fd60864b5dfa1a486a246298e34fa 100644 (file)
--- a/include/wx/gtk/statbmp.h
+++ b/include/wx/gtk/statbmp.h
@@ -22,6 +22,7 @@
 #include "wx/object.h"
 #include "wx/control.h"
 #include "wx/bitmap.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -66,10 +67,26 @@ public:
     const wxBitmap& GetBitmap() const { return m_bitmap; }
 
     // for compatibility with wxMSW
-    wxIcon& GetIcon()
-        { return *(wxDynamicCast(&m_bitmap, wxIcon)); }
+    const wxIcon& GetIcon() const
+    {
+        // don't use wxDynamicCast, icons and bitmaps are really the same thing
+        // in wxGTK
+        return (const wxIcon &)m_bitmap;
+    }
+
+    // for compatibility with wxMSW
+    void  SetIcon(const wxIcon& icon)
+    {
+        SetBitmap( icon );
+    }
+
+protected:
+    virtual wxSize DoGetBestSize() const;
 
 private:
+    // creates the new pixmap widget
+    void CreatePixmapWidget();
+
     wxBitmap   m_bitmap;
 };