diff options
author | crupest <crupest@outlook.com> | 2019-06-27 17:02:58 +0800 |
---|---|---|
committer | crupest <crupest@outlook.com> | 2019-06-27 17:02:58 +0800 |
commit | b53527fbe50a953ad0e3225cc812eb76b8a1f82d (patch) | |
tree | eb81cd14d0a165c47f841ad94835f8987109de7e /src/win/native/window_manager.cpp | |
parent | 8c5b05bcfce96495b4ffc4209ab8feda12597729 (diff) | |
download | cru-b53527fbe50a953ad0e3225cc812eb76b8a1f82d.tar.gz cru-b53527fbe50a953ad0e3225cc812eb76b8a1f82d.tar.bz2 cru-b53527fbe50a953ad0e3225cc812eb76b8a1f82d.zip |
...
Diffstat (limited to 'src/win/native/window_manager.cpp')
-rw-r--r-- | src/win/native/window_manager.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/win/native/window_manager.cpp b/src/win/native/window_manager.cpp index 5fea5a27..7f70d3cc 100644 --- a/src/win/native/window_manager.cpp +++ b/src/win/native/window_manager.cpp @@ -1,16 +1,16 @@ #include "window_manager.hpp" -#include "cru/win/native/win_application.hpp" -#include "cru/win/native/win_native_window.hpp" +#include "cru/win/native/ui_application.hpp" +#include "cru/win/native/native_window.hpp" #include "cru/win/native/window_class.hpp" #include <assert.h> -namespace cru::win::native { +namespace cru::platform::native::win { LRESULT __stdcall GeneralWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { auto window = - WinApplication::GetInstance()->GetWindowManager()->FromHandle(hWnd); + WinUiApplication::GetInstance()->GetWindowManager()->FromHandle(hWnd); LRESULT result; if (window != nullptr && @@ -20,15 +20,14 @@ LRESULT __stdcall GeneralWndProc(HWND hWnd, UINT Msg, WPARAM wParam, return DefWindowProc(hWnd, Msg, wParam, lParam); } -WindowManager::WindowManager(WinApplication* application) { +WindowManager::WindowManager(WinUiApplication* application) { application_ = application; general_window_class_ = std::make_shared<WindowClass>( L"CruUIWindowClass", GeneralWndProc, application->GetInstanceHandle()); } WindowManager::~WindowManager() { - for (const auto [key, window] : window_map_) - delete window; + for (const auto [key, window] : window_map_) delete window; } void WindowManager::RegisterWindow(HWND hwnd, WinNativeWindow* window) { @@ -56,4 +55,4 @@ std::vector<WinNativeWindow*> WindowManager::GetAllWindows() const { for (auto [key, value] : window_map_) windows.push_back(value); return windows; } -} // namespace cru::win::native +} // namespace cru::platform::native::win |