#3210 bbGEditor Feature New Normal branch vtk7itk4wx3-mingw

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / wxGEditorTabPanel.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index 42f0f580d87e398bcc1de7efea11e1a788404b6a..a8e2efb5bdbd7da061e442307e556952a8902752 100644 (file)
--- 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);
@@ -343,21 +343,22 @@ namespace bbtk
        unsigned short wxGEditorTabPanel::getUndoState( std::string &stun)
        {
                stun = "Undo";
-               if(states.size()>0)
+               if(sstates.size()>0)
                {
                        if(_actualdo == states.begin() )
+//                     if(sstates.size()==1 )
                        {
-                               
+//                             _sactualdo=sstates.begin();
                                return 0;
-                       }
-                       else
-                       {
+                       } else {
                                stun +=" - ";
-                               stun += _sactualdo->substr(0,(--_sactualdo)->find_last_of("."));
+printf("EED wxGEditorTabPanel::getUndoState This mecanisme is not working  ??????    _sactualdo sstates      _actualdo state \n");             
+//                             stun += _sactualdo->substr(0,(--_sactualdo)->find_last_of("."));                                
                                _sactualdo++;
                                return 1;
                        }
                }
+        return 0;
        }
 
        unsigned short wxGEditorTabPanel::getRedoState( std::string &stre)