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 004edc60af0cc300c96912f48b3a3d589264e35d..46816a2addd55fa071ebb3b04e67938ecc0c038e 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_
 
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 

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

 #pragma interface "statbmp.h"
 #endif
 
 #include "wx/motif/bmpmotif.h"
 #include "wx/icon.h"
 
 #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)
         
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
         


@@ -50,16 +48,16 @@ public:
     
     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
     }
     
     // for compatibility with wxMSW


@@ -68,11 +66,7 @@ public:
         SetBitmap( 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();