From: Robert Roebling Date: Thu, 3 Jul 2008 20:34:51 +0000 (+0000) Subject: Make wxMSW wxBase compile in UTF-8 mode X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c6867dcd5110058c0e63a8de5f05fdc139c18129?ds=sidebyside Make wxMSW wxBase compile in UTF-8 mode git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 4308af2059..f5389f2991 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -1851,7 +1851,7 @@ static bool wxCheckWin32Permission(const wxString& path, DWORD access) HANDLE h = ::CreateFile ( - path.wx_str(), + path.c_str(), access, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, diff --git a/src/common/log.cpp b/src/common/log.cpp index 9cdf13a271..432ad55f1f 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -183,7 +183,7 @@ IMPLEMENT_LOG_FUNCTION(Status) void wxSafeShowMessage(const wxString& title, const wxString& text) { #ifdef __WINDOWS__ - ::MessageBox(NULL, text.wx_str(), title.wx_str(), MB_OK | MB_ICONSTOP); + ::MessageBox(NULL, text.c_str(), title.c_str(), MB_OK | MB_ICONSTOP); #else wxFprintf(stderr, wxS("%s: %s\n"), title.c_str(), text.c_str()); fflush(stderr); diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index d2d1c530a4..74cd4d7ba5 100644 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -118,7 +118,7 @@ void wxMessageOutputBest::Output(const wxString& str) return; } - ::MessageBox(NULL, str.wx_str(), NULL, MB_ICONINFORMATION | MB_OK); + ::MessageBox(NULL, str.c_str(), NULL, MB_ICONINFORMATION | MB_OK); #else // !__WINDOWS__ // TODO: use the native message box for the other ports too wxMessageOutputStderr::Output(str); @@ -159,7 +159,7 @@ void wxMessageOutputDebug::Output(const wxString& str) wxString out(AppendLineFeedIfNeeded(str)); out.Replace(wxT("\t"), wxT(" ")); out.Replace(wxT("\n"), wxT("\r\n")); - ::OutputDebugString(out.wx_str()); + ::OutputDebugString(out.c_str()); #else // TODO: use native debug output function for the other ports too wxMessageOutputStderr::Output(str); diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp index 22f7e40478..623f2df9b0 100644 --- a/src/msw/dlmsw.cpp +++ b/src/msw/dlmsw.cpp @@ -194,7 +194,7 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const wxString ver; if ( m_dll.IsLoaded() ) { - wxChar *pc = wx_const_cast(wxChar *, filename.wx_str()); + wxChar *pc = wx_const_cast(wxChar *, (const wxChar*) filename.c_str()); DWORD dummy; DWORD sizeVerInfo = m_pfnGetFileVersionInfoSize(pc, &dummy); @@ -281,7 +281,7 @@ wxDllType wxDynamicLibrary::GetProgramHandle() wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int WXUNUSED(flags)) { - return ::LoadLibrary(libname.wx_str()); + return ::LoadLibrary(libname.c_str()); } /* static */ diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp index f05a631e10..29c4479842 100644 --- a/src/msw/registry.cpp +++ b/src/msw/registry.cpp @@ -385,7 +385,7 @@ bool wxRegKey::Open(AccessMode mode) m_dwLastError = ::RegOpenKeyEx ( (HKEY) m_hRootKey, - m_strKey.wx_str(), + m_strKey.wc_str(), RESERVED, mode == Read ? KEY_READ : KEY_ALL_ACCESS, &tmpKey @@ -426,7 +426,7 @@ bool wxRegKey::Create(bool bOkIfExists) &tmpKey, &disposition); #else - m_dwLastError = RegCreateKey((HKEY) m_hRootKey, m_strKey.wx_str(), &tmpKey); + m_dwLastError = RegCreateKey((HKEY) m_hRootKey, m_strKey.c_str(), &tmpKey); #endif if ( m_dwLastError != ERROR_SUCCESS ) { wxLogSysError(m_dwLastError, _("Can't create registry key '%s'"), @@ -698,7 +698,7 @@ bool wxRegKey::DeleteSelf() // now delete this key itself Close(); - m_dwLastError = RegDeleteKey((HKEY) m_hRootKey, m_strKey.wx_str()); + m_dwLastError = RegDeleteKey((HKEY) m_hRootKey, m_strKey.c_str()); // deleting a key which doesn't exist is not considered an error if ( m_dwLastError != ERROR_SUCCESS && m_dwLastError != ERROR_FILE_NOT_FOUND ) { @@ -942,12 +942,12 @@ bool wxRegKey::QueryValue(const wxString& szValue, #ifndef __WXWINCE__ if ( (dwType == REG_EXPAND_SZ) && !raw ) { - DWORD dwExpSize = ::ExpandEnvironmentStrings(strValue.wx_str(), NULL, 0); + DWORD dwExpSize = ::ExpandEnvironmentStrings(strValue.c_str(), NULL, 0); bool ok = dwExpSize != 0; if ( ok ) { wxString strExpValue; - ok = ::ExpandEnvironmentStrings(strValue.wx_str(), + ok = ::ExpandEnvironmentStrings(strValue.c_str(), wxStringBuffer(strExpValue, dwExpSize), dwExpSize ) != 0; @@ -1408,7 +1408,7 @@ bool KeyExists(WXHKEY hRootKey, const wxString& szKey) if ( ::RegOpenKeyEx ( (HKEY)hRootKey, - szKey.wx_str(), + szKey.c_str(), RESERVED, KEY_READ, // we might not have enough rights for rw access &hkeyDummy @@ -1444,7 +1444,7 @@ inline void RemoveTrailingSeparator(wxString& str) inline const wxChar *RegValueStr(const wxString& szValue) { - return szValue.empty() ? (const wxChar*)NULL : szValue.wx_str(); + return szValue.empty() ? (const wxChar*)NULL : szValue.c_str(); } #endif // wxUSE_REGKEY diff --git a/src/msw/snglinst.cpp b/src/msw/snglinst.cpp index 7ccf5af9e0..eb9bb38382 100644 --- a/src/msw/snglinst.cpp +++ b/src/msw/snglinst.cpp @@ -52,7 +52,7 @@ public: bool Create(const wxString& name) { - m_hMutex = ::CreateMutex(NULL, FALSE, name.wx_str()); + m_hMutex = ::CreateMutex(NULL, FALSE, name.c_str()); if ( !m_hMutex ) { wxLogLastError(_T("CreateMutex")); diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 7d99de260f..1bb8db7c8c 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -608,7 +608,7 @@ bool wxGetEnv(const wxString& WXUNUSED_IN_WINCE(var), return false; #else // Win32 // first get the size of the buffer - DWORD dwRet = ::GetEnvironmentVariable(var.wx_str(), NULL, 0); + DWORD dwRet = ::GetEnvironmentVariable(var.c_str(), NULL, 0); if ( !dwRet ) { // this means that there is no such variable @@ -617,7 +617,7 @@ bool wxGetEnv(const wxString& WXUNUSED_IN_WINCE(var), if ( value ) { - (void)::GetEnvironmentVariable(var.wx_str(), + (void)::GetEnvironmentVariable(var.c_str(), wxStringBuffer(*value, dwRet), dwRet); } @@ -635,7 +635,7 @@ bool wxDoSetEnv(const wxString& WXUNUSED_IN_WINCE(var), // no environment variables under CE return false; #else - if ( !::SetEnvironmentVariable(var.wx_str(), value) ) + if ( !::SetEnvironmentVariable(var.c_str(), value) ) { wxLogLastError(_T("SetEnvironmentVariable")); @@ -648,7 +648,7 @@ bool wxDoSetEnv(const wxString& WXUNUSED_IN_WINCE(var), bool wxSetEnv(const wxString& variable, const wxString& value) { - return wxDoSetEnv(variable, value.wx_str()); + return wxDoSetEnv(variable, value.c_str()); } bool wxUnsetEnv(const wxString& variable)