X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..9c805dec6caf3c98a3797898cffe795b5b56e606:/include/wx/palmos/statbmp.h diff --git a/include/wx/palmos/statbmp.h b/include/wx/palmos/statbmp.h index 2ae179f41b..3511309423 100644 --- a/include/wx/palmos/statbmp.h +++ b/include/wx/palmos/statbmp.h @@ -16,10 +16,10 @@ #include "wx/icon.h" #include "wx/bitmap.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; +WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: wxStaticBitmap() { Init(); } @@ -54,14 +54,14 @@ public: // vice versa wxIcon GetIcon() const { - wxASSERT_MSG( m_isIcon, _T("no icon in this wxStaticBitmap") ); + wxASSERT_MSG( m_isIcon, wxT("no icon in this wxStaticBitmap") ); return *(wxIcon *)m_image; } wxBitmap GetBitmap() const { - wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") ); + wxASSERT_MSG( !m_isIcon, wxT("no bitmap in this wxStaticBitmap") ); return *(wxBitmap *)m_image; } @@ -93,7 +93,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - DECLARE_NO_COPY_CLASS(wxStaticBitmap) + wxDECLARE_NO_COPY_CLASS(wxStaticBitmap); }; #endif