From 033637cc97855ea9e1a515a2c20486700dd004a6 Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 15 Oct 2008 09:31:15 +0000 Subject: [PATCH] *** empty log message *** --- kernel/doc/CMakeLists.txt | 11 +++++++++ kernel/doc/bbtkWebSite/help_contents.html | 29 ---------------------- kernel/doc/help_contents.html.in | 30 +++++++++++++++++++++++ kernel/src/bbtkWxGUIHtmlBrowser.cxx | 28 ++++++--------------- 4 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 kernel/doc/bbtkWebSite/help_contents.html create mode 100644 kernel/doc/help_contents.html.in diff --git a/kernel/doc/CMakeLists.txt b/kernel/doc/CMakeLists.txt index 862a44e..6d51cf8 100755 --- a/kernel/doc/CMakeLists.txt +++ b/kernel/doc/CMakeLists.txt @@ -63,6 +63,17 @@ IF(BUILD_BBTK_DOC) FILES ${BBTK_DOC_BUILD_PATH}/index-no-frame.html DESTINATION ${BBTK_DOC_INSTALL_PATH} ) + # Configure help_contents.html for build tree + CONFIGURE_FILE( + help_contents.html.in + ${BBTK_DOC_BUILD_PATH}/help_contents.html + @ONLY + ) + # Install it + INSTALL( + FILES ${BBTK_DOC_BUILD_PATH}/help_contents.html + DESTINATION ${BBTK_DOC_INSTALL_PATH} + ) # Recurse it bbtkWebSite dir SUBDIRS(bbtkWebSite) diff --git a/kernel/doc/bbtkWebSite/help_contents.html b/kernel/doc/bbtkWebSite/help_contents.html deleted file mode 100644 index e8f2c32..0000000 --- a/kernel/doc/bbtkWebSite/help_contents.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - Help Contents - - - -

Help Contents

- -Demos
-Examples - -

Guides

- -User's Guide
-Package Developer's Guide
-Developer's Guide
-Reference Manual (to be written)
-bbtk library doxygen doc
- -

Boxes

- -Alphabetical list
-List by package
-List by category
-List of adaptors
- - - diff --git a/kernel/doc/help_contents.html.in b/kernel/doc/help_contents.html.in new file mode 100644 index 0000000..4138f8f --- /dev/null +++ b/kernel/doc/help_contents.html.in @@ -0,0 +1,30 @@ + + + + Help Contents - bbtk @BBTK_VERSION@ + + + +

Help Contents - bbtk @BBTK_VERSION@

+ +Demos
+Examples + +

Guides

+ +User's Guide
+Package Developer's Guide
+Developer's Guide
+Reference Manual (to be written)
+bbtk library doxygen doc
+ +

Boxes

+ +Alphabetical list
+List by package
+List by category
+List of adaptors
+ + + + diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx index 76f3e9b..df91b75 100644 --- a/kernel/src/bbtkWxGUIHtmlBrowser.cxx +++ b/kernel/src/bbtkWxGUIHtmlBrowser.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIHtmlBrowser.cxx,v $ Language: C++ - Date: $Date: 2008/10/08 13:39:33 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/10/15 09:31:20 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -219,23 +219,8 @@ namespace bbtk void WxGUIHtmlBrowser::GoHome() { std::string url = ConfigurationFile::GetInstance().Get_doc_path(); - url += "/bbtkWebSite/help_contents.html"; - GoTo(url); - - mwxURL->Clear(); - mwxURL->AppendText(std2wx(url)); - - -/*EED - if (Utilities::FileExists(url)) - { - GoTo(url); - } - else - { - // what ? - } -*/ + url += "/help_contents.html"; + GoTo(url); } //======================================================================== @@ -319,7 +304,10 @@ namespace bbtk { mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() ); UpdateURL(); - } + // OnURLEnter(e); + // mwxHtmlWindow->LoadPage(mwxURL->GetValue()); + } + // mwxHtmlWindow->LoadPage( mwxURL->GetValue() ); } //======================================================================== -- 2.45.0