X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04e7692af163f3c6f1e58f01e7be665882d65ce9..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/include/wx/strvararg.h?ds=inline diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h index bd7d867b3c..4cbe39b3aa 100644 --- a/include/wx/strvararg.h +++ b/include/wx/strvararg.h @@ -124,11 +124,6 @@ class WXDLLIMPEXP_FWD_BASE wxString; // accounts for string changes done by wxArgNormalizer<> // // Note that this class can _only_ be used for function arguments! -#ifdef __VISUALC__ - // "struct 'wx[W]CharBuffer' needs to have dll-interface to be used by - // clients of class 'wxString'" - this is private, we don't care - #pragma warning (disable:4251) -#endif class WXDLLIMPEXP_BASE wxFormatString { public: @@ -185,9 +180,6 @@ private: private: wxCharBuffer m_char; wxWCharBuffer m_wchar; -#ifdef __VISUALC__ - #pragma warning (default:4251) -#endif // NB: we can use a pointer here, because wxFormatString is only used // as function argument, so it has shorter life than the string @@ -195,7 +187,7 @@ private: const wxString * const m_str; const wxCStrData * const m_cstr; - DECLARE_NO_COPY_CLASS(wxFormatString) + DECLARE_NO_ASSIGN_CLASS(wxFormatString) }; // these two helper classes are used to find wxFormatString argument among fixed