From 4613c0354bd6f87bb1c3d5b23a6f1d12350cbc4c Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 31 Dec 2023 07:02:32 +0100 Subject: [PATCH] Fix some compile errors --- libraries/ZWidget/src/core/canvas.cpp | 1 + libraries/ZWidget/src/window/window.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/ZWidget/src/core/canvas.cpp b/libraries/ZWidget/src/core/canvas.cpp index 2c564dbe29..c92101b265 100644 --- a/libraries/ZWidget/src/core/canvas.cpp +++ b/libraries/ZWidget/src/core/canvas.cpp @@ -10,6 +10,7 @@ #include #include #include +#include class CanvasTexture { diff --git a/libraries/ZWidget/src/window/window.cpp b/libraries/ZWidget/src/window/window.cpp index e32932d652..909a2e309e 100644 --- a/libraries/ZWidget/src/window/window.cpp +++ b/libraries/ZWidget/src/window/window.cpp @@ -1,5 +1,6 @@ #include "window/window.h" +#include #ifdef WIN32 @@ -67,12 +68,12 @@ Size DisplayWindow::GetScreenSize() throw std::runtime_error("DisplayWindow::GetScreenSize not implemented"); } -int DisplayWindow::StartTimer(int timeoutMilliseconds, std::function onTimer) +void* DisplayWindow::StartTimer(int timeoutMilliseconds, std::function onTimer) { throw std::runtime_error("DisplayWindow::StartTimer not implemented"); } -void DisplayWindow::StopTimer(int timerID) +void DisplayWindow::StopTimer(void* timerID) { throw std::runtime_error("DisplayWindow::StopTimer not implemented"); }