sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Lynix
2020-05-27 20:03:46 +02:00
parent 68208f5426
commit e0e7435c55
11 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Renderer/RenderWindow.hpp
View File

@@ -26,11 +26,11 @@ namespace Nz
public:
inline RenderWindow();
inline RenderWindow(VideoMode mode, const String &title, WindowStyleFlags style = WindowStyle_Default, const RenderWindowParameters &parameters = RenderWindowParameters());
inline explicit RenderWindow(void *handle, const RenderWindowParameters &parameters = RenderWindowParameters());
inline explicit RenderWindow(void* handle, const RenderWindowParameters &parameters = RenderWindowParameters());
inline ~RenderWindow();
inline bool Create(VideoMode mode, const String &title, WindowStyleFlags style = WindowStyle_Default, const RenderWindowParameters &parameters = RenderWindowParameters());
inline bool Create(void *handle, const RenderWindowParameters &parameters = RenderWindowParameters());
inline bool Create(void* handle, const RenderWindowParameters &parameters = RenderWindowParameters());
void Display();

4
include/Nazara/Renderer/RenderWindow.inl
View File

@@ -20,7 +20,7 @@ namespace Nz
Create(mode, title, style, parameters);
}
inline RenderWindow::RenderWindow(WindowHandle handle, const RenderWindowParameters& parameters)
inline RenderWindow::RenderWindow(void* handle, const RenderWindowParameters& parameters)
{
ErrorFlags errFlags(ErrorFlag_ThrowException, true);
@@ -39,7 +39,7 @@ namespace Nz
return Window::Create(mode, title, style);
}
inline bool RenderWindow::Create(WindowHandle handle, const RenderWindowParameters& parameters)
inline bool RenderWindow::Create(void* handle, const RenderWindowParameters& parameters)
{
m_parameters = parameters;