X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b481194f519028fb10aa436e857c015eb253d688..7447d53c35249d42128d6243c90998f03882859a:/src/msw/utils.cpp diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 703a65ae20..abab0a651a 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -60,9 +60,7 @@ #if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #include - #ifndef __MWERKS__ - #include - #endif + #include #endif //GNUWIN32 #if defined(__CYGWIN__) @@ -143,7 +141,7 @@ bool wxGetHostName(wxChar *buf, int maxSize) !regKey.QueryValue(wxT("Name"), hostName) ) return false; - wxStrlcpy(buf, hostName.wx_str(), maxSize); + wxStrlcpy(buf, hostName.t_str(), maxSize); #else // !__WXWINCE__ DWORD nSize = maxSize; if ( !::GetComputerName(buf, &nSize) ) @@ -1078,12 +1076,6 @@ unsigned long wxGetProcessId() return ::GetCurrentProcessId(); } -// Emit a beeeeeep -void wxBell() -{ - ::MessageBeep((UINT)-1); // default sound -} - bool wxIsDebuggerRunning() { #if wxUSE_DYNLIB_CLASS @@ -1117,8 +1109,8 @@ wxLoadUserResource(const void **outData, wxCHECK_MSG( outData && outLen, false, "output pointers can't be NULL" ); HRSRC hResource = ::FindResource(instance, - resourceName.wx_str(), - resourceType.wx_str()); + resourceName.t_str(), + resourceType.t_str()); if ( !hResource ) return false;