HKEY -> WXHKEY, wxScrolledWindow::SetScale added

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 0feac4aeeb629e6b30d79ec09f9b5c63124bf7dc..05dce3179ba7984c279628cbd326afe6a0ecf7b6 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -212,7 +212,7 @@ wxString::wxString(const void *pStart, const void *pEnd)
 wxString::wxString(const wchar_t *pwz)
 {
   // first get necessary size
-  size_t nLen = wcstombs(NULL, pwz, 0);
+  size_t nLen = wcstombs((char *) NULL, pwz, 0);
 
   // empty?
   if ( nLen != 0 ) {
@@ -1077,7 +1077,7 @@ wxArrayString::wxArrayString()
 {
   m_nSize  =
   m_nCount = 0;
-  m_pItems = NULL;
+  m_pItems = (char **) NULL;
 }
 
 // copy ctor
@@ -1085,7 +1085,7 @@ wxArrayString::wxArrayString(const wxArrayString& src)
 {
   m_nSize  =
   m_nCount = 0;
-  m_pItems = NULL;
+  m_pItems = (char **) NULL;
 
   *this = src;
 }