*** empty log message ***

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
index 50991d12c27689408f839e8cede7bfd1cac94c71..902db263402a2189e8e5190bb88de0d80f14063f 100644 (file)
--- 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 9ae550037204019836da7a6f13ac26f9719733de..cb3231b87cd2bae070306cc4821441059f8ef675 100644 (file)
--- 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 03e14151715a2775c3fb65ee84f92dbbed0551b8..7b9736e259d56fb183f6a5952a1b6b9c840ee1ed 100644 (file)
--- 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 70f79fd4d4948763c167998e676fd1996fd5b2e1..336552366fddcd5604a0a54990b4bf8a6a887c21 100644 (file)
--- 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 fc43c0cb1eb16cc4b757e1bff25ad4d22d37b3c2..42b6312389b0c25507edaeb1805ffb8d8207bfe4 100644 (file)
--- 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 );
        }
        
        //=========================================================================