diff options
Diffstat (limited to 'src/platform/gui')
| -rw-r--r-- | src/platform/gui/osx/Window.mm | 2 | ||||
| -rw-r--r-- | src/platform/gui/win/InputMethod.cpp | 3 | ||||
| -rw-r--r-- | src/platform/gui/win/TimerManager.cpp | 4 | ||||
| -rw-r--r-- | src/platform/gui/win/UiApplication.cpp | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm index 8773678d..d6bee564 100644 --- a/src/platform/gui/osx/Window.mm +++ b/src/platform/gui/osx/Window.mm @@ -471,7 +471,7 @@ cru::platform::gui::KeyModifier GetKeyModifier(NSEvent* event) { - (void)drawRect:(NSRect)dirtyRect { auto cg_context = [[NSGraphicsContext currentContext] CGContext]; auto layer = _p->GetDrawLayer(); - Ensures(layer); + cru::Ensures(layer); CGContextDrawLayerAtPoint(cg_context, CGPointMake(0, 0), layer); } 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<WinNativeWindow*> 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<UINT_PTR>(id), 0)) { + static_cast<UINT_PTR>(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<UINT_PTR>(info->id); + info->native_timer_id = static_cast<UINT_PTR>(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<void()> action) { long long WinUiApplication::SetTimeout(std::chrono::milliseconds milliseconds, std::function<void()> action) { return this->timer_manager_->SetTimer(TimerType::Timeout, - gsl::narrow<int>(milliseconds.count()), + static_cast<int>(milliseconds.count()), std::move(action)); } long long WinUiApplication::SetInterval(std::chrono::milliseconds milliseconds, std::function<void()> action) { return this->timer_manager_->SetTimer(TimerType::Interval, - gsl::narrow<int>(milliseconds.count()), + static_cast<int>(milliseconds.count()), std::move(action)); } |