Correct compilation conditions for wxURL::SetProxy.

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

diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index 24688066d9c049dcc46a13177c6c11cf6bc3cc3f..46816a2addd55fa071ebb3b04e67938ecc0c038e 100644 (file)
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -6,63 +6,78 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 

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

 #pragma interface "statbmp.h"
 #endif
 
 #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();
 public:
     wxStaticBitmap() { }
     ~wxStaticBitmap();

-
+    

     wxStaticBitmap(wxWindow *parent, wxWindowID id,
     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);
     }
     {
         Create(parent, id, label, pos, size, style, name);
     }

-
+    

     bool Create(wxWindow *parent, wxWindowID id,
     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 void SetBitmap(const wxBitmap& bitmap);

-
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
-
-    wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
-
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
-
+    
+    virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
+    {
+        return false;
+    }
+    
+    wxBitmap GetBitmap() const { return m_messageBitmap; }
+    
+    // for compatibility with wxMSW
+    wxIcon GetIcon() const
+    {
+        // don't use wxDynamicCast, icons and bitmaps are really the same thing
+        return *(wxIcon*)&m_messageBitmap;
+    }
+    
+    // for compatibility with wxMSW
+    void  SetIcon(const wxIcon& icon)
+    {
+        SetBitmap( icon );
+    }
+    

     // 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;
 
 protected:
     wxBitmap m_messageBitmap;

+    wxBitmap m_messageBitmapOriginal;
+    wxBitmapCache m_bitmapCache;

 };
 
 #endif
 };
 
 #endif

-    // _WX_STATBMP_H_
+// _WX_STATBMP_H_