Smartphone menus.

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

diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h
index d6731e42d691ebf0473a334a0a21cbbfe875ed68..00677618dea55eeacadb6f151320192617688375 100644 (file)
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/statbmp.h
@@ -1,34 +1,67 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbmp.h
+// Name:        wx/gtk/statbmp.h

 // Purpose:
 // Author:      Robert Roebling
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKSTATICBITMAPH__
 #define __GTKSTATICBITMAPH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKSTATICBITMAPH__
 #define __GTKSTATICBITMAPH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
+#include "wx/icon.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// classes
+// wxStaticBitmap

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxStaticBitmap;
+class wxStaticBitmap : public wxStaticBitmapBase
+{
+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);

 
 

-//-----------------------------------------------------------------------------
-// wxStaticBitmap
-//-----------------------------------------------------------------------------
+    virtual void SetIcon(const wxIcon& icon) { SetBitmap( icon ); }
+    virtual void SetBitmap( const wxBitmap& bitmap );
+    virtual wxBitmap GetBitmap() const { return m_bitmap; }
+
+    // for compatibility with wxMSW
+    wxIcon GetIcon() const
+    {
+        // don't use wxDynamicCast, icons and bitmaps are really the same thing
+        // in wxGTK
+        return (const wxIcon &)m_bitmap;
+    }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    
+private:
+    // creates the new pixmap widget
+    void CreatePixmapWidget();
+
+    wxBitmap   m_bitmap;
+
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+};

 
 #endif // __GTKSTATICBITMAPH__
 
 #endif // __GTKSTATICBITMAPH__