added explicit conversion of wxCStrData to const void * to resolve ambiguity between...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index 73a09e30ccceb3d6ce1b9a15a4e0602f17c2bcbe..2e9b06f5908c0037a3aab5e43c5b665ee3212b5e 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -798,6 +798,7 @@ public:
     const char* AsChar() const;
     const unsigned char* AsUnsignedChar() const
         { return (const unsigned char *) AsChar(); }
     const char* AsChar() const;
     const unsigned char* AsUnsignedChar() const
         { return (const unsigned char *) AsChar(); }

+    operator const void*() const { return AsChar(); }

     operator const char*() const { return AsChar(); }
     operator const unsigned char*() const { return AsUnsignedChar(); }
 #endif
     operator const char*() const { return AsChar(); }
     operator const unsigned char*() const { return AsUnsignedChar(); }
 #endif