remove unneeded includes from mac/carbon/private.h

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

diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index 004edc60af0cc300c96912f48b3a3d589264e35d..a8190f2a4f99e939543effbe4fe59ff62b2a6fda 100644 (file)
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -12,16 +12,10 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
-#ifdef __GNUG__
-#pragma interface "statbmp.h"
-#endif
-
 #include "wx/motif/bmpmotif.h"
 #include "wx/icon.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
-
-class WXDLLEXPORT wxStaticBitmap : public wxControl
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
         
@@ -50,16 +44,16 @@ public:
     
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
-        return FALSE;
+        return false;
     }
     
-    wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
+    wxBitmap GetBitmap() const { return m_messageBitmap; }
     
     // for compatibility with wxMSW
-    const wxIcon& GetIcon() const
+    wxIcon GetIcon() const
     {
         // don't use wxDynamicCast, icons and bitmaps are really the same thing
-        return (const wxIcon &)m_messageBitmap;
+        return *(wxIcon*)&m_messageBitmap;
     }
     
     // for compatibility with wxMSW
@@ -68,11 +62,7 @@ public:
         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();