From a077eb38b01292611f4f6031b75e3e2c1c20f06e Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 16 Aug 2019 08:54:08 +0800 Subject: *misc --- source/Asura.Editor/System/ContainerWindow.h | 14 +++++++------- source/Asura.Editor/System/Input.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/Asura.Editor/System') diff --git a/source/Asura.Editor/System/ContainerWindow.h b/source/Asura.Editor/System/ContainerWindow.h index 5893aff..06a7b82 100644 --- a/source/Asura.Editor/System/ContainerWindow.h +++ b/source/Asura.Editor/System/ContainerWindow.h @@ -11,9 +11,7 @@ namespace_begin(AsuraEditor) -/// -/// 包含编辑器窗口的native窗口 -/// +/// 包含编辑器窗口的native窗口，分为有menu和没有menu的，用来容纳GUIWindow。 class ContainerWindow : public AEScripting::Portable { public: @@ -40,10 +38,9 @@ public: private: - ContainerWindow* mParent; - WindowStyle mStyle; - HWND mHWND; - HDC mHDC; + WindowStyle m_Style; + HWND m_HWND; + HDC m_HDC; luaxport: @@ -57,6 +54,9 @@ luaxport: }; +// 容纳GUIWindow的框架 +using ContainerFrame = ContainerWindow; + namespace_end #endif \ No newline at end of file diff --git a/source/Asura.Editor/System/Input.cpp b/source/Asura.Editor/System/Input.cpp index c10eb3b..80086d3 100644 --- a/source/Asura.Editor/System/Input.cpp +++ b/source/Asura.Editor/System/Input.cpp @@ -49,7 +49,7 @@ LRESULT Input::OnDeviceChange(LPCWSTR name, bool add) { } -bool Input::ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, AEMath::Vector2f& newPos) +bool Input::ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, Vector2f& newPos) { } -- cgit v1.1-26-g67d0