removed wxUSE_TOOLBAR_SIMPLE leftovers from the main sources, it's not used anywhere...

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

diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index ae5698036b68fbe6023754defb7ea1e3275b07c0..c177b6b1fa51796102664653b42e2cd18b4abd39 100644 (file)
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxStaticBitmap class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStaticBitmap class
 // Author:      Julian Smart
 // Modified by:


@@ -12,23 +12,17 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 

-#ifdef __GNUG__
-#pragma interface "statbmp.h"
-#endif
-
-#include "wx/control.h"
+#include "wx/motif/bmpmotif.h"

 #include "wx/icon.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();
 public:
     wxStaticBitmap() { }
     ~wxStaticBitmap();

-    
+

     wxStaticBitmap(wxWindow *parent, wxWindowID id,
         const wxBitmap& label,
         const wxPoint& pos = wxDefaultPosition,
     wxStaticBitmap(wxWindow *parent, wxWindowID id,
         const wxBitmap& label,
         const wxPoint& pos = wxDefaultPosition,


@@ -38,50 +32,47 @@ public:
     {
         Create(parent, id, label, pos, size, style, name);
     }
     {
         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);
     bool Create(wxWindow *parent, wxWindowID id,
         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 void SetBitmap(const wxBitmap& bitmap);

-    
+

     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
     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
     // for compatibility with wxMSW

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

     {
         // don't use wxDynamicCast, icons and bitmaps are really the same thing
     {
         // 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 );
     }
     // for compatibility with wxMSW
     void  SetIcon(const wxIcon& icon)
     {
         SetBitmap( icon );
     }

-    
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
-    
+

     // Implementation
     // Implementation

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();

-    
+

 protected:
     void DoSetBitmap();
 
 protected:
     wxBitmap m_messageBitmap;
     wxBitmap m_messageBitmapOriginal;
 protected:
     void DoSetBitmap();
 
 protected:
     wxBitmap m_messageBitmap;
     wxBitmap m_messageBitmapOriginal;

+    wxBitmapCache m_bitmapCache;

 };
 
 #endif
 };
 
 #endif