Merge fixes

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

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();