cleanup - added whitespace around operators, some blank lines, fixed comment typos...

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

diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h
index 7f902acf835267d305ea9cb49f54336555b7c41c..d1194eb19379d9d93c87e65c17ac190fba9b15d5 100644 (file)
--- a/include/wx/gtk/statbmp.h
+++ b/include/wx/gtk/statbmp.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,43 +7,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

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

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_STATBMP
-
-#include "wx/object.h"
-#include "wx/control.h"
-#include "wx/bitmap.h"

 #include "wx/icon.h"
 
 #include "wx/icon.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxStaticBitmap;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char* wxStaticBitmapNameStr;
-

 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 

-class wxStaticBitmap: public wxControl
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-

 public:
     wxStaticBitmap();
     wxStaticBitmap( wxWindow *parent,
 public:
     wxStaticBitmap();
     wxStaticBitmap( wxWindow *parent,


@@ -61,18 +35,25 @@ public:
                  long style = 0,
                  const wxString& name = wxStaticBitmapNameStr);
 
                  long style = 0,
                  const wxString& name = wxStaticBitmapNameStr);
 

+    virtual void SetIcon(const wxIcon& icon) { SetBitmap( icon ); }

     virtual void SetBitmap( const wxBitmap& bitmap );
     virtual void SetBitmap( const wxBitmap& bitmap );

-
-    wxBitmap& GetBitmap() { return m_bitmap; }
-    const wxBitmap& GetBitmap() const { return m_bitmap; }
+    virtual wxBitmap GetBitmap() const { return m_bitmap; }

 
     // for compatibility with wxMSW
 
     // for compatibility with wxMSW

-    wxIcon& GetIcon();
-
+    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:
     wxBitmap   m_bitmap;
 private:
     wxBitmap   m_bitmap;

-};

 
 

-#endif
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+};

 
 #endif // __GTKSTATICBITMAPH__
 
 #endif // __GTKSTATICBITMAPH__