applied patch 446014 (misc mingw fixes from Mattia)

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index fb294bbc600f83c42e3a18c3253bd36afddfcb57..31dbb6c88f21efb7229bd6d731f1cbb5ccca515f 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.h
-// Purpose:     wxStaticBitmap class
+// Name:        wx/msw/statbmp.h
+// Purpose:     wxStaticBitmap class for wxMSW
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
@@ -23,10 +23,8 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 
 // a control showing an icon or a bitmap
-class WXDLLEXPORT wxStaticBitmap : public wxControl
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-
 public:
     wxStaticBitmap() { Init(); }
 
@@ -51,19 +49,16 @@ public:
 
     virtual ~wxStaticBitmap() { Free(); }
 
-    void SetIcon(const wxIcon& icon) { SetImage(&icon); }
-    void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }
+    virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); }
+    virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }
 
     // assert failure is provoked by an attempt to get an icon from bitmap or
     // vice versa
-    const wxIcon& GetIcon() const
+    wxIcon GetIcon() const
         { wxASSERT( m_isIcon ); return *(wxIcon *)m_image; }
-    const wxBitmap& GetBitmap() const
+    wxBitmap GetBitmap() const
         { wxASSERT( !m_isIcon ); return *(wxBitmap *)m_image; }
 
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
-
     // IMPLEMENTATION
 #ifdef __WIN16__
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
@@ -84,6 +79,9 @@ protected:
     // we can have either an icon or a bitmap
     bool m_isIcon;
     wxGDIImage *m_image;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
 };
 
 #endif