added missing methods/removed duplicated base methods

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

diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h
index 90721844b8e79a30e8469aac5b573d04a9a537ed..116e25034d3f32f34548389168bfe2a0113db33b 100644 (file)
--- a/include/wx/os2/statbmp.h
+++ b/include/wx/os2/statbmp.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.h
 // Purpose:     wxStaticBitmap class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.h
 // Purpose:     wxStaticBitmap class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     11/27/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_


@@ -17,61 +17,66 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

+#include "wx/icon.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
 

-class WXDLLEXPORT wxStaticBitmap: public wxControl
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

  public:
  public:

-  inline wxStaticBitmap() { }
-
-  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 SetIcon(const wxIcon& icon) { SetBitmap(icon); }
-  virtual void SetBitmap(const wxBitmap& bitmap);
-
-  // 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; }
+    inline wxStaticBitmap() { Init(); }
+
+    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*         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 SetIcon(const wxIcon& rIcon) { SetImage(rIcon); }
+    virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); };
+
+    // 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; }
+
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return FALSE; }

 
 protected:
 
 protected:

-  void Init() { m_isIcon = TRUE; m_image.icon = NULL; }
-  void Free();
+    virtual wxSize DoGetBestSize() const;
+
+    void Init() { m_bIsIcon = TRUE; m_pImage = NULL; }
+    void Free();

 
 

-  // TRUE if icon/bitmap is valid
-  bool ImageIsOk() const;
+    // 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;
+    void SetImage(const wxGDIImage& rImage);

 
 

-  virtual wxSize DoGetBestSize() const;
+    // we can have either an icon or a bitmap
+    bool                            m_bIsIcon;
+    wxGDIImage*                     m_pImage;
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

 };
 
 #endif
 };
 
 #endif