From 28ef036731a2758d1c2efcf4de582d063b4129ec Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 12 Nov 2008 14:46:11 +0000 Subject: [PATCH] avoid warnings on 'virtual destructor' --- appli/wxContourGUIExample/CMakeLists.txt | 16 ++++++++-------- bbtk/src/bbCreaContournDimensions.cxx | 19 +++++++++++++------ .../wxContour_MenuBar.h | 4 +++- .../CommandObject.cxx | 7 +++---- .../CommandObject.h | 2 +- .../ComposedCommand.h | 2 +- .../ExecutableCommand.h | 2 +- .../ICommandsUser.h | 1 + 8 files changed, 31 insertions(+), 22 deletions(-) diff --git a/appli/wxContourGUIExample/CMakeLists.txt b/appli/wxContourGUIExample/CMakeLists.txt index cbfed29..07cf171 100644 --- a/appli/wxContourGUIExample/CMakeLists.txt +++ b/appli/wxContourGUIExample/CMakeLists.txt @@ -8,13 +8,13 @@ ELSE(WIN32) ENDIF(WIN32) TARGET_LINK_LIBRARIES( wxContourGUIExample - creaImageIO - Interface_Icons_NDimensions_lib - Interface_ManagerContour_NDimensions_lib - kernel_ManagerContour_NDimensions_lib - CreaEnvironment - maracasVisuLib - vtkImaging vtkGraphics vtkRendering vtkFiltering vtkCommon - ) + creaImageIO + Interface_Icons_NDimensions_lib + Interface_ManagerContour_NDimensions_lib + kernel_ManagerContour_NDimensions_lib + CreaEnvironment + maracasVisuLib + vtkImaging vtkGraphics vtkRendering vtkFiltering vtkCommon + ) INSTALL_TARGETS(/bin/ wxContourGUIExample ) diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx index 29ffeaf..af72d5c 100644 --- a/bbtk/src/bbCreaContournDimensions.cxx +++ b/bbtk/src/bbCreaContournDimensions.cxx @@ -58,16 +58,23 @@ void nDimensions::CreateWidget() _builder->buildCountour_Envornment( imageSectionsFN, outlinesMap ); wxFrame* frame1 = new wxFrame(bbGetWxParent(), wxID_ANY, wxT("ROI Application - Evaluation version, 23 Oct 2008 "), wxPoint(50,50), wxSize(800, 600) ); - frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(""), wxPoint(50,50), wxSize(800, 600) ); + frame = new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600) ); frame1->CreateStatusBar(); + wxAuiNotebook * parent = frame->createNotebook(); - OutlineModelManager * modelManager = new OutlineModelManager( _builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(), _builder->getContourEnv() ); + OutlineModelManager * modelManager = new OutlineModelManager( _builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(), _builder->getContourEnv() ); - wxInstantChooserPanel * instantPanel = new wxInstantChooserPanel( parent, "Instant Chooser", true ); - ImageSourceThing * imageSource = modelManager->getImageSourceThingByKeyName( "Source Image 1" ); - wxContourViewPanel * theViewPanel = new wxContourViewPanel( imageSource->getSourceImage(), parent ); + std::string xxx1("Instant Chooser"); + wxInstantChooserPanel * instantPanel = new wxInstantChooserPanel( parent, + xxx1, + true ); + //ImageSourceThing * imageSource = modelManager->getImageSourceThingByKeyName( wxT("Source Image 1") ); + std::string xxx2("Source Image 1"); + ImageSourceThing * imageSource = modelManager->getImageSourceThingByKeyName( xxx2); + + wxContourViewPanel * theViewPanel = new wxContourViewPanel( imageSource->getSourceImage(), parent ); eventHandler = new wxContourEventHandler(); eventHandler->setModelManager( modelManager ); @@ -82,7 +89,7 @@ void nDimensions::CreateWidget() successConfiuration &= frame->configurePanels( parent ); - interfMainPanel* pannew = interfMainPanel::getInstance(frame1, eventHandler, s+"/Icons"); + //interfMainPanel* pannew = interfMainPanel::getInstance(frame1, eventHandler, s+"/Icons"); bbSetOutputWidget( frame ); diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.h b/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.h index 8540218..1a18aa3 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.h @@ -78,4 +78,6 @@ private: }; -#endif // __wxContour_MenuBar_HEADER_FILE__ \ No newline at end of file +#endif // __wxContour_MenuBar_HEADER_FILE__ + + diff --git a/lib/kernel_ManagerContour_NDimensions/CommandObject.cxx b/lib/kernel_ManagerContour_NDimensions/CommandObject.cxx index 7110e43..31ccd72 100644 --- a/lib/kernel_ManagerContour_NDimensions/CommandObject.cxx +++ b/lib/kernel_ManagerContour_NDimensions/CommandObject.cxx @@ -35,7 +35,6 @@ //------------------------------------------------------------------------------------------------------------ // Methods -//------------------------------------------------------------------------------------------------------------ - - - \ No newline at end of file +//-------------------------------------------------------------------------------------------- + + diff --git a/lib/kernel_ManagerContour_NDimensions/CommandObject.h b/lib/kernel_ManagerContour_NDimensions/CommandObject.h index 2085a22..1e9b2a7 100644 --- a/lib/kernel_ManagerContour_NDimensions/CommandObject.h +++ b/lib/kernel_ManagerContour_NDimensions/CommandObject.h @@ -26,7 +26,7 @@ public: /* * Destroys the command */ - ~CommandObject( ); + virtual ~CommandObject( ); //------------------------------------------------------------------------------------------------------------ // Methods //------------------------------------------------------------------------------------------------------------ diff --git a/lib/kernel_ManagerContour_NDimensions/ComposedCommand.h b/lib/kernel_ManagerContour_NDimensions/ComposedCommand.h index 7a0d620..4e48893 100644 --- a/lib/kernel_ManagerContour_NDimensions/ComposedCommand.h +++ b/lib/kernel_ManagerContour_NDimensions/ComposedCommand.h @@ -22,7 +22,7 @@ public: ComposedCommand( ); - ~ComposedCommand( ); + virtual ~ComposedCommand( ); //------------------------------------------------------------------------------------------------------------ // Methods //------------------------------------------------------------------------------------------------------------ diff --git a/lib/kernel_ManagerContour_NDimensions/ExecutableCommand.h b/lib/kernel_ManagerContour_NDimensions/ExecutableCommand.h index bc609a0..8a21ab4 100644 --- a/lib/kernel_ManagerContour_NDimensions/ExecutableCommand.h +++ b/lib/kernel_ManagerContour_NDimensions/ExecutableCommand.h @@ -26,7 +26,7 @@ public: /* * Destroys the command */ - ~ExecutableCommand( ); + virtual ~ExecutableCommand( ); //------------------------------------------------------------------------------------------------------------ // Methods //------------------------------------------------------------------------------------------------------------ diff --git a/lib/kernel_ManagerContour_NDimensions/ICommandsUser.h b/lib/kernel_ManagerContour_NDimensions/ICommandsUser.h index 4c7763a..dcf3185 100644 --- a/lib/kernel_ManagerContour_NDimensions/ICommandsUser.h +++ b/lib/kernel_ManagerContour_NDimensions/ICommandsUser.h @@ -16,6 +16,7 @@ class ICommandsUser{ // Constructors & Destructors //------------------------------------------------------------------------------------------------------------ public: + virtual ~ICommandsUser() {}; //------------------------------------------------------------------------------------------------------------ -- 2.45.1