X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc797d8e1b4ef10be4f5c9cd73151406f459706d..0555b2a0a3c509687e7fc5aeb160f5171b7e6311:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index b80459f3ff..b188edce7b 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -20,10 +20,10 @@ #include "wx/bitmap.h" #include "wx/icon.h" -extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap -class WXDLLEXPORT wxStaticBitmapBase : public wxControl +class WXDLLIMPEXP_CORE wxStaticBitmapBase : public wxControl { public: wxStaticBitmapBase() { } @@ -40,7 +40,7 @@ public: return wxIcon(); } - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return false; } virtual bool HasTransparentBackground() { return true; } @@ -50,7 +50,7 @@ protected: virtual wxSize DoGetBestSize() const; - DECLARE_NO_COPY_CLASS(wxStaticBitmapBase) + wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase); }; #if defined(__WXUNIVERSAL__) @@ -64,7 +64,7 @@ protected: #elif defined(__WXGTK__) #include "wx/gtk1/statbmp.h" #elif defined(__WXMAC__) - #include "wx/mac/statbmp.h" + #include "wx/osx/statbmp.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/statbmp.h" #elif defined(__WXPM__)