X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..9cf99fc093f9c45b6b5d8d8b357699d826c9916a:/include/wx/msw/statbmp.h

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index b9c9669a33..31dbb6c88f 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -1,64 +1,88 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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 and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __STATBMPH__
-#define __STATBMPH__
+#ifndef _WX_STATBMP_H_
+#define _WX_STATBMP_H_
 
 #ifdef __GNUG__
-#pragma interface "statbmp.h"
+    #pragma interface "statbmp.h"
 #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:
-  inline wxStaticBitmap(void) { }
-
-  inline 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);
-
-  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);
-
-  inline wxBitmap& GetBitmap(void) const { return (wxBitmap&) m_messageBitmap; }
-
-  // Implementation
-  virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-  virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
- protected:
-  wxBitmap m_messageBitmap;
+public:
+    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)
+    {
+        Create(parent, id, label, pos, size, style, name);
+    }
+
+    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( m_isIcon ); return *(wxIcon *)m_image; }
+    wxBitmap GetBitmap() const
+        { wxASSERT( !m_isIcon ); return *(wxBitmap *)m_image; }
+
+    // IMPLEMENTATION
+#ifdef __WIN16__
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
+#endif // __WIN16__
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    void Init() { m_isIcon = TRUE; m_image = NULL; }
+    void Free();
+
+    // TRUE if icon/bitmap is valid
+    bool ImageIsOk() const;
+
+    void SetImage(const wxGDIImage* image);
+
+    // we can have either an icon or a bitmap
+    bool m_isIcon;
+    wxGDIImage *m_image;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
 };
 
 #endif
-    // __STATBMPH__
+    // _WX_STATBMP_H_