X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..d51305e81eb593bedd92cda864671e15209c268f:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 1a88160d05..e0e4566370 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -6,7 +6,7 @@ // Created: 25.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_STATBMP_H_BASE_ @@ -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,14 +34,14 @@ 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 DoGetBestSize() const;