corrected (Do)GetWriteBuf() return types to use more appropriate type (no real differ...

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 33c57f68e07cfdaa55efcae41eff525db87b1fb4..9efab68ffb602d9203e5017d3cb10329c1c214fb 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -1512,7 +1512,7 @@ public:
     //
     // get writable buffer of at least nLen bytes. Unget() *must* be called
     // a.s.a.p. to put string back in a reasonable state!
-  wxDEPRECATED( wxChar *GetWriteBuf(size_t nLen) );
+  wxDEPRECATED( wxStringCharType *GetWriteBuf(size_t nLen) );
     // call this immediately after GetWriteBuf() has been used
   wxDEPRECATED( void UngetWriteBuf() );
   wxDEPRECATED( void UngetWriteBuf(size_t nLen) );

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 9fc84b087850b87d8793504c6db697c59a6dd2ff..25f604519ca24d0ae0aeb8e63cee53635ad854c9 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -408,7 +408,7 @@ bool wxString::Shrink()
 
 // deprecated compatibility code:
 #if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-wxChar *wxString::GetWriteBuf(size_t nLen)
+wxStringCharType *wxString::GetWriteBuf(size_t nLen)
 {
     return DoGetWriteBuf(nLen);
 }

diff --git a/src/common/stringimpl.cpp b/src/common/stringimpl.cpp
index 0f1380e708e43414f43b837cd3d854cdba183d3f..ecf9ea5b1b30a8a28fc29b1f7e954c839d66fd12 100644 (file)
--- a/src/common/stringimpl.cpp
+++ b/src/common/stringimpl.cpp
@@ -754,7 +754,7 @@ bool wxStringImpl::ConcatSelf(size_t nSrcLen,
 
 #if !wxUSE_UNICODE_UTF8
 // get the pointer to writable buffer of (at least) nLen bytes
-wxChar *wxStringImpl::DoGetWriteBuf(size_t nLen)
+wxStringCharType *wxStringImpl::DoGetWriteBuf(size_t nLen)
 {
   if ( !AllocBeforeWrite(nLen) ) {
     // allocation failure handled by caller