From dc423eaf1e3ed9cbd38f6f37bd8cf89e20e8ac0c Mon Sep 17 00:00:00 2001 From: Radu Ursu Date: Mon, 8 Sep 2003 09:15:42 +0000 Subject: [PATCH] Version 3.46 (08 September 2003) [rursu] - demo use now the new help class Qt_help_window instead of HelpWindow - demo use the new demo icon demoicon --- Packages/Spatial_searching/changes.txt | 4 ++++ .../demo/Spatial_searching/spatial_searching.C | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Packages/Spatial_searching/changes.txt b/Packages/Spatial_searching/changes.txt index a933f0e2cdb..dd9d4182657 100755 --- a/Packages/Spatial_searching/changes.txt +++ b/Packages/Spatial_searching/changes.txt @@ -1,3 +1,7 @@ +Version 3.46 (08 September 2003) [rursu] +- demo use now the new help class Qt_help_window instead of HelpWindow +- demo use the new demo icon demoicon + Version 3.38 (2 August 2003) [af] - Removed template <> in example/Kdtree_example_3.C diff --git a/Packages/Spatial_searching/demo/Spatial_searching/spatial_searching.C b/Packages/Spatial_searching/demo/Spatial_searching/spatial_searching.C index a1ba5b42215..a56695cb7a0 100644 --- a/Packages/Spatial_searching/demo/Spatial_searching/spatial_searching.C +++ b/Packages/Spatial_searching/demo/Spatial_searching/spatial_searching.C @@ -31,9 +31,10 @@ int main(int, char*){ #include #include -#include +#include #include #include "spatial_searching_toolbar.h" +#include #include #include @@ -229,7 +230,7 @@ private slots: void howto(){ QString home; home = "help/index.html"; - HelpWindow *help = new HelpWindow(home, ".", 0, "help viewer"); + Qt_help_window *help = new Qt_help_window(home, ".", 0, "help viewer"); help->resize(400, 400); help->setCaption("Demo HowTo"); help->show(); @@ -318,6 +319,8 @@ main(int argc, char **argv) app.setMainWidget(&widget); widget.setCaption(my_title_string); widget.setMouseTracking(TRUE); + QPixmap cgal_icon = QPixmap((const char**)demoicon_xpm); + widget.setIcon(cgal_icon); widget.show(); current_state = -1; return app.exec();