added default values for SetSizeHints() arguments, as in wxMSW

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

diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h
index 62291ce3ce09fe3ae10a9d8508bd177cdd59b2b9..3ae276eafffda9ea00264ee2a1be6aef3abb6c55 100644 (file)
--- a/include/wx/mac/statbmp.h
+++ b/include/wx/mac/statbmp.h
@@ -16,11 +16,9 @@
 #pragma interface "statbmp.h"
 #endif
 
 #pragma interface "statbmp.h"
 #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:
 {
   DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
  public:


@@ -50,8 +48,12 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
   virtual void OnPaint( wxPaintEvent &event ) ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
 
   virtual void OnPaint( wxPaintEvent &event ) ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
 

-  inline const wxBitmap& GetBitmap() const { return m_messageBitmap; }
-  const wxIcon& GetIcon() const { return (const wxIcon&) GetBitmap() ; }
+  wxBitmap GetBitmap() const { return m_bitmap; }
+  wxIcon GetIcon() const
+      {
+         // icons and bitmaps are really the same thing in wxMac
+         return (const wxIcon &)m_bitmap;
+      }

   void  SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
 
   // overriden base class virtuals
   void  SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
 
   // overriden base class virtuals


@@ -59,7 +61,7 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
   wxSize DoGetBestSize() const ;
 
  protected:
   wxSize DoGetBestSize() const ;
 
  protected:

-  wxBitmap m_messageBitmap;
+  wxBitmap m_bitmap;

        DECLARE_EVENT_TABLE() 
 };
 
        DECLARE_EVENT_TABLE() 
 };