use wxString, not wxChar*, in wxDataFormat ctor and SetId() method

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

diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h
index a17d51af4bdb7a8eb161e91cabaa25a0fae66657..6db8aa80ae4a95ad48f13f282ccf6f137a56f955 100644 (file)
--- a/include/wx/mac/statbmp.h
+++ b/include/wx/mac/statbmp.h
@@ -1,79 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.h
-// Purpose:     wxStaticBitmap class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATBMP_H_
-#define _WX_STATBMP_H_
-
-#ifdef __GNUG__
-#pragma interface "statbmp.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/statbmp.h"
+#else
+#include "wx/mac/carbon/statbmp.h"
 #endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
-
-class WXDLLEXPORT wxStaticBitmap: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
- public:
-  inline wxStaticBitmap() { }
-
-  inline wxStaticBitmap(wxWindow *parent, wxWindowID id,
-           const wxBitmap& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticBitmapNameStr)
-  {
-    Create(parent, id, label, pos, size, style, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxBitmap& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticBitmapNameStr);
-
-  virtual void SetBitmap(const wxBitmap& bitmap);
-
-  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;
-    }
-
-    // for compatibility with wxMSW
-    void  SetIcon(const wxIcon& icon)
-    {
-        SetBitmap( icon );
-    }
-
-  // overriden base class virtuals
-  virtual bool AcceptsFocus() const { return FALSE; }
-       wxSize DoGetBestSize() const ;
-
- protected:
-  wxBitmap m_messageBitmap;
-       DECLARE_EVENT_TABLE() 
-};
-
-#endif
-    // _WX_STATBMP_H_