From 440980c4ef90a770a3f99c2bf4dfa1fa960074e6 Mon Sep 17 00:00:00 2001 From: guigues Date: Fri, 7 Mar 2008 08:50:05 +0000 Subject: [PATCH] *** empty log message *** --- kernel/src/bbtkWxBrowser.cxx | 2 +- kernel/src/bbtkWxBrowser.h | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/kernel/src/bbtkWxBrowser.cxx b/kernel/src/bbtkWxBrowser.cxx index 72ffbb0..0b3f0b6 100644 --- a/kernel/src/bbtkWxBrowser.cxx +++ b/kernel/src/bbtkWxBrowser.cxx @@ -242,7 +242,7 @@ namespace bbtk std::string filename = wx2std(mwxURL->GetValue()); size_t s = filename.length(); - WxConsole* C = WxConsole::GetInstance(); + WxConsole* C = mWxConsole; //::GetInstance(); if (C != 0) { if ((s>3) && (filename[s-1]=='s') diff --git a/kernel/src/bbtkWxBrowser.h b/kernel/src/bbtkWxBrowser.h index e074b1c..8f1c3b1 100644 --- a/kernel/src/bbtkWxBrowser.h +++ b/kernel/src/bbtkWxBrowser.h @@ -35,6 +35,9 @@ namespace bbtk }; + + class WxConsole; + class WxBrowser : public wxPanel { public: @@ -55,6 +58,8 @@ namespace bbtk void SetSize( wxSize ); + void SetWxConsole( WxConsole* c ) { mWxConsole = c; } + private: WxHtmlWindow* mwxHtmlWindow; wxTextCtrl* mwxURL; @@ -63,7 +68,9 @@ namespace bbtk wxButton* mwxHomeButton; wxButton* mwxReloadButton; wxButton* mwxIncludeFileButton; - + + WxConsole* mWxConsole; + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; -- 2.47.1