X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..2b260bc3e2f269de090eefdaefc1450207a7734e:/include/wx/os2/statbmp.h?ds=sidebyside

diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h
index f4aa0ba405..116e25034d 100644
--- a/include/wx/os2/statbmp.h
+++ b/include/wx/os2/statbmp.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.h
 // Purpose:     wxStaticBitmap class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     11/27/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
@@ -17,48 +17,66 @@
 #endif
 
 #include "wx/control.h"
+#include "wx/icon.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
 
-class WXDLLEXPORT wxStaticBitmap: public wxControl
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
  public:
-  inline wxStaticBitmap() { }
+    inline wxStaticBitmap() { Init(); }
 
-  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);
-  }
+    inline wxStaticBitmap( wxWindow*         pParent
+                          ,wxWindowID        nId
+                          ,const wxGDIImage& rLabel
+                          ,const wxPoint&    rPos = wxDefaultPosition
+                          ,const wxSize&     rSize = wxDefaultSize
+                          ,long              lStyle = 0
+                          ,const wxString&   rName = wxStaticBitmapNameStr
+                         )
+    {
+        Create(pParent, nId, rLabel, rPos, rSize, lStyle, rName);
+    }
 
-  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*         pParent
+                ,wxWindowID        nId
+                ,const wxGDIImage& rLabel
+                ,const wxPoint&    rPos = wxDefaultPosition
+                ,const wxSize&     rSize = wxDefaultSize
+                ,long              lStyle = 0
+                ,const wxString&   rName = wxStaticBitmapNameStr
+               );
+    inline virtual ~wxStaticBitmap() { Free(); }
 
-  virtual void SetBitmap(const wxBitmap& bitmap);
+    virtual void SetIcon(const wxIcon& rIcon) { SetImage(rIcon); }
+    virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); };
 
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
-  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
+    // assert failure is provoked by an attempt to get an icon from bitmap or
+    // vice versa
+    const wxIcon& GetIcon() const
+      { wxASSERT( m_bIsIcon ); return *(wxIcon *)m_pImage; }
+    wxBitmap GetBitmap() const
+      { wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; }
 
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return FALSE; }
 
-  inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
+protected:
+    virtual wxSize DoGetBestSize() const;
 
-  // overriden base class virtuals
-  virtual bool AcceptsFocus() const { return FALSE; }
+    void Init() { m_bIsIcon = TRUE; m_pImage = NULL; }
+    void Free();
 
- protected:
-  wxBitmap m_messageBitmap;
+    // TRUE if icon/bitmap is valid
+    bool ImageIsOk() const;
+
+    void SetImage(const wxGDIImage& rImage);
+
+    // we can have either an icon or a bitmap
+    bool                            m_bIsIcon;
+    wxGDIImage*                     m_pImage;
 private:
-  void SetSize(int width, int height) {wxWindow::SetSize(width, height);}
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
 };
 
 #endif