Program: bbtk
Module: $RCSfile: bbtkWxGUIHtmlBrowser.cxx,v $
Language: C++
- Date: $Date: 2008/03/20 09:51:29 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2008/03/21 14:59:39 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//========================================================================
- WxGUIHtmlBrowser::WxGUIHtmlBrowser ( wxWindow *parent, wxSize size )
+ WxGUIHtmlBrowser::WxGUIHtmlBrowser ( wxWindow *parent, wxSize size,
+ WxGUIHtmlBrowserUser* user)
:
- wxPanel ( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
- // , mWxGUIConsole(0)
+ wxPanel ( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
+ mUser(user)
{
wxPanel* panel = this;
mwxBackButton = new wxButton( panel, bwd_id,_T("<"),wxDefaultPosition,
wxDefaultSize,wxBU_EXACTFIT);
- bsizer->Add ( mwxBackButton , 0, wxALIGN_CENTRE | wxLEFT | wxTOP | wxBOTTOM , 10 );
+ bsizer->Add ( mwxBackButton , 0, wxALIGN_CENTRE );
mwxForwardButton = new wxButton( panel, fwd_id,_T(">"),wxDefaultPosition,
wxDefaultSize,wxBU_EXACTFIT);
- bsizer->Add ( mwxForwardButton , 0, wxALIGN_CENTRE | wxTOP | wxBOTTOM , 10);
+ bsizer->Add ( mwxForwardButton , 0, wxALIGN_CENTRE );
mwxHomeButton = new wxButton( panel, home_id,_T("Home"),wxDefaultPosition,
wxDefaultSize,wxBU_EXACTFIT);
- bsizer->Add ( mwxHomeButton , 0, wxALIGN_CENTRE | wxLEFT | wxTOP | wxBOTTOM , 10 );
+ bsizer->Add ( mwxHomeButton , 0, wxALIGN_CENTRE );
mwxReloadButton = new wxButton( panel, reload_id,_T("Reload"),wxDefaultPosition,
wxDefaultSize,wxBU_EXACTFIT);
- bsizer->Add ( mwxReloadButton , 0, wxALIGN_CENTRE | wxTOP | wxBOTTOM , 10 );
+ bsizer->Add ( mwxReloadButton , 0, wxALIGN_CENTRE );
/*
mwxIncludeFileButton = new wxButton( panel, include_id,
wxDefaultSize,
wxTE_PROCESS_ENTER);
mwxURL->SetLabel(_T("URL"));
- bsizer->Add(mwxURL, 1, wxEXPAND | wxALL, 10);
+ bsizer->Add(mwxURL, 1, wxEXPAND);
// mwxHtmlWindow = new WxHtmlWindow(parent,html_id,this,size);
//========================================================================
void WxGUIHtmlBrowser::OnLinkClicked(wxHtmlLinkEvent& e)
- {
- mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() );
+ {
+ std::cout << "BrOnLink"<<std::endl;
+
+ bool go = true;
+ if (mUser)
+ {
+ wxString file = wxPathOnly(mwxURL->GetValue());
+ file += std2wx(ConfigurationFile::GetInstance().Get_file_separator());
+ file += e.GetLinkInfo().GetHref();
+ go = mUser->WxGUIHtmlBrowserUserOnLinkClicked( wx2std( file ) );
+ }
+ if (go)
+ {
+ mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() );
UpdateURL();
- mwxHtmlWindow->LoadPage( mwxURL->GetValue() );
- }
+ }
+ // mwxHtmlWindow->LoadPage( mwxURL->GetValue() );
+ }
//========================================================================