X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..05c3f0fc73d9124061c08e3d707b4e3d6bab4ff4:/include/wx/statbmp.h

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 3c81aa4781..e0e4566370 100644
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATBMP_H_BASE_
 #define _WX_STATBMP_H_BASE_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "statbmpbase.h"
 #endif
 
@@ -26,7 +26,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,17 +34,17 @@ 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; }
 
 protected:
-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestSize() const;
 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };