diff Framework/Viewport/SdlViewport.h @ 942:685c9a2d115f

Added missing ORTHANC_OVERRIDE + preparation for lost GL context handling + stubs for GL context event handlers
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 05 Aug 2019 12:27:27 +0200
parents 7a7e4e1f558f
children 1091b2adeb5a
line wrap: on
line diff
--- a/Framework/Viewport/SdlViewport.h	Wed Jul 31 11:29:08 2019 +0200
+++ b/Framework/Viewport/SdlViewport.h	Mon Aug 05 12:27:27 2019 +0200
@@ -81,22 +81,21 @@
                       boost::shared_ptr<Scene2D>& scene,
                       bool allowDpiScaling = true);
 
-
-    virtual ICompositor& GetCompositor()
-    {
-      return compositor_;
-    }
-
-    virtual SdlWindow& GetWindow()
+    virtual SdlWindow& GetWindow() ORTHANC_OVERRIDE
     {
       return context_.GetWindow();
     }
 
-    virtual void UpdateSize(unsigned int width,
-                            unsigned int height)
+    virtual void UpdateSize(unsigned int width, unsigned int height) ORTHANC_OVERRIDE
     {
       // nothing to do in OpenGL, the OpenGLCompositor::UpdateSize will be called automatically
     }
+
+  protected:
+    virtual ICompositor& GetCompositor() ORTHANC_OVERRIDE
+    {
+      return compositor_;
+    }
   };
 
 
@@ -121,20 +120,20 @@
 
     ~SdlCairoViewport();
 
-    virtual ICompositor& GetCompositor()
-    {
-      return compositor_;
-    }
-
-    virtual SdlWindow& GetWindow()
+    virtual SdlWindow& GetWindow() ORTHANC_OVERRIDE
     {
       return window_;
     }
 
-    virtual void Refresh();
+    virtual void Refresh() ORTHANC_OVERRIDE;
 
     virtual void UpdateSize(unsigned int width,
-                            unsigned int height);
+                            unsigned int height) ORTHANC_OVERRIDE;
+  protected:
+    virtual ICompositor& GetCompositor() ORTHANC_OVERRIDE
+    {
+      return compositor_;
+    }
 
   private:
     void UpdateSdlSurfaceSize(unsigned int width,