don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index b6674c046bc20db2dfa226df71b678aa3f7b80ab..46816a2addd55fa071ebb3b04e67938ecc0c038e 100644 (file)
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -12,73 +12,72 @@
 #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)
-
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+        
 public:
     wxStaticBitmap() { }
     ~wxStaticBitmap();
-
+    
     wxStaticBitmap(wxWindow *parent, wxWindowID id,
-            const wxBitmap& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxString& name = wxStaticBitmapNameStr)
+        const wxBitmap& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxStaticBitmapNameStr)
     {
         Create(parent, id, label, pos, size, style, name);
     }
-
+    
     bool Create(wxWindow *parent, wxWindowID id,
-            const wxBitmap& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxString& name = wxStaticBitmapNameStr);
-
+        const wxBitmap& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxStaticBitmapNameStr);
+    
     virtual void SetBitmap(const wxBitmap& bitmap);
-
+    
     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
     void  SetIcon(const wxIcon& icon)
     {
         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();
+    
+protected:
+    void DoSetBitmap();
 
 protected:
     wxBitmap m_messageBitmap;
+    wxBitmap m_messageBitmapOriginal;
+    wxBitmapCache m_bitmapCache;
 };
 
 #endif
-    // _WX_STATBMP_H_
+// _WX_STATBMP_H_