X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=kernel%2Fsrc%2FbbtkWxBrowser.h;h=8f1c3b153ee3a0ad2db2c6854bc10ead81ea27d9;hb=5e6e754f059d5fb6b25b883f89f76333228ba5c4;hp=8efe171fcbc90c1d9a98f0849ba3b58562792e7a;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git diff --git a/kernel/src/bbtkWxBrowser.h b/kernel/src/bbtkWxBrowser.h index 8efe171..8f1c3b1 100644 --- a/kernel/src/bbtkWxBrowser.h +++ b/kernel/src/bbtkWxBrowser.h @@ -5,7 +5,6 @@ #define __bbtkWxBrowser_h_INCLUDED__ #include "bbtkWx.h" -//#include #include namespace bbtk @@ -27,7 +26,7 @@ namespace bbtk } // wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,const wxString& url, wxString *redirect); - virtual void OnLinkClicked(const wxHtmlLinkInfo& link); +//EED virtual void OnLinkClicked(const wxHtmlLinkInfo& link); private: WxBrowser* mBrowser; @@ -36,28 +35,42 @@ namespace bbtk }; + + class WxConsole; + class WxBrowser : public wxPanel { public: WxBrowser ( wxWindow *parent, wxSize size ); bool GoTo(std::string&); + void GoHome(); void OnBackButton(wxCommandEvent& ); void OnForwardButton(wxCommandEvent& ); - void OnLinkClicked(wxHtmlLinkEvent& ); + void OnHomeButton(wxCommandEvent& ); + void OnReloadButton(wxCommandEvent& ); + void OnIncludeFileButton(wxCommandEvent& ); + void OnLinkClicked(wxHtmlLinkEvent& ); void OnURLEnter( wxCommandEvent&); void UpdateURL(); // void OnCell(wxHtmlCellEvent& ); void SetSize( wxSize ); + void SetWxConsole( WxConsole* c ) { mWxConsole = c; } + private: WxHtmlWindow* mwxHtmlWindow; wxTextCtrl* mwxURL; wxButton* mwxBackButton; wxButton* mwxForwardButton; - + wxButton* mwxHomeButton; + wxButton* mwxReloadButton; + wxButton* mwxIncludeFileButton; + + WxConsole* mWxConsole; + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() };