BUG HTML in windows + Cast float int

[bbtk.git] / kernel / src / bbtkWxConsole.cxx

diff --git a/kernel/src/bbtkWxConsole.cxx b/kernel/src/bbtkWxConsole.cxx
index 943d52a8736d3179926481e02e997fda71274a03..b4b7e3a564e5f5b04df4ac60b8155af0e7b2e57a 100644 (file)
--- 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/14 13:44:25 $
-  Version:   $Revision: 1.4 $
+  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,10 +213,12 @@ 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