X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUITextEditor.cxx;h=643c962ac0dd0eb44261bbfc4b7747e6169416f3;hb=ef68c7c7d002e0fcaf3255868c54021b3cf077df;hp=c8baa3759153c030615743deed9a036be936bca1;hpb=62f21094493592cc2ccf1f105db791fb0ebbe2d0;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUITextEditor.cxx b/kernel/src/bbtkWxGUITextEditor.cxx
index c8baa37..643c962 100644
--- a/kernel/src/bbtkWxGUITextEditor.cxx
+++ b/kernel/src/bbtkWxGUITextEditor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUITextEditor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/06/26 07:37:05 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/10/03 14:27:52 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,20 +38,20 @@
 #include "bbtkConfigurationFile.h"
 #include "bbtkUtilities.h"
 
-#include "icons/cc_new.xpm"
-#include "icons/cc_open.xpm"
-#include "icons/cc_stop.xpm"
-#include "icons/cc_save.xpm"
-#include "icons/cc_save_as.xpm"
-#include "icons/cc_run.xpm"
-#include "icons/cc_exit.xpm"
+//#include "icons/cc_new.xpm"
+//#include "icons/cc_open.xpm"
+//#include "icons/cc_stop.xpm"
+//#include "icons/cc_save.xpm"
+//#include "icons/cc_save_as.xpm"
+//#include "icons/cc_run.xpm"
+//#include "icons/cc_exit.xpm"
 
 #include "../data/icons/wxart_new.xpm"
 #include "../data/icons/wxart_fileopen.xpm"
 #include "../data/icons/wxart_filesave.xpm"
 #include "../data/icons/wxart_filesaveas.xpm"
-#include "../data/icons/wxart_exefile.xpm"
-#include "../data/icons/wxart_delete.xpm"
+//#include "../data/icons/wxart_exefile.xpm"
+//#include "../data/icons/wxart_delete.xpm"
 #include "../data/icons/wxart_down.xpm"
 #include "../data/icons/wxart_eldel.xpm"
 
@@ -107,7 +107,6 @@ namespace bbtk
   //================================================================
   
   
-
   //================================================================  
   /*  BEGIN_EVENT_TABLE(WxGUITextEditorPage, wxPanel)
     EVT_CLOSE(WxGUITextEditorPage::OnClose)
@@ -122,9 +121,13 @@ namespace bbtk
       mName(""),
       mAskFilename(true)
   {  
+
+	  //	  std::cout << "WxGUITextEditorPage::WxGUITextEditorPage("<<mName<<")"<<std::endl;
+
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
  
     mwxInputText = 
+		
       new WxTextCtrlGettingKeyEvents(this,
 				     -1, //ID_InputText,
 				     _T(""),
@@ -132,12 +135,22 @@ namespace bbtk
 				     wxDefaultSize,
 				     wxTE_MULTILINE 
 				     //    |wxTE_PROCESS_ENTER
-				     | wxTE_PROCESS_TAB 
+				     //| wxTE_PROCESS_TAB 
 				     //		    | wxWANTS_CHARS 
-				     |  wxTAB_TRAVERSAL
+				    // |  wxTAB_TRAVERSAL
 				     );
     mwxInputText->SetWxGUITextEditor(mEditor);
-    
+    /*
+	new wxTextCtrl(this,-1,_T(""),
+		wxDefaultPosition,
+					     wxDefaultSize,
+					     wxTE_MULTILINE 
+					     //    |wxTE_PROCESS_ENTER
+					//	 | wxTE_PROCESS_TAB 
+				//		    | wxWANTS_CHARS 
+				 //    |  wxTAB_TRAVERSAL
+				     );
+					 */
     wxFont* FixedFont = new wxFont(10,
                                    wxFONTFAMILY_MODERN,
                                    wxFONTSTYLE_NORMAL,
@@ -245,11 +258,25 @@ namespace bbtk
       mUser(user),
       mFileNameFilter("*.*")
   {
-    m_mgr.SetManagedWindow(this);
-    
-    //    wxInitAllImageHandlers();
-      
-    mwxNotebook = new wxAuiNotebook(this,  
+  //  m_mgr.SetManagedWindow(this);
+		    //    wxInitAllImageHandlers();
+     
+	//  std::cout << "WxGUITextEditor::WxGUITextEditor"<<std::endl;
+
+      wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+    mwxNotebook = new wxNotebook(this,-1,
+		wxDefaultPosition, wxDefaultSize, 
+		wxNB_TOP 
+
+		
+		);
+		
+   sizer->Add(mwxNotebook,1,wxGROW);
+
+		
+		/*
+   mwxNotebook = 		new wxAuiNotebook(this,  
 				    -1,
 				    wxPoint(0, 0),
 				    wxSize(500,500),
@@ -274,7 +301,7 @@ namespace bbtk
 		  .Center()
 		  .MinSize(wxSize(100,50))
 		  );   
-
+*/
  
     /*   
     wxBitmap bmp_new(cc_new_xpm);
@@ -319,6 +346,9 @@ namespace bbtk
     mwxToolBar->AddControl(mwxPosition);
     mwxToolBar->Realize();
 
+	  sizer->Add(mwxToolBar,0,wxGROW);
+
+	/*
     m_mgr.AddPane(mwxToolBar, 
 		  wxAuiPaneInfo().Name(wxT("toolBar"))
 		  .Caption(wxT(""))
@@ -327,20 +357,24 @@ namespace bbtk
 		  .MinSize(wxSize(100,50))
 		  .LeftDockable(false).RightDockable(false)
 		  );   
-
-    NewPage("");
-    UpdateInfo();
+*/
+  SetSizer(sizer);
+  
     
-    m_mgr.Update();
+//    m_mgr.Update();
     SetAutoLayout(true);
     Layout();
+
+    NewPage("");
+    UpdateInfo();
+
   }
   //================================================================
   
   //================================================================
   WxGUITextEditor::~WxGUITextEditor()
   {
-    m_mgr.UnInit();
+  //  m_mgr.UnInit();
 
     //    delete mInterpreter;
   }
@@ -489,7 +523,7 @@ namespace bbtk
       } 
     mwxNotebook->DeletePage(mwxNotebook->GetSelection());
     FocusOnCurrentPage();
-    return false;
+    return true;
   }
   //================================================================  
 
@@ -614,7 +648,7 @@ namespace bbtk
   //================================================================
   void WxGUITextEditor::OnKeyUp(wxKeyEvent& event)
   {
-    //  std::cout << "U" << std::endl;
+  //    std::cout << "U" << std::endl;
     UpdateInfo();
   }
   //================================================================
@@ -622,7 +656,7 @@ namespace bbtk
   //================================================================
   void WxGUITextEditor::OnKeyDown(wxKeyEvent& event)
   {
-    //    std::cout << "D" << std::endl;
+     //   std::cout << "D" << std::endl;
     // std::cout << "Key="<<event.GetKeyCode()<<std::endl;
     if ( event.ControlDown() )
       {
@@ -668,8 +702,8 @@ namespace bbtk
     
     SetSizer(sizer);
 
-    // Creates the parent window of all bbtk windows as a child of this
-    Wx::CreateTopWindow(this);
+    // parent window of all bbtk windows will be a child of this
+    Wx::SetTopWindowParent(this);
     // Add the method OnWxSignal as a Wx::Signal observer 
     //bbtkAddWxSignalObserver(WxGUITextEditorWindow::OnWxSignal);