From 4925f2a1f40f97ab30cec57dd1edbd95b7a0e29c Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 6 Feb 2008 11:31:39 +0000 Subject: [PATCH] Wintitle) --- kernel/cmake/bbtk_config_build.xml.in | 2 +- kernel/src/bbtkWxBlackBox.cxx | 8 +++++--- packages/wx/src/bbwxSlider.cxx | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/kernel/cmake/bbtk_config_build.xml.in b/kernel/cmake/bbtk_config_build.xml.in index 983602f..8a148b7 100644 --- a/kernel/cmake/bbtk_config_build.xml.in +++ b/kernel/cmake/bbtk_config_build.xml.in @@ -12,6 +12,6 @@ # @BBTK_DATA_ROOT@ - @PROJECT_BINARY_DIR@ + @PROJECT_BINARY_DIR@ diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index a14647e..954880d 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/02/05 13:23:46 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/02/06 11:31:39 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -529,7 +529,7 @@ namespace bbtk bbmWindow = 0; // bbmWidget = 0; // bbSetInputWinParent(0); - bbSetInputWinTitle("..."); + bbSetInputWinTitle(bbGetName()); bbSetInputWinWidth(800); bbSetInputWinHeight(800); bbSetInputWinDialog(false); @@ -569,6 +569,8 @@ namespace bbtk delete bbGetWidgetEventHandler(); new WxBlackBoxWidgetEventHandler(this,bbGetOutputWidget()); } + // Sets the name of the wxWindow to the input WinTitle + bbGetOutputWidget()->SetName(bbtk::std2wx(bbGetInputWinTitle())); } // If the output 'Widget' is connected then it's gonna diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index a69578c..c718521 100644 --- a/packages/wx/src/bbwxSlider.cxx +++ b/packages/wx/src/bbwxSlider.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxSlider.cxx,v $ Language: C++ - Date: $Date: 2008/02/05 18:05:32 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/02/06 11:31:40 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -340,7 +340,7 @@ namespace bbwx //-------------------------------------------------------------------------- void Slider::bbUserConstructor() { - bbSetInputWinTitle("Slider"); + // bbSetInputWinTitle("Slider"); bbSetInputIn(0); bbSetInputMin(0); bbSetInputMax(500); @@ -372,7 +372,7 @@ namespace bbwx bbGetInputIn(), bbGetInputReactiveOnTrack() ); - w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) ); + // w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) ); bbSetOutputWidget( w ); } -- 2.45.1