From ffe1a84634db0bec6031789f0d64ac6cf2534221 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 6 May 2021 22:18:42 +0100
Subject: [PATCH] cleanup pugl.cpp

---
 dgl/Widget.hpp     |  2 +-
 dgl/src/Cairo.cpp  | 11 +++++++++++
 dgl/src/OpenGL.cpp |  8 ++++++++
 dgl/src/pugl.cpp   | 23 +----------------------
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/dgl/Widget.hpp b/dgl/Widget.hpp
index 07fe4eb1..f5a405c5 100644
--- a/dgl/Widget.hpp
+++ b/dgl/Widget.hpp
@@ -164,7 +164,7 @@ public:
 
    /**
       Get top-level widget, as passed directly in the constructor
-      or going up the chain of group widgets until it finds the top-level widget.
+      or going up the chain of group widgets until it finds the top-level one.
     */
     TopLevelWidget* getTopLevelWidget() const noexcept;
 
diff --git a/dgl/src/Cairo.cpp b/dgl/src/Cairo.cpp
index 2c1f60d4..db11e60a 100644
--- a/dgl/src/Cairo.cpp
+++ b/dgl/src/Cairo.cpp
@@ -88,4 +88,15 @@ void Widget::PrivateData::display(const uint width,
 
 // -----------------------------------------------------------------------
 
+const GraphicsContext& Window::PrivateData::getGraphicsContext() const noexcept
+{
+    GraphicsContext& context((GraphicsContext&)graphicsContext);
+#ifdef DGL_CAIRO
+    ((CairoGraphicsContext&)context).handle = (cairo_t*)puglGetContext(view);
+#endif
+    return context;
+}
+
+// -----------------------------------------------------------------------
+
 END_NAMESPACE_DGL
diff --git a/dgl/src/OpenGL.cpp b/dgl/src/OpenGL.cpp
index 6d3c5bb9..bca4b79a 100644
--- a/dgl/src/OpenGL.cpp
+++ b/dgl/src/OpenGL.cpp
@@ -16,6 +16,7 @@
 
 #include "../OpenGL.hpp"
 #include "WidgetPrivateData.hpp"
+#include "WindowPrivateData.hpp"
 
 START_NAMESPACE_DGL
 
@@ -170,4 +171,11 @@ void Widget::PrivateData::display(const uint width,
 
 // -----------------------------------------------------------------------
 
+const GraphicsContext& Window::PrivateData::getGraphicsContext() const noexcept
+{
+    return (const GraphicsContext&)graphicsContext;
+}
+
+// -----------------------------------------------------------------------
+
 END_NAMESPACE_DGL
diff --git a/dgl/src/pugl.cpp b/dgl/src/pugl.cpp
index aba3442e..f5d02976 100644
--- a/dgl/src/pugl.cpp
+++ b/dgl/src/pugl.cpp
@@ -171,6 +171,7 @@ void puglSetMatchingBackendForCurrentBuild(PuglView* view)
 
 // --------------------------------------------------------------------------------------------------------------------
 // DGL specific, build-specific fallback drawing
+
 void puglFallbackOnDisplay(PuglView*)
 {
 #ifdef DGL_OPENGL
@@ -196,28 +197,6 @@ void puglFallbackOnResize(PuglView* view)
 #endif
 }
 
-END_NAMESPACE_DGL
-
 // --------------------------------------------------------------------------------------------------------------------
-// extra, build-specific stuff
-
-#include "WindowPrivateData.hpp"
-
-#ifdef DGL_CAIRO
-# include "../Cairo.hpp"
-#endif
-
-START_NAMESPACE_DGL
-
-const GraphicsContext& Window::PrivateData::getGraphicsContext() const noexcept
-{
-    GraphicsContext& context((GraphicsContext&)graphicsContext);
-#ifdef DGL_CAIRO
-    ((CairoGraphicsContext&)context).handle = (cairo_t*)puglGetContext(view);
-#endif
-    return context;
-}
 
 END_NAMESPACE_DGL
-
-// --------------------------------------------------------------------------------------------------------------------