Commit a346804b authored by hybrid's avatar hybrid

Remove code which was regarding to legacy windows version support

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4149 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 36dabce5
...@@ -899,8 +899,7 @@ namespace irr ...@@ -899,8 +899,7 @@ namespace irr
//! constructor //! constructor
CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params) CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params)
: CIrrDeviceStub(params), HWnd(0), ChangedToFullScreen(false), : CIrrDeviceStub(params), HWnd(0), ChangedToFullScreen(false), Resized(false),
IsNonNTWindows(false), Resized(false),
ExternalWindow(false), Win32CursorControl(0), JoyControl(0) ExternalWindow(false), Win32CursorControl(0), JoyControl(0)
{ {
#ifdef _DEBUG #ifdef _DEBUG
...@@ -1228,20 +1227,12 @@ void CIrrDeviceWin32::resizeIfNecessary() ...@@ -1228,20 +1227,12 @@ 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)
{ {
// We use SendMessage instead of SetText to ensure proper
// function even in cases where the HWND was created in a different thread
DWORD_PTR dwResult; DWORD_PTR dwResult;
if (IsNonNTWindows) SendMessageTimeoutW(HWnd, WM_SETTEXT, 0,
{ reinterpret_cast<LPARAM>(text),
const core::stringc s = text; SMTO_ABORTIFHUNG, 2000, &dwResult);
SendMessageTimeout(HWnd, WM_SETTEXT, 0,
reinterpret_cast<LPARAM>(s.c_str()),
SMTO_ABORTIFHUNG, 2000, &dwResult);
}
else
{
SendMessageTimeoutW(HWnd, WM_SETTEXT, 0,
reinterpret_cast<LPARAM>(text),
SMTO_ABORTIFHUNG, 2000, &dwResult);
}
} }
...@@ -1632,8 +1623,6 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out) ...@@ -1632,8 +1623,6 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
case VER_PLATFORM_WIN32_WINDOWS: case VER_PLATFORM_WIN32_WINDOWS:
IsNonNTWindows = true;
if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0) if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0)
{ {
out.append("Microsoft Windows 95 "); out.append("Microsoft Windows 95 ");
...@@ -1654,8 +1643,6 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out) ...@@ -1654,8 +1643,6 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
break; break;
case VER_PLATFORM_WIN32s: case VER_PLATFORM_WIN32s:
IsNonNTWindows = true;
out.append("Microsoft Win32s "); out.append("Microsoft Win32s ");
break; break;
} }
......
...@@ -389,7 +389,6 @@ namespace irr ...@@ -389,7 +389,6 @@ namespace irr
HWND HWnd; HWND HWnd;
bool ChangedToFullScreen; bool ChangedToFullScreen;
bool IsNonNTWindows;
bool Resized; bool Resized;
bool ExternalWindow; bool ExternalWindow;
CCursorControl* Win32CursorControl; CCursorControl* Win32CursorControl;
......
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