TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-26 15:49:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modified files for SDL2.

Browse source
This commit is contained in:
LuisAntonRebollo 2015-01-18 22:52:29 +01:00
parent d08db6cc54
commit 21d58bb191
33 changed files with 436 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/windowManager/win32/win32SplashScreen.cpp
View file

@ -121,6 +121,8 @@ void CloseSplashWindow(HINSTANCE hinst)
}
#ifndef TORQUE_SDL
bool Platform::closeSplashWindow()
{
CloseSplashWindow(GetModuleHandle(NULL));
@ -155,4 +157,4 @@ bool Platform::displaySplashWindow( String path )
return true;
}
#endif

12
Engine/source/windowManager/win32/win32Window.cpp
View file

@ -20,6 +20,8 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#if !defined(TORQUE_SDL)
#include <windows.h>
#include <tchar.h>
#include <winuser.h>
@ -121,6 +123,14 @@ Win32Window::~Win32Window()
_unregisterWindowClass();
}
void* Win32Window::getSystemWindow(const WindowSystem system)
{
if( system == WindowSystem_Windows)
return getHWND();
return NULL;
}
GFXDevice * Win32Window::getGFXDevice()
{
return mDevice;
@ -1209,3 +1219,5 @@ const UTF16 *Win32Window::getCurtainWindowClassName()
{
return _CurtainWindowClassName;
}
#endif

2
Engine/source/windowManager/win32/win32Window.h
View file

@ -139,6 +139,8 @@ public:
return mWindowHandle;
}
virtual void* getSystemWindow(const WindowSystem system);
HMENU &getMenuHandle()
{
return mMenuHandle;

6
Engine/source/windowManager/win32/win32WindowMgr.cpp
View file

@ -27,6 +27,8 @@
#include "core/util/journal/process.h"
#include "core/strings/unicode.h"
#if !defined( TORQUE_SDL )
// ------------------------------------------------------------------------
void CloseSplashWindow(HINSTANCE hinst);
@ -522,4 +524,6 @@ void Win32WindowManager::raiseCurtain()
DestroyWindow(mCurtainWindow);
mCurtainWindow = NULL;
}
}
#endif

5
Engine/source/windowManager/win32/winDispatch.cpp
View file

@ -39,6 +39,8 @@
#include "core/util/journal/process.h"
#include "core/util/journal/journaledSignal.h"
#if !defined( TORQUE_SDL )
static U32 _ModifierKeys=0;
static BYTE keyboardState[256];
static bool initKBState = false;
@ -591,3 +593,6 @@ void DispatchRemove(HWND hWnd)
{
_MessageQueue.remove(hWnd);
}
#endif