Renameing funktions to prevent name clashes

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

diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index 3da85fba6f84d9e9a94042736cf0a22e015e57fe..b6674c046bc20db2dfa226df71b678aa3f7b80ab 100644 (file)
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
@@ -17,57 +17,67 @@
 #endif
 
 #include "wx/control.h"
+#include "wx/icon.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
 
-class WXDLLEXPORT wxStaticBitmap: public wxControl
+class WXDLLEXPORT wxStaticBitmap : public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
- public:
-  inline wxStaticBitmap() { }
-  ~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)) {};
-
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
-    { wxWindow::SetSize(rect, sizeFlags); }
-  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
-  virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
-
-  inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
-
-  // overriden base class virtuals
-  virtual bool AcceptsFocus() const { return FALSE; }
-
-// Implementation
-  virtual void ChangeFont(bool keepOriginalSize = TRUE);
-  virtual void ChangeBackgroundColour();
-  virtual void ChangeForegroundColour();
-
- protected:
-  wxBitmap m_messageBitmap;
-
+DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+
+public:
+    wxStaticBitmap() { }
+    ~wxStaticBitmap();
+
+    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 bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
+    {
+        return FALSE;
+    }
+
+    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
+        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; }
+
+    // Implementation
+    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeBackgroundColour();
+    virtual void ChangeForegroundColour();
+
+protected:
+    wxBitmap m_messageBitmap;
 };
 
 #endif