Allow an app to call SetFont on a PS DC without assertion

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

diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h
index 48cad8933adce20c157c726502251c9079bdd37b..8a16726c572e938905e0b3360e829e626351be68 100644 (file)
--- a/include/wx/mac/statbmp.h
+++ b/include/wx/mac/statbmp.h
@@ -1,26 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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(NO_GCC_PRAGMA)

 #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,18 +45,23 @@ 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);
+  void         OnPaint( wxPaintEvent &event ) ;

 
 

-  inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
+  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;
-       DECLARE_EVENT_TABLE() 
+  wxBitmap m_bitmap;
+    DECLARE_EVENT_TABLE() 

 };
 
 #endif
 };
 
 #endif