X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06b571344581f51bb99e270650c884095d9364fd..4c3ebca927cea2742ec128c9c3ef3676d1ecae01:/include/wx/msw/statbmp.h

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 2f742bad4c..55e2aa35b7 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
@@ -17,56 +17,90 @@
 #endif
 
 #include "wx/control.h"
+#include "wx/icon.h"
+#include "wx/bitmap.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 
-class WXDLLEXPORT wxStaticBitmap : public wxControl
+// a control showing an icon or a bitmap
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 {
-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 wxGDIImage& label,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxString& name = wxStaticBitmapNameStr)
     {
+        Init();
+
         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);
-    
-    virtual void SetBitmap(const wxBitmap& bitmap);
-    
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
-    
-    void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-    void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
-        { wxWindow::SetSize(rect, sizeFlags); }
-    void SetSize(const wxSize& size)
-        { wxWindow::SetSize(size); }
-    
-    wxBitmap& GetBitmap(void) const { return (wxBitmap&) m_messageBitmap; }
-    
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
-    
-    // Implementation
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxGDIImage& 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) { 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
+    wxIcon GetIcon() const
+    {
+        wxASSERT_MSG( m_isIcon, _T("no icon in this wxStaticBitmap") );
+
+        return *(wxIcon *)m_image;
+    }
+
+    wxBitmap GetBitmap() const
+    {
+        wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") );
+
+        return *(wxBitmap *)m_image;
+    }
+
+    // implementation only from now on
+    // -------------------------------
+
+    // implement base class virtuals
+#ifdef __WIN16__
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
+#endif // __WIN16__
     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
 protected:
-    wxBitmap m_messageBitmap;
-    
+    virtual wxBorder GetDefaultBorder() const;
+    virtual wxSize DoGetBestSize() const;
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    // ctor/dtor helpers
+    void Init() { m_isIcon = TRUE; m_image = NULL; }
+    void Free();
+
+    // TRUE if icon/bitmap is valid
+    bool ImageIsOk() const;
+
+    void SetImage(const wxGDIImage* image);
+    void SetImageNoCopy( wxGDIImage* image );
+
+    // we can have either an icon or a bitmap
+    bool m_isIcon;
+    wxGDIImage *m_image;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
 };
 
 #endif