moved wxUSE_MS_HTML_HELP back into setup_inc.h (undoing change of rev 1.41) as it...

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

diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index cc13cfa02babf7bd759450a033e3d07057a49db3..fe481c5f886ad0cc2731a173d31f4300b1342361 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:
@@ -12,21 +12,17 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "statbmp.h"
-#endif
-
 #include "wx/motif/bmpmotif.h"
 #include "wx/icon.h"
 
 class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-        
+
 public:
     wxStaticBitmap() { }
-    ~wxStaticBitmap();
-    
+    virtual ~wxStaticBitmap();
+
     wxStaticBitmap(wxWindow *parent, wxWindowID id,
         const wxBitmap& label,
         const wxPoint& pos = wxDefaultPosition,
@@ -36,40 +32,40 @@ public:
     {
         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);
-    
+
     virtual void SetBitmap(const wxBitmap& bitmap);
-    
+
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
-        return FALSE;
+        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
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
-    
+
 protected:
     void DoSetBitmap();