restored wxPluginLibrary::ms_classes handling code that was removed by mistake

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

diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index ae5698036b68fbe6023754defb7ea1e3275b07c0..fc2a64a478166e07b6dc358697517c5702b01650 100644 (file)
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -12,16 +12,14 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "statbmp.h"
 #endif
 
-#include "wx/control.h"
+#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)
         
@@ -53,13 +51,13 @@ public:
         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 +66,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();
     
@@ -82,6 +76,7 @@ protected:
 protected:
     wxBitmap m_messageBitmap;
     wxBitmap m_messageBitmapOriginal;
+    wxBitmapCache m_bitmapCache;
 };
 
 #endif