From: davila <>
Date: Tue, 15 Jun 2010 14:18:31 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v1_0_0~63
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=66d85963bdb3dea88f7d8e8931855d092629b37c;p=bbtkGEditor.git

*** empty log message ***
---

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
index 50991d1..902db26 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
@@ -43,6 +43,7 @@ namespace bbtk
 	//=========================================================================
 	wxVtkSceneManager::wxVtkSceneManager(wxGEditorTabPanel *parent, wxVtk3DBaseView *baseView,int idManager)
 	{
+		printf ("EED %p wxVtkSceneManager()\n" , this );
 		_parent = parent;
 		_numBoxes=0;
 		_idManager=idManager;
@@ -52,6 +53,7 @@ namespace bbtk
 
 		if( _baseView!=NULL )
 		{
+//EED02JUIN2010	
 			_baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget((wxDropTarget*)parent);			
 			configureBaseView();
 			_worldState=NOTHING_HAPPENS;
@@ -65,13 +67,17 @@ namespace bbtk
 
 	void wxVtkSceneManager::disconnectDrop()
 	{
-		_baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget(NULL);
+		printf ("EED %p ~wxVtkSceneManager::disconnectDrop()\n" , this );
+//EED02JUIN2010		_baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget(NULL);
+//	_baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget( new tmpClasswxTextDropTarget() );
    	}
 
 	//=========================================================================
 
 	wxVtkSceneManager::~wxVtkSceneManager()
 	{
+		printf ("EED %p ~wxVtkSceneManager()\n" , this );
+		disconnectDrop();
 	}
  
 	//=========================================================================
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 9ae5500..cb3231b 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -44,6 +44,9 @@ namespace bbtk
 	wxGUIEditorGraphicBBS::wxGUIEditorGraphicBBS(wxFrame *parent)
 		: wxFrame(parent, -1, _T("bbtkGEditor"),wxDefaultPosition, wxSize(1200,800))
 	{
+
+		printf ("EED %p wxGUIEditorGraphicBBS()\n" , this );
+
 		_frameAUIMgr = new wxAuiManager(this);
 		
 
@@ -80,7 +83,13 @@ namespace bbtk
 	//=========================================================================
 	wxGUIEditorGraphicBBS::~wxGUIEditorGraphicBBS()
 	{
-		_frameAUIMgr->UnInit();
+		printf ("EED %p ~wxGUIEditorGraphicBBS()\n" , this );
+
+//EED02JUIN2010		delete _tabsMgr;
+
+	    _frameAUIMgr->UnInit();
+
+
 	}
 
 	//=========================================================================
@@ -352,7 +361,10 @@ namespace bbtk
 		#endif
 
  		//command += ConfigurationFile::GetInstance().Get_bin_path();
-		command +="C:/temp/bbtkBIN/RelWithDebInfo//";
+//EED		command +="C:/temp/bbtkBIN/RelWithDebInfo//";
+//EED		command +="C:/Program Files/CreaTools/bbtk-0.9.5/bin";
+		command +=".";
+
 
 		#ifdef MACOSX
 			command += separator + "bbi.app/Contents/MacOS/bbi\" ";
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index 03e1415..7b9736e 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
@@ -43,11 +43,13 @@ namespace bbtk
 	//=========================================================================
 	wxGEditorTabPanel::wxGEditorTabPanel()
 	{
+		printf ("EED %p wxGEditorTabPanel 1 ()\n" , this );
 	}
 
 	//=========================================================================
 	wxGEditorTabPanel::wxGEditorTabPanel(wxWindow *parent,int id):wxPanel(parent),wxTextDropTarget()
 	{
+		printf ("EED %p wxGEditorTabPanel 2 ()\n" , this );
 		_id=id;
 		_panelAUIMgr = new wxAuiManager(this);
 		_sceneManager = NULL;
@@ -57,7 +59,8 @@ namespace bbtk
 	//=========================================================================
 	wxGEditorTabPanel::~wxGEditorTabPanel()
 	{
-		_sceneManager->disconnectDrop();
+printf ("EED %p ~wxGEditorTabPanel()\n" , this );
+//ED02JUIN2010		_sceneManager->disconnectDrop();
 	}
 	
 	//=========================================================================
@@ -65,10 +68,10 @@ namespace bbtk
 	{
 		wxVtk3DBaseView *baseview = new wxVtk3DBaseView(this);
 		baseview->Configure();
-
 		_sceneManager=new wxVtkSceneManager(this,baseview,_id);
-
 		_panelAUIMgr->AddPane((wxWindow*)baseview->GetWxVTKRenderWindowInteractor(),wxAuiPaneInfo().Fixed().CenterPane());
+//EED02JUIN2010
+
 		_panelAUIMgr->Update();
 	}
 
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
index 70f79fd..3365523 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
@@ -64,11 +64,19 @@ Version:   $Revision$
 namespace bbtk
 {
 
+	class tmpClasswxTextDropTarget :   public wxTextDropTarget
+	{
+		public: 
+ 		  virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& data) { return false;}
+	};
+
+
+
 	class wxVtkSceneManager;
 
 	class wxTabPanelsManager;
 
-	class wxGEditorTabPanel :  public wxTextDropTarget, public wxPanel
+	class wxGEditorTabPanel :  public wxPanel, public wxTextDropTarget
 	{
 	public: 
 		wxGEditorTabPanel();
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
index fc43c0c..42b6312 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
@@ -44,6 +44,7 @@ namespace bbtk
 	//=========================================================================
 	wxTabPanelsManager::wxTabPanelsManager(wxGUIEditorGraphicBBS *parent)
 	{
+		printf ("EED %p wxTabPanelsManager()\n" , this );
 		_parent = parent;
 		_lastId = 0;
 		_notebook = _parent->getAuiNotebook();
@@ -54,6 +55,7 @@ namespace bbtk
 	//=========================================================================
 	wxTabPanelsManager::~wxTabPanelsManager()
 	{
+		printf ("EED %p ~wxTabPanelsManager()\n" , this );
 	}
 	
 	//=========================================================================