Native wxBitmapComboBox patch for GTK+

[wxWidgets.git] / include / wx / strvararg.h

diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h
index bd7d867b3c685b7677ce03f9b613e01b1a366c15..4cbe39b3aa0dfb940c5e33a51fd497cdc561e015 100644 (file)
--- 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<T>' 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