--- a/Applications/Samples/SimpleViewerApplicationSingleFile.h	Tue Oct 16 11:30:00 2018 +0200
+++ b/Applications/Samples/SimpleViewerApplicationSingleFile.h	Tue Oct 16 12:57:38 2018 +0200
@@ -36,9 +36,6 @@
 #include "../../Platforms/Wasm/Defaults.h"
 #endif
 
-#if ORTHANC_ENABLE_QT==1
-#include "Qt/SampleMainWindow.h"
-#endif
 #include <Core/Logging.h>
 
 namespace OrthancStone
@@ -46,7 +43,7 @@
   namespace Samples
   {
     class SimpleViewerApplication :
-        public SampleApplicationBase,
+        public SampleSingleCanvasWithButtonsApplicationBase,
         public IObserver
     {
     private:
@@ -218,7 +215,6 @@
       std::unique_ptr<ThumbnailInteractor>  thumbnailInteractor_;
       LayoutWidget*                   mainLayout_;
       LayoutWidget*                   thumbnailsLayout_;
-      LayerWidget*                    mainWidget_;
       std::vector<LayerWidget*>       thumbnails_;
       std::map<std::string, std::vector<std::string>> instancesIdsPerSeriesId_;
       std::map<std::string, Json::Value> seriesTags_;
@@ -243,9 +239,6 @@
 //        DeclareIgnoredMessage(MessageType_Widget_ContentChanged);
       }
 
-      virtual void Finalize() {}
-      virtual IWidget* GetCentralWidget() {return mainLayout_;}
-
       virtual void DeclareStartupOptions(boost::program_options::options_description& options)
       {
         boost::program_options::options_description generic("Sample options");
@@ -412,11 +405,6 @@
       }
 #endif
 
-#if ORTHANC_ENABLE_QT==1
-      virtual QStoneMainWindow* CreateQtMainWindow() {
-        return new SampleMainWindow(dynamic_cast<OrthancStone::NativeStoneApplicationContext&>(*context_), *this);
-      }
-#endif
     };