diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h
index 58e988df01..62291ce3ce 100644
--- a/include/wx/mac/statbmp.h
+++ b/include/wx/mac/statbmp.h
@@ -47,16 +47,16 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
 
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
-	virtual void OnPaint( wxPaintEvent &event ) ;
+  virtual void OnPaint( wxPaintEvent &event ) ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
 
-  inline wxBitmap& GetBitmap() const { return m_messageBitmap; }
-    const wxIcon& GetIcon() const { return (const wxIcon&) GetBitmap() ; }
-    void  SetIcon(const wxIcon& icon) {SetBitmap( icon ) ; }
+  inline const wxBitmap& GetBitmap() const { return m_messageBitmap; }
+  const wxIcon& GetIcon() const { return (const wxIcon&) GetBitmap() ; }
+  void  SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
 
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }
-	wxSize DoGetBestSize() const ;
+  wxSize DoGetBestSize() const ;
 
  protected:
   wxBitmap m_messageBitmap;