Allow headers to be compiled in Objective-C++ mode

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

diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h
index f56a5d4d569fd60864b5dfa1a486a246298e34fa..d11396a14a1614e586e5976d363dada45a3687a4 100644 (file)
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/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$


@@ -11,39 +11,18 @@
 #ifndef __GTKSTATICBITMAPH__
 #define __GTKSTATICBITMAPH__
 
 #ifndef __GTKSTATICBITMAPH__
 #define __GTKSTATICBITMAPH__
 

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

 #pragma interface
 #endif
 
 #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 wxStaticBitmap : public wxStaticBitmapBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-

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


@@ -61,35 +40,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

-    const wxIcon& GetIcon() const
+    wxIcon GetIcon() const

     {
         // don't use wxDynamicCast, icons and bitmaps are really the same thing
         // in wxGTK
         return (const wxIcon &)m_bitmap;
     }
 
     {
         // 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 );
-    }
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-

 private:
     // creates the new pixmap widget
     void CreatePixmapWidget();
 
     wxBitmap   m_bitmap;
 private:
     // creates the new pixmap widget
     void CreatePixmapWidget();
 
     wxBitmap   m_bitmap;

-};

 
 

-#endif
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+};

 
 #endif // __GTKSTATICBITMAPH__
 
 #endif // __GTKSTATICBITMAPH__