HTML_xxxx constants changed to wxHTML_xxxx (with backward compatibility through WXWIN...

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

diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h
index f4aa0ba4058fd6125a7eacfdeead6b3fc3015756..394977fddc6c754c5693ce8d41e0348e6f545399 100644 (file)
--- a/include/wx/os2/statbmp.h
+++ b/include/wx/os2/statbmp.h
@@ -43,22 +43,35 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
            long style = 0,
            const wxString& name = wxStaticBitmapNameStr);
 
            long style = 0,
            const wxString& name = wxStaticBitmapNameStr);
 

+  virtual void SetIcon(const wxIcon& icon) { SetBitmap(icon); }

   virtual void SetBitmap(const wxBitmap& bitmap);
 
   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() 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; }
 
 
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }
 

- protected:
-  wxBitmap m_messageBitmap;
-private:
-  void SetSize(int width, int height) {wxWindow::SetSize(width, height);}
+protected:
+  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 wxSize DoGetBestSize();

 };
 
 #endif
 };
 
 #endif