Mercurial > hg > orthanc-stone

diff Framework/Viewport/WidgetViewport.h @ 61:ca644004d2ee wasm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MAJOR - removal of Start/Stop and observers in IWidget
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 May 2017 17:55:13 +0200
parents c2dc924f1a63
children 298f375dcb68
line wrap: on
line diff
--- a/Framework/Viewport/WidgetViewport.h	Wed May 10 16:10:47 2017 +0200
+++ b/Framework/Viewport/WidgetViewport.h	Wed May 10 17:55:13 2017 +0200
@@ -29,9 +29,7 @@
 
 namespace OrthancStone
 {
-  class WidgetViewport : 
-    public IViewport,
-    public IWidget::IChangeObserver    
+  class WidgetViewport : public IViewport
   {
   private:
     std::auto_ptr<IWidget>        centralWidget_;
@@ -43,22 +41,14 @@
     int                           lastMouseY_;
     CairoSurface                  background_;
     bool                          backgroundChanged_;
-    bool                          started_;
-
-    void UnregisterCentralWidget();
 
   public:
     WidgetViewport();
 
-    virtual ~WidgetViewport()
-    {
-      UnregisterCentralWidget();
-    }
+    virtual void SetDefaultView();
 
     virtual void SetStatusBar(IStatusBar& statusBar);
 
-    virtual void ResetStatusBar();
-
     IWidget& SetCentralWidget(IWidget* widget);  // Takes ownership
 
     virtual void NotifyChange(const IWidget& widget);
@@ -68,15 +58,6 @@
       observers_.Register(observer);
     }
 
-    virtual void Unregister(IViewport::IChangeObserver& observer)
-    {
-      observers_.Unregister(observer);
-    }
-
-    virtual void Start();
-
-    virtual void Stop();
-
     virtual void SetSize(unsigned int width,
                          unsigned int height);