From 176b1a4707225796ea3d290b379b3e404a2d94b8 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 17 Jun 2022 21:22:24 +0100 Subject: [PATCH] Fix build with new pugl Signed-off-by: falkTX --- dgl/src/Window.cpp | 2 +- dgl/src/WindowPrivateData.cpp | 4 ++-- dgl/src/pugl.cpp | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dgl/src/Window.cpp b/dgl/src/Window.cpp index a068038e..37c61d11 100644 --- a/dgl/src/Window.cpp +++ b/dgl/src/Window.cpp @@ -362,7 +362,7 @@ const GraphicsContext& Window::getGraphicsContext() const noexcept uintptr_t Window::getNativeWindowHandle() const noexcept { - return puglGetNativeWindow(pData->view); + return puglGetNativeView(pData->view); } double Window::getScaleFactor() const noexcept diff --git a/dgl/src/WindowPrivateData.cpp b/dgl/src/WindowPrivateData.cpp index 522da6b5..963bf83f 100644 --- a/dgl/src/WindowPrivateData.cpp +++ b/dgl/src/WindowPrivateData.cpp @@ -70,7 +70,7 @@ static PuglView* puglNewViewWithTransientParent(PuglWorld* const world, PuglView if (PuglView* const view = puglNewView(world)) { - puglSetTransientParent(view, puglGetNativeWindow(transientParentView)); + puglSetTransientParent(view, puglGetNativeView(transientParentView)); return view; } @@ -477,7 +477,7 @@ bool Window::PrivateData::openFileBrowser(const FileBrowserOptions& options) options2.title = puglGetWindowTitle(view); fileBrowserHandle = fileBrowserCreate(isEmbed, - puglGetNativeWindow(view), + puglGetNativeView(view), autoScaling ? autoScaleFactor : scaleFactor, options2); diff --git a/dgl/src/pugl.cpp b/dgl/src/pugl.cpp index acda6628..119c576b 100644 --- a/dgl/src/pugl.cpp +++ b/dgl/src/pugl.cpp @@ -167,7 +167,8 @@ START_NAMESPACE_DGL # endif #endif -#include "pugl-upstream/src/implementation.c" +#include "pugl-upstream/src/common.c" +#include "pugl-upstream/src/internal.c" // -------------------------------------------------------------------------------------------------------------------- // DGL specific, expose backend enter