added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h
index 3ae276eafffda9ea00264ee2a1be6aef3abb6c55..04b36469bfb477754e05ad98c02956ccc9420185 100644 (file)
--- a/include/wx/mac/statbmp.h
+++ b/include/wx/mac/statbmp.h
@@ -12,7 +12,7 @@
 #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,8 +45,7 @@ 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


@@ -58,7 +57,7 @@ class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase
 
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }
 
   // 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;