From f3af6c7e5b46f4209a4981e5d7be217368f40b15 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 8 Feb 2024 15:12:29 +0800 Subject: Get rid of GSL. --- src/platform/gui/win/InputMethod.cpp | 3 +-- src/platform/gui/win/TimerManager.cpp | 4 ++-- src/platform/gui/win/UiApplication.cpp | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/platform/gui/win') diff --git a/src/platform/gui/win/InputMethod.cpp b/src/platform/gui/win/InputMethod.cpp index d9c179ad..4c5b3b8c 100644 --- a/src/platform/gui/win/InputMethod.cpp +++ b/src/platform/gui/win/InputMethod.cpp @@ -144,8 +144,7 @@ CompositionText GetCompositionInfo(HIMC imm_context) { } // namespace -WinInputMethodContext::WinInputMethodContext( - gsl::not_null window) +WinInputMethodContext::WinInputMethodContext(WinNativeWindow* window) : native_window_(window) { event_guard_ += window->NativeMessageEvent()->AddHandler( std::bind(&WinInputMethodContext::OnWindowNativeMessage, this, diff --git a/src/platform/gui/win/TimerManager.cpp b/src/platform/gui/win/TimerManager.cpp index 1bc32b51..c6128b85 100644 --- a/src/platform/gui/win/TimerManager.cpp +++ b/src/platform/gui/win/TimerManager.cpp @@ -22,7 +22,7 @@ long long TimerManager::SetTimer(TimerType type, int period, std::move(action)}; if (type == TimerType::Immediate) { if (!::PostMessageW(god_window_->GetHandle(), kSetImmediateWindowMessageId, - gsl::narrow(id), 0)) { + static_cast(id), 0)) { throw Win32Error( ::GetLastError(), u"Failed to post window message to god window for set immediate."); @@ -46,7 +46,7 @@ void TimerManager::CancelTimer(long long id) { } void TimerManager::CreateNativeTimer(TimerInfo* info) { - info->native_timer_id = gsl::narrow(info->id); + info->native_timer_id = static_cast(info->id); ::SetTimer(god_window_->GetHandle(), info->native_timer_id, info->period, nullptr); } diff --git a/src/platform/gui/win/UiApplication.cpp b/src/platform/gui/win/UiApplication.cpp index 90eb20ca..94d6b9c5 100644 --- a/src/platform/gui/win/UiApplication.cpp +++ b/src/platform/gui/win/UiApplication.cpp @@ -71,14 +71,14 @@ long long WinUiApplication::SetImmediate(std::function action) { long long WinUiApplication::SetTimeout(std::chrono::milliseconds milliseconds, std::function action) { return this->timer_manager_->SetTimer(TimerType::Timeout, - gsl::narrow(milliseconds.count()), + static_cast(milliseconds.count()), std::move(action)); } long long WinUiApplication::SetInterval(std::chrono::milliseconds milliseconds, std::function action) { return this->timer_manager_->SetTimer(TimerType::Interval, - gsl::narrow(milliseconds.count()), + static_cast(milliseconds.count()), std::move(action)); } -- cgit v1.2.3