compilation fix for non-PCH

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

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

-#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:


@@ -47,31 +45,22 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
 
   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);
-
-  inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
-
-    // for compatibility with wxMSW
-    const wxIcon& GetIcon() const
-    {
-        // don't use wxDynamicCast, icons and bitmaps are really the same thing
-        // in wxGTK
-        return (const wxIcon &)m_messageBitmap;
-    }
+  void         OnPaint( wxPaintEvent &event ) ;

 
 

-    // for compatibility with wxMSW
-    void  SetIcon(const wxIcon& icon)
-    {
-        SetBitmap( (const wxBitmap&) icon );
-    }
+  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
   virtual bool AcceptsFocus() const { return FALSE; }
 
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }

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

 
  protected:
 
  protected:

-  wxBitmap m_messageBitmap;
+  wxBitmap m_bitmap;

        DECLARE_EVENT_TABLE() 
 };
 
        DECLARE_EVENT_TABLE() 
 };