Set HTML data even in Unicode mode

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 9e72b8aa59bad2fc791ba288391aa226f2eaf420..12c4204759d9302c8f1d18e3545589bdf3a0c544 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -365,8 +365,8 @@ bool wxStringBase::Alloc(size_t nLen)
     if ( pData->IsEmpty() ) {
       nLen += EXTRA_ALLOC;
 
-      wxStringData* pData = (wxStringData*)
-          malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
+      pData = (wxStringData *)
+                malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
 
       if ( pData == NULL ) {
         // allocation failure handled by caller
@@ -2497,7 +2497,11 @@ void wxArrayString::Sort(CompareFunction compareFunction)
   END_SORT();
 }
 
-typedef  int (wxC_CALLING_CONV * wxStringCompareFn)(const void *first, const void *second);
+extern "C"
+{
+    typedef int (wxC_CALLING_CONV * wxStringCompareFn)(const void *first,
+                                                       const void *second);
+}
 
 void wxArrayString::Sort(CompareFunction2 compareFunction)
 {