diff options
| author | Jesús Corrius <jesus@softcatala.org> | 2012-02-02 00:09:53 +0100 |
|---|---|---|
| committer | Jesús Corrius <jesus@softcatala.org> | 2012-02-02 00:09:53 +0100 |
| commit | 157a32f0dc2eaa195ff60e8b60902554e73e999f (patch) | |
| tree | 3a6873ae9bfa6acca7cb2805305b4793b8ea3c42 /vcl/win/source/app/salinfo.cxx | |
| parent | f25555d66c1c50f81a2694447e8b197eb6ac97f7 (diff) | |
Win32 API calls use the Unicode versions by default
Diffstat (limited to 'vcl/win/source/app/salinfo.cxx')
| -rw-r--r-- | vcl/win/source/app/salinfo.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index efd4d085326a..d370589760d7 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -67,9 +67,9 @@ static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor, sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr, sal_IntPtr ) { - MONITORINFOEXW aInfo; + MONITORINFOEX aInfo; aInfo.cbSize = sizeof( aInfo ); - if( GetMonitorInfoW( reinterpret_cast<HMONITOR>(hMonitor), &aInfo ) ) + if( GetMonitorInfo( reinterpret_cast<HMONITOR>(hMonitor), &aInfo ) ) { aInfo.szDevice[CCHDEVICENAME-1] = 0; rtl::OUString aDeviceName( reinterpret_cast<const sal_Unicode *>(aInfo.szDevice) ); @@ -127,7 +127,7 @@ bool WinSalSystem::initMonitors() aDev.cb = sizeof( aDev ); DWORD nDevice = 0; boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount; - while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) ) + while( EnumDisplayDevices( NULL, nDevice++, &aDev, 0 ) ) { if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE) && !(aDev.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) ) // sort out non/disabled monitors @@ -236,7 +236,7 @@ int WinSalSystem::ShowNativeMessageBox(const rtl::OUString& rTitle, const rtl::O nFlags |= DEFAULT_BTN_MAPPING_TABLE[nButtonCombination][nDefaultButton]; ImplHideSplash(); - return MessageBoxW( + return MessageBox( 0, reinterpret_cast<LPCWSTR>(rMessage.getStr()), reinterpret_cast<LPCWSTR>(rTitle.getStr()), |