X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkWxConsole.cxx;h=b4b7e3a564e5f5b04df4ac60b8155af0e7b2e57a;hb=6ea571ab3b7a539aaaca066db3941f5017920209;hp=a29cfb1f2cc981520c2d4c6b4464a89cd3092388;hpb=5ca30b861f60def2666a1c675e8b45df0a713f95;p=bbtk.git

diff --git a/kernel/src/bbtkWxConsole.cxx b/kernel/src/bbtkWxConsole.cxx
index a29cfb1..b4b7e3a 100644
--- a/kernel/src/bbtkWxConsole.cxx
+++ b/kernel/src/bbtkWxConsole.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxConsole.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/08 10:05:38 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/02/21 09:37:23 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -185,7 +185,8 @@ namespace bbtk
     
     //    wxFlexGridSizer *sizer = new wxFlexGridSizer(1);
     wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
-    
+
+
     mwxNotebook = new wxNotebook(this, -1, 
 				 wxDefaultPosition, wxDefaultSize, 0);
     mwxPageCommand = new wxPanel(mwxNotebook,-1);    
@@ -193,8 +194,9 @@ namespace bbtk
 
     mwxPageHelp = new wxPanel(mwxNotebook,-1);    
     mwxNotebook->AddPage( mwxPageHelp, _T("Help"));
-    
-    sizer->Add ( mwxNotebook, 1, wxGROW | wxALIGN_BOTTOM );
+
+
+    sizer->Add ( mwxNotebook, 1, wxEXPAND /*| wxALIGN_BOTTOM*/ );
     
     wxBoxSizer *cmdsizer = new wxBoxSizer(wxVERTICAL);
     
@@ -211,16 +213,20 @@ namespace bbtk
     helpsizer->SetSizeHints(mwxPageHelp);
    
     mwxHtmlWindow = new WxBrowser(mwxPageHelp,
-				  wxSize(1200,0));
+//EED				  wxSize(1200,0));
+					  wxSize(200,0));
 
     //    mwxHtmlWindow->SetSize(wxSize(800,1000));
-    helpsizer->Add (mwxHtmlWindow,  wxALL | wxGROW );
+    helpsizer->Add (mwxHtmlWindow,1,   wxGROW |wxLEFT | wxRIGHT | wxBOTTOM  );
+//    helpsizer->Add ( new wxButton(mwxPageHelp,-1,"perro"), 0,  wxEXPAND  );
   
     //==============
     // Command page 
 
     mwxTextHistory = 
-      new wxTextCtrl(mwxPageCommand,0,_T(""),wxDefaultPosition,
+      new wxTextCtrl(mwxPageCommand,
+		     ID_Text_History,
+		     _T(""),wxDefaultPosition,
 		     wxDefaultSize, //HistorySize,
 		     wxTE_READONLY |
 		     wxTE_MULTILINE );
@@ -234,13 +240,14 @@ namespace bbtk
    mwxTextHistoryAttr = new wxTextAttr;
    mwxTextHistoryAttr->SetFont(*FixedFont);
    mwxTextCommand = 
-     new wxTextCtrl(mwxPageCommand,0,_T(""),wxDefaultPosition,
-		    wxDefaultSize,//CommandSize,
-		    
+     new wxTextCtrl(mwxPageCommand,
+		    ID_Text_Command,
+		    _T(""),wxDefaultPosition,
+		    wxDefaultSize,
 		    wxTE_PROCESS_ENTER
-			| 
-		    wxTE_PROCESS_TAB | wxWANTS_CHARS 
-//			|  wxTAB_TRAVERSAL
+		    | wxTE_PROCESS_TAB 
+		    | wxWANTS_CHARS 
+		    //| wxTAB_TRAVERSAL
 		    );
    
 
@@ -265,6 +272,7 @@ namespace bbtk
     // Events connection
     // COMMAND
     // ENTER
+    /*
     Connect( mwxTextCommand->GetId(),
 	     wxEVT_COMMAND_TEXT_ENTER,
 	     (wxObjectEventFunction)& WxConsole::OnCommandEnter );
@@ -272,6 +280,7 @@ namespace bbtk
 	     wxEVT_CHAR,
 	     //wxEVT_COMMAND_TEXT_UPDATED,
 	     (wxObjectEventFunction)& WxConsole::OnCommandChar );
+    */
     // MENU
     //    Connect ( 
 
@@ -301,6 +310,7 @@ namespace bbtk
   }
   //================================================================
 
+
   //================================================================
   void WxConsole::OnCommandEnter(wxCommandEvent& event)
   {
@@ -401,7 +411,11 @@ namespace bbtk
   void WxConsole::ShowHtmlPage(std::string& page)
   {
     //  std::cout << "WxConsole::ShowHtmlPage('"<<page<<"')"<<std::endl;
-    if (!mwxHtmlWindow->GoTo(page)) 
+    if (mwxHtmlWindow->GoTo(page)) 
+      {
+	mwxNotebook->ChangeSelection(1);
+      }
+    else 
       {
 	//	std::cout << "ERROR html"<<std::endl;
       }
@@ -411,6 +425,8 @@ namespace bbtk
   BEGIN_EVENT_TABLE(WxConsole, wxFrame)
     EVT_MENU(WxConsole::ID_Menu_Quit, WxConsole::OnMenuQuit)
     EVT_MENU(WxConsole::ID_Menu_About, WxConsole::OnMenuAbout)
+    EVT_TEXT_ENTER(WxConsole::ID_Text_Command, WxConsole::OnCommandEnter)
+  //    EVT_CHAR(WxConsole::ID_Text_Command, WxConsole::OnCommandChar)
     END_EVENT_TABLE()
   //================================================================