From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Sat, 20 Dec 2014 23:50:42 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtkGEditor
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6175f5e27f2597deedac398b27df03418e4e3478;hp=6092284bf6d88aa8eccef527d845ad7537fdf903;p=bbtkGEditor.git

Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtkGEditor
---

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index 42f0f58..a254072 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
@@ -75,7 +75,7 @@ namespace bbtk
 	wxGEditorTabPanel::wxGEditorTabPanel(wxWindow *parent,int id, Factory::Pointer bbtkfactory)
 	 : wxPanel(parent),wxTextDropTarget()
 	{
-		_id=id;
+		_id				= id;
 		_panelAUIMgr	= new wxAuiManager(this);
 		_sceneManager	= NULL;
 		_actualdo		= states.begin();
@@ -89,7 +89,7 @@ namespace bbtk
 	{
 //ED02JUIN2010		_sceneManager->disconnectDrop();
 
-        _panelsManager->VerifyLastTabPanel();
+      _panelsManager->VerifyLastTabPanel();
 		//FCY memory leaks
 		delete _panelAUIMgr;
 		delete _sceneManager;
@@ -98,7 +98,7 @@ namespace bbtk
 	//=========================================================================
 	void wxGEditorTabPanel::initWxVtkCanvas()
 	{
-		wxVtk3DBaseView *baseview = new wxVtk3DBaseView(this);
+		wxVtk3DBaseView *baseview = new wxVtk3DBaseView(this,NULL);
 		baseview->Configure();
 //EED 07 juin 2013
 		baseview->GetCamera()->SetViewUp (0, 1, 0);