Fix some compilation and linking errors in samples.

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

diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h
index 3ae276eafffda9ea00264ee2a1be6aef3abb6c55..55879e17fbb2e978c977a8db0bc17f270a9c0182 100644 (file)
--- a/include/wx/mac/statbmp.h
+++ b/include/wx/mac/statbmp.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.h
 // Purpose:     wxStaticBitmap class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.h
 // Purpose:     wxStaticBitmap class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "statbmp.h"
 #endif
 
 #pragma interface "statbmp.h"
 #endif
 


@@ -45,24 +45,23 @@ class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase
 
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
 
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};

-  virtual void OnPaint( wxPaintEvent &event ) ;
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void         OnPaint( wxPaintEvent &event ) ;

 
   wxBitmap GetBitmap() const { return m_bitmap; }
   wxIcon GetIcon() const
       {
 
   wxBitmap GetBitmap() const { return m_bitmap; }
   wxIcon GetIcon() const
       {

-         // icons and bitmaps are really the same thing in wxMac
-         return (const wxIcon &)m_bitmap;
+      // 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
   virtual bool AcceptsFocus() const { return FALSE; }
       }
   void  SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
 
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }

-  wxSize DoGetBestSize() const ;
+  virtual  wxSize DoGetBestSize() const ;

 
  protected:
   wxBitmap m_bitmap;
 
  protected:
   wxBitmap m_bitmap;

-       DECLARE_EVENT_TABLE() 
+    DECLARE_EVENT_TABLE() 

 };
 
 #endif
 };
 
 #endif