Small optical changes for MSW

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

diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h
index ec24d42deadbc85d6528958b85c30a43b73fabe0..0d9bcddfb33f290b0590bc96bd780fc43eb1ecff 100644 (file)
--- a/include/wx/gtk/statbmp.h
+++ b/include/wx/gtk/statbmp.h
@@ -2,10 +2,9 @@
 // Name:        statbmp.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -17,8 +16,13 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_STATBMP
+
 #include "wx/object.h"
 #include "wx/control.h"
+#include "wx/bitmap.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -38,23 +42,51 @@ extern const char* wxStaticBitmapNameStr;
 
 class wxStaticBitmap: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-  
-  public:
-  
-    wxStaticBitmap(void);
-    wxStaticBitmap( wxWindow *parent, const wxWindowID id, const wxBitmap& label,
-      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      const long style = 0, const wxString& name = wxStaticBitmapNameStr );
-    bool Create( wxWindow *parent, const wxWindowID id, const wxBitmap& label,
-      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      const long style = 0, const wxString& name = wxStaticBitmapNameStr);
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+
+public:
+    wxStaticBitmap();
+    wxStaticBitmap( wxWindow *parent,
+                    wxWindowID id,
+                    const wxBitmap& label,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = 0,
+                    const wxString& name = wxStaticBitmapNameStr );
+    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 );
-    wxBitmap& GetBitmap(void) const { return (wxBitmap&)m_bitmap; }
 
- private:
- 
-   wxBitmap   m_bitmap;
+    wxBitmap& GetBitmap() { return m_bitmap; }
+    const wxBitmap& GetBitmap() const { return m_bitmap; }
+
+    // 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_bitmap;
+    }
+
+    // for compatibility with wxMSW
+    void  SetIcon(const wxIcon& icon)
+    {
+        SetBitmap( icon );
+    }
+
+private:
+    // creates the new pixmap widget
+    void CreatePixmapWidget();
+
+    wxBitmap   m_bitmap;
 };
 
+#endif
+
 #endif // __GTKSTATICBITMAPH__