Move wxMulDivInt32 to common math.

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 49bcf7fb93103b96dc910b6ec6abbeed8e7431fe..d215bc3bda67f84775711e190df113b216fae694 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -12,10 +12,6 @@
 #ifndef _WX_STATBMP_H_BASE_
 #define _WX_STATBMP_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "statbmpbase.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_STATBMP
@@ -26,7 +22,7 @@
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxBitmap;
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr;
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
@@ -34,14 +30,15 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 public:
     wxStaticBitmapBase() { }
     virtual ~wxStaticBitmapBase();
-    
+
     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;
     virtual void SetBitmap(const wxBitmap& bitmap) = 0;
     virtual wxBitmap GetBitmap() const = 0;
 
     // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }
+    virtual bool HasTransparentBackground() { return true; }
 
 protected:
     virtual wxSize DoGetBestSize() const;