Merge fixes
This commit is contained in:
@@ -26,11 +26,11 @@ namespace Nz
|
||||
public:
|
||||
inline RenderWindow();
|
||||
inline RenderWindow(VideoMode mode, const String &title, WindowStyleFlags style = WindowStyle_Default, const RenderWindowParameters ¶meters = RenderWindowParameters());
|
||||
inline explicit RenderWindow(void *handle, const RenderWindowParameters ¶meters = RenderWindowParameters());
|
||||
inline explicit RenderWindow(void* handle, const RenderWindowParameters ¶meters = RenderWindowParameters());
|
||||
inline ~RenderWindow();
|
||||
|
||||
inline bool Create(VideoMode mode, const String &title, WindowStyleFlags style = WindowStyle_Default, const RenderWindowParameters ¶meters = RenderWindowParameters());
|
||||
inline bool Create(void *handle, const RenderWindowParameters ¶meters = RenderWindowParameters());
|
||||
inline bool Create(void* handle, const RenderWindowParameters ¶meters = RenderWindowParameters());
|
||||
|
||||
void Display();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user