Commit 36dabce5 authored by hybrid's avatar hybrid

Fix window caption setting to use same method for both win32 and win64

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4148 dfc29bdd-3216-0410-991c-e03cc46cb475
parent da5a5665
...@@ -1228,27 +1228,19 @@ void CIrrDeviceWin32::resizeIfNecessary() ...@@ -1228,27 +1228,19 @@ void CIrrDeviceWin32::resizeIfNecessary()
//! sets the caption of the window //! sets the caption of the window
void CIrrDeviceWin32::setWindowCaption(const wchar_t* text) void CIrrDeviceWin32::setWindowCaption(const wchar_t* text)
{ {
DWORD dwResult; DWORD_PTR dwResult;
if (IsNonNTWindows) if (IsNonNTWindows)
{ {
const core::stringc s = text; const core::stringc s = text;
#if defined(_WIN64) || defined(WIN64)
SetWindowTextA(HWnd, s.c_str());
#else
SendMessageTimeout(HWnd, WM_SETTEXT, 0, SendMessageTimeout(HWnd, WM_SETTEXT, 0,
reinterpret_cast<LPARAM>(s.c_str()), reinterpret_cast<LPARAM>(s.c_str()),
SMTO_ABORTIFHUNG, 2000, &dwResult); SMTO_ABORTIFHUNG, 2000, &dwResult);
#endif
} }
else else
{ {
#if defined(_WIN64) || defined(WIN64)
SetWindowTextW(HWnd, text);
#else
SendMessageTimeoutW(HWnd, WM_SETTEXT, 0, SendMessageTimeoutW(HWnd, WM_SETTEXT, 0,
reinterpret_cast<LPARAM>(text), reinterpret_cast<LPARAM>(text),
SMTO_ABORTIFHUNG, 2000, &dwResult); SMTO_ABORTIFHUNG, 2000, &dwResult);
#endif
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment