X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBrowser.cxx;h=874f7f61dec955acccf199639731bff0d31e4f89;hb=372f03317f05d4a436b0f9c39b98558ec4810b78;hp=e2ef48f091e780418780b2bfeef74b6ea16e7081;hpb=48552626dab4e044eec21e411cd2897227fef3fd;p=bbtk.git

diff --git a/kernel/src/bbtkWxBrowser.cxx b/kernel/src/bbtkWxBrowser.cxx
index e2ef48f..874f7f6 100644
--- a/kernel/src/bbtkWxBrowser.cxx
+++ b/kernel/src/bbtkWxBrowser.cxx
@@ -59,7 +59,8 @@ namespace bbtk
   //========================================================================
     WxBrowser::WxBrowser ( wxWindow *parent, wxSize size )
       : 
-    wxPanel ( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
+      wxPanel ( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
+      mWxConsole(0)
 
   {
     wxPanel* panel = this;
@@ -242,22 +243,27 @@ namespace bbtk
     std::string filename = wx2std(mwxURL->GetValue());
     size_t s = filename.length();
 
-    WxConsole* C = WxConsole::GetInstance();
-    if (C != 0)
+    WxConsole* C = mWxConsole; //::GetInstance();
+    //    MessageManager::SetMessageLevel("All",9);
+    Interpreter* I = new Interpreter;
+    
+    if ((s>3) && (filename[s-1]=='s')
+	&& (filename[s-2]=='b')
+	&& (filename[s-3]=='b')
+	&& (filename[s-4]=='.'))
+      {
+	std::cout << "stat"<<std::endl;
+	if (C!=0) C->SetStatusText(_T("Executing ")+mwxURL->GetValue());
+	std::cout << "int"<<std::endl;
+	I->InterpretFile(filename);
+	std::cout << "eoint"<<std::endl;
+      }
+    else
       {
-	if ((s>3) && (filename[s-1]=='s')
-	    && (filename[s-2]=='b')
-	    && (filename[s-3]=='b')
-	    && (filename[s-4]=='.'))
-	  {
-	    C->SetStatusText(_T("Executing ")+mwxURL->GetValue());
-	    C->InterpretFile(filename);
-	  }
-	else
-	  {
-	    C->SetStatusText(_T("The current page is not a bbs file : cannot execute it"));
-	  }
+	if (C!=0) C->SetStatusText(_T("The current page is not a bbs file : cannot execute it"));
       }
+    
+    delete I;
     /*
     std::string bbdoc = ConfigurationFile::GetInstance().Get_url();
     bbdoc += "/bbdoc";
@@ -272,7 +278,6 @@ namespace bbtk
   //======================================================================== 
   void WxBrowser::OnURLEnter( wxCommandEvent&)
   { 
-    std::cout  << "OnURL"<<std::endl;
     mwxHtmlWindow->LoadPage(mwxURL->GetValue());
   }
   //========================================================================
@@ -281,10 +286,9 @@ namespace bbtk
   //========================================================================
   void WxBrowser::OnLinkClicked(wxHtmlLinkEvent& e)
   {
-    std::cout  << "WxBrowser::OnLinkClicked"<<std::endl;
-    std::cout  << e.GetLinkInfo().GetHref()<<std::endl;
-    mwxHtmlWindow->LoadPage(e.GetLinkInfo().GetHref());
+    mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() );
 	UpdateURL();
+    mwxHtmlWindow->LoadPage( mwxURL->GetValue() );
   }
   //========================================================================