X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40e01f4bfae3018984d947e07efc7a7c624a6eda..05112735c29d896a101918aacd2224b54f6dd653:/include/wx/meta/movable.h?ds=sidebyside

diff --git a/include/wx/meta/movable.h b/include/wx/meta/movable.h
index 3583c98a59..f8624d1fb9 100644
--- a/include/wx/meta/movable.h
+++ b/include/wx/meta/movable.h
@@ -84,11 +84,12 @@ struct wxIsMovable<const T*>
 #endif // !VC++ < 7
 
 // Our implementation of wxString is written in such way that it's safe to move
-// it around. OTOH, we don't know anything about std::string.
+// it around (unless position cache is used which unfortunately breaks this).
+// OTOH, we don't know anything about std::string.
 // (NB: we don't put this into string.h and choose to include wx/string.h from
 // here instead so that rarely-used wxIsMovable<T> code isn't included by
 // everything)
-#if !wxUSE_STL
+#if !wxUSE_STL && !wxUSE_STRING_POS_CACHE
 WX_DECLARE_TYPE_MOVABLE(wxString)
 #endif