X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3fcfa4d89d44425ed28050462c6064100fe7b05..8875e7ad84fd62fb2f686426e65c5f99a04581dd:/include/wx/msw/statbmp.h?ds=sidebyside

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 49734fd443..780e5e4a15 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -12,15 +12,11 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "statbmp.h"
-#endif
-
 #include "wx/control.h"
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr;
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
@@ -73,18 +69,16 @@ public:
     // implementation only from now on
     // -------------------------------
 
-    // implement base class virtuals
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
 protected:
     virtual wxBorder GetDefaultBorder() const;
+    virtual wxSize DoGetBestSize() const;
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // ctor/dtor helpers
-    void Init() { m_isIcon = TRUE; m_image = NULL; }
+    void Init() { m_isIcon = true; m_image = NULL; }
     void Free();
 
-    // TRUE if icon/bitmap is valid
+    // true if icon/bitmap is valid
     bool ImageIsOk() const;
 
     void SetImage(const wxGDIImage* image);