Mercurial > mm7
diff OSWindow.h @ 1834:0b44f4d67c18
Merge
author | Ritor1 |
---|---|
date | Tue, 08 Oct 2013 15:27:57 +0600 |
parents | bd899dfd976c |
children | 4088cc908c78 |
line wrap: on
line diff
--- a/OSWindow.h Tue Oct 08 15:27:43 2013 +0600 +++ b/OSWindow.h Tue Oct 08 15:27:57 2013 +0600 @@ -1,6 +1,6 @@ #pragma once #include "OSAPI.h" -#include "NewUI/UIControl.h" +#include "NewUI/Core/UIControl.h" class OSWindow: public UIControl { @@ -26,15 +26,15 @@ virtual bool Focused() override {return GetFocus() == api_handle;} // UIControl - virtual bool OnKey(int key) override; + //virtual bool OnKey(int key) override; // UIControl virtual bool OnMouseLeftClick(int x, int y) override; // UIControl virtual bool OnMouseRightClick(int x, int y) override; // UIControl - virtual bool OnMouseEnter() override; + //virtual bool OnMouseEnter() override; // UIControl - virtual bool OnMouseLeave() override; + //virtual bool OnMouseLeave() override; protected: bool Initialize(const wchar_t *title, int window_width, int window_height);