From 43a87590f45aa6e55724d30d0c2d0d34b407a57e Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 17 Jan 2021 18:54:26 +0000
Subject: First cut modernizing and sanitizing

---
 display.h | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'display.h')

diff --git a/display.h b/display.h
index 2573130..e5fcc73 100644
--- a/display.h
+++ b/display.h
@@ -1,28 +1,26 @@
 #ifndef DISPLAY_INCLUDED_H
 #define DISPLAY_INCLUDED_H
 
+#include "ptr.hpp"
 #include <SDL2/SDL.h>
 #include <string>
+#include <type_traits>
 
 class Display {
 public:
 	Display(int width, int height, const std::string & title);
 
-	void Clear(float r, float g, float b, float a);
-	void SwapBuffers();
+	Display(const Display &) = delete;
+	void operator=(const Display &) = delete;
 
 	virtual ~Display();
 
-protected:
-private:
-	void
-	operator=(const Display & display)
-	{
-	}
-	Display(const Display & display) { }
+	void Clear(float r, float g, float b, float a) const;
+	void SwapBuffers() const;
 
-	SDL_Window * m_window;
-	SDL_GLContext m_glContext;
+private:
+	wrapped_ptr<SDL_Window> m_window;
+	wrapped_ptr<std::remove_pointer_t<SDL_GLContext>> m_glContext;
 };
 
 #endif
-- 
cgit v1.2.3