X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..93b7364ecd30d7788e917362cac29380c86f2555:/include/wx/msw/statbmp.h

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index c5dc0aff89..1d0b3fb809 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
@@ -20,47 +20,69 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
 
+// a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmap : public wxControl
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
 
 public:
-    wxStaticBitmap() { }
-    
-    wxStaticBitmap(wxWindow *parent, wxWindowID id,
-        const wxBitmap& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticBitmapNameStr)
+    wxStaticBitmap() { Init(); }
+
+    wxStaticBitmap(wxWindow *parent,
+                   wxWindowID id,
+                   const wxBitmap& label,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxString& name = wxStaticBitmapNameStr)
     {
         Create(parent, id, label, pos, size, style, name);
     }
-    
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxBitmap& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticBitmapNameStr);
-    
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxBitmap& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticBitmapNameStr);
+
+    virtual ~wxStaticBitmap() { Free(); }
+
+    virtual void SetIcon(const wxIcon& icon) { SetBitmap(icon); }
     virtual void SetBitmap(const wxBitmap& bitmap);
-    
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
-    
-    wxBitmap& GetBitmap(void) const { return (wxBitmap&) m_messageBitmap; }
-    
+
+    // assert failure is provoked by an attempt to get an icon from bitmap or
+    // vice versa
+    const wxIcon& GetIcon() const
+        { wxASSERT( m_isIcon ); return *m_image.icon; }
+    const wxBitmap& GetBitmap() const
+        { wxASSERT( !m_isIcon ); return *m_image.bitmap; }
+
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
-    
-    // Implementation
+
+    // IMPLEMENTATION
+#ifdef __WIN16__
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+#endif // __WIN16__
 
 protected:
-    wxBitmap m_messageBitmap;
-    
+    void Init() { m_isIcon = TRUE; m_image.icon = NULL; }
+    void Free();
+
+    // TRUE if icon/bitmap is valid
+    bool ImageIsOk() const;
+
+    // we can have either an icon or a bitmap
+    bool m_isIcon;
+    union
+    {
+        wxIcon *icon;
+        wxBitmap *bitmap;
+    } m_image;
+
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);