From: jean-pierre roux Date: Mon, 16 Nov 2009 16:42:24 +0000 (+0000) Subject: Fix exception type X-Git-Tag: CREATOOLS.2-0-3~120 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8e51f74bc77447daf61b8e1caf7ab07ae235b578;p=creaMaracasVisu.git Fix exception type --- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h index 7714676..edd3309 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h @@ -28,15 +28,15 @@ class creaMaracasVisu_EXPORT wxMaracasRendererView : public wxPanel public: wxMaracasRendererView( wxWindow* parent, std::string path); - ~wxMaracasRendererView( ); + ~wxMaracasRendererView( ); static wxMaracasRendererView* getInstance(wxWindow* parent,std::string path=""); static wxMaracasRendererView* getInstance(); - + std::string getPath(); - wxMaracasRenderTabbedPanel* getTabbedPanel(int id)throw(char*); + wxMaracasRenderTabbedPanel* getTabbedPanel(int id) throw(char*); - void setRenderer(vtkRenderer* renderer) throw(char*); + void setRenderer(vtkRenderer* renderer); /* throw(char*), */ // JPR void onLoadImageFile(); void addVolumes(vtkImageData* img, std::string pathfile, std::string filename); void addPanels(wxMaracasRenderTabbedPanel* wxtabs, vtkImageData* img, std::string pathfile, std::string filename); @@ -48,13 +48,13 @@ public: void addRemoveSurf3Actor(int id, bool addremove); std::vector getFiles(); - + private: static wxMaracasRendererView* instance; std::vector tabsVector; std::vector files; - + wxAuiManager* wxauimanager; wxToolBar * _toolb; @@ -64,7 +64,6 @@ private: class ToolBarEventHandlerRenderer : public wxEvtHandler { - public: ToolBarEventHandlerRenderer(); ~ToolBarEventHandlerRenderer(); @@ -78,16 +77,13 @@ class ToolBarEventHandlerRenderer : public wxEvtHandler class ToolBarRenderer : public wxToolBar{ - public: ToolBarRenderer(wxWindow * parent,std::string iconsdir); ~ToolBarRenderer(void); - private: ToolBarEventHandlerRenderer* _evthand; - }; #endif