Program: bbtk
Module: $RCSfile: bbtkWxConsole.cxx,v $
Language: C++
- Date: $Date: 2008/01/22 15:02:00 $
- Version: $Revision: 1.1 $
+ 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
// wxFlexGridSizer *sizer = new wxFlexGridSizer(1);
wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
-
+
+
mwxNotebook = new wxNotebook(this, -1,
wxDefaultPosition, wxDefaultSize, 0);
mwxPageCommand = new wxPanel(mwxNotebook,-1);
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);
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 );
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
);
// Events connection
// COMMAND
// ENTER
+ /*
Connect( mwxTextCommand->GetId(),
wxEVT_COMMAND_TEXT_ENTER,
(wxObjectEventFunction)& WxConsole::OnCommandEnter );
wxEVT_CHAR,
//wxEVT_COMMAND_TEXT_UPDATED,
(wxObjectEventFunction)& WxConsole::OnCommandChar );
+ */
// MENU
// Connect (
new WxTextCtrlStreamRedirector(std::cerr,mwxTextHistory,*wxGREEN,true);
// Sets the console as the parent window of all bbtk windows
- WxBlackBox::bbGlobalSetTopWindow(this);
+ Wx::SetTopWindow(this);
// Layout
}
//================================================================
+
//================================================================
void WxConsole::OnCommandEnter(wxCommandEvent& event)
{
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;
}
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()
//================================================================