*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c1187598d4b4d56504a2ec033ad1c1f7e8b0c74..d7889c1852fc6d5a5f9658ad2f3389a0f0e7ed06 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-PROJECT(BBTK) 
+PROJECT(bbtk) 
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------

diff --git a/kernel/appli/bbCreateBlackBox/CMakeLists.txt b/kernel/appli/bbCreateBlackBox/CMakeLists.txt
index 20f488c00b081afc45eb7d8fa4b2ee8273ec0c5c..c86e661818f79f1614e472e70591cd2efa5bac6d 100644 (file)
--- a/kernel/appli/bbCreateBlackBox/CMakeLists.txt
+++ b/kernel/appli/bbCreateBlackBox/CMakeLists.txt
@@ -31,22 +31,22 @@ IF(WIN32)
   # Build tree 
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreateBlackBox.bat.in
-    ${BBTK_BINARY_DIR}/RelWithDebInfo/bbCreateBlackBox.bat
+    ${bbtk_BINARY_DIR}/RelWithDebInfo/bbCreateBlackBox.bat
     @ONLY IMMEDIATE
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreateBlackBox.bat.in
-    ${BBTK_BINARY_DIR}/Debug/bbCreateBlackBox.bat
+    ${bbtk_BINARY_DIR}/Debug/bbCreateBlackBox.bat
     @ONLY IMMEDIATE
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreateBlackBox.bat.in
-    ${BBTK_BINARY_DIR}/Release/bbCreateBlackBox.bat
+    ${bbtk_BINARY_DIR}/Release/bbCreateBlackBox.bat
     @ONLY IMMEDIATE
     )
   # install tree
   INSTALL(
-    PROGRAMS ${BBTK_BINARY_DIR}/Debug/bbCreateBlackBox.bat
+    PROGRAMS ${bbtk_BINARY_DIR}/Debug/bbCreateBlackBox.bat
     DESTINATION bin
     )
 ENDIF(WIN32)
@@ -56,12 +56,12 @@ IF(UNIX)
   # Build tree 
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreateBlackBox.sh.in
-    ${BBTK_BINARY_DIR}/bin/bbCreateBlackBox
+    ${bbtk_BINARY_DIR}/bin/bbCreateBlackBox
     @ONLY IMMEDIATE
     )
   # Install tree
   INSTALL(
-    FILES ${BBTK_BINARY_DIR}/bin/bbCreateBlackBox
+    FILES ${bbtk_BINARY_DIR}/bin/bbCreateBlackBox
     DESTINATION bin
     PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
     )

diff --git a/kernel/appli/bbCreatePackage/CMakeLists.txt b/kernel/appli/bbCreatePackage/CMakeLists.txt
index cdadec68a5597672d5de6139d707b5b9e8525185..19691de13a852615e929e886b4c4a6729b9c7bb8 100644 (file)
--- a/kernel/appli/bbCreatePackage/CMakeLists.txt
+++ b/kernel/appli/bbCreatePackage/CMakeLists.txt
@@ -42,34 +42,34 @@ IF(WIN32)
   # Build tree 
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.bat.in
-    ${BBTK_BINARY_DIR}/RelWithDebInfo/bbCreatePackage.bat
+    ${bbtk_BINARY_DIR}/RelWithDebInfo/bbCreatePackage.bat
     @ONLY IMMEDIATE
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.bat.in
-    ${BBTK_BINARY_DIR}/Debug/bbCreatePackage.bat
+    ${bbtk_BINARY_DIR}/Debug/bbCreatePackage.bat
     @ONLY IMMEDIATE
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.bat.in
-    ${BBTK_BINARY_DIR}/Release/bbCreatePackage.bat
+    ${bbtk_BINARY_DIR}/Release/bbCreatePackage.bat
     @ONLY IMMEDIATE
     )
   # install tree
   INSTALL(
-    PROGRAMS ${BBTK_BINARY_DIR}/Debug/bbCreatePackage.bat
+    PROGRAMS ${bbtk_BINARY_DIR}/Debug/bbCreatePackage.bat
     DESTINATION bin
     )
 ELSE(WIN32)
   # Build tree 
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.sh.in
-    ${BBTK_BINARY_DIR}/bin/bbCreatePackage
+    ${bbtk_BINARY_DIR}/bin/bbCreatePackage
     @ONLY IMMEDIATE
     )
   # Install tree
   INSTALL(
-    FILES ${BBTK_BINARY_DIR}/bin/bbCreatePackage
+    FILES ${bbtk_BINARY_DIR}/bin/bbCreatePackage
     DESTINATION bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     )

diff --git a/kernel/appli/bbPostInstallPackage/CMakeLists.txt b/kernel/appli/bbPostInstallPackage/CMakeLists.txt
index 8d6f2dd9021f994b3cdbc42d126c6e2b4d3c4c29..a7cfd319ecd8f9d09746944fd9f3b7d9e87a35ed 100644 (file)
--- a/kernel/appli/bbPostInstallPackage/CMakeLists.txt
+++ b/kernel/appli/bbPostInstallPackage/CMakeLists.txt
@@ -7,34 +7,34 @@ IF(WIN32)
   # Build tree 
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbPostInstallPackage.bat.in
-    ${BBTK_BINARY_DIR}/RelWithDebInfo/bbPostInstallPackage.bat
+    ${bbtk_BINARY_DIR}/RelWithDebInfo/bbPostInstallPackage.bat
     @ONLY IMMEDIATE
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbPostInstallPackage.bat.in
-    ${BBTK_BINARY_DIR}/Debug/bbPostInstallPackage.bat
+    ${bbtk_BINARY_DIR}/Debug/bbPostInstallPackage.bat
     @ONLY IMMEDIATE
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbPostInstallPackage.bat.in
-    ${BBTK_BINARY_DIR}/Release/bbPostInstallPackage.bat
+    ${bbtk_BINARY_DIR}/Release/bbPostInstallPackage.bat
     @ONLY IMMEDIATE
     )
   # install tree
   INSTALL(
-    PROGRAMS ${BBTK_BINARY_DIR}/Debug/bbPostInstallPackage.bat
+    PROGRAMS ${bbtk_BINARY_DIR}/Debug/bbPostInstallPackage.bat
     DESTINATION bin
     )
 ELSE(WIN32)
   # Build tree 
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbPostInstallPackage.sh.in
-    ${BBTK_BINARY_DIR}/bin/bbPostInstallPackage
+    ${bbtk_BINARY_DIR}/bin/bbPostInstallPackage
     @ONLY IMMEDIATE
     )
   # Install tree
   INSTALL(
-    FILES ${BBTK_BINARY_DIR}/bin/bbPostInstallPackage
+    FILES ${bbtk_BINARY_DIR}/bin/bbPostInstallPackage
     DESTINATION bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     )

diff --git a/kernel/appli/bbc/CMakeLists.txt b/kernel/appli/bbc/CMakeLists.txt
index 41bc8976f5dcd046c70a5fae4a1f7ba6689cd6d7..a879ae10daa87dfc0654e37baf5aaa65e99c532f 100644 (file)
--- a/kernel/appli/bbc/CMakeLists.txt
+++ b/kernel/appli/bbc/CMakeLists.txt
@@ -18,11 +18,11 @@ CONFIGURE_FILE(
 IF(UNIX)
        CONFIGURE_FILE(
                ${CMAKE_CURRENT_SOURCE_DIR}/bbc.sh.in
-               ${BBTK_BINARY_DIR}/bin/bbc
+               ${bbtk_BINARY_DIR}/bin/bbc
                @ONLY IMMEDIATE
        )    
        INSTALL(
-               PROGRAMS ${BBTK_BINARY_DIR}/bin/bbc
+               PROGRAMS ${bbtk_BINARY_DIR}/bin/bbc
                DESTINATION bin
        )
 ELSE(UNIX)

diff --git a/kernel/install/CMakeLists.txt b/kernel/install/CMakeLists.txt
index 0d99fb1bcffa3101b4d12908565703a7f3b77402..880bb0f72f8085f2ddda96a7a686aeb5bf4f7cf9 100644 (file)
--- a/kernel/install/CMakeLists.txt
+++ b/kernel/install/CMakeLists.txt
@@ -31,12 +31,12 @@ SUBDIRS(cpack)
 
 
 INSTALL(
-  DIRECTORY  ${BBTK_BINARY_DIR}/${BBTK_BBS_REL_PATH}
+  DIRECTORY  ${bbtk_BINARY_DIR}/${BBTK_BBS_REL_PATH}
   DESTINATION  ${BBTK_SHARE_REL_PATH}
 )
 
 INSTALL(
-  DIRECTORY  ${BBTK_BINARY_DIR}/${BBTK_DATA_REL_PATH}
+  DIRECTORY  ${bbtk_BINARY_DIR}/${BBTK_DATA_REL_PATH}
   DESTINATION  ${BBTK_SHARE_REL_PATH}
 )
 

diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx
index 20a7e441366668bd8d3b6558ec516da05e466a56..7aaeeff92d4399bc60699d53e906ee88262d65ac 100644 (file)
--- a/packages/wx/src/bbwxInputText.cxx
+++ b/packages/wx/src/bbwxInputText.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxInputText.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/04/08 14:36:32 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2010/04/09 14:02:15 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -52,6 +52,7 @@ namespace bbwx
     ~InputTextWidget();
 
     std::string GetValue();
+    void OnTextEnter(wxCommandEvent& event);
     void OnTextUpdate(wxCommandEvent& event);
 
     void SetTitle(wxString);
@@ -75,28 +76,25 @@ namespace bbwx
   {
     wxPanel                    *panel  = this;
     
-    mwxTextCtrl = new wxTextCtrl( panel, -1, In,
-                                 wxDefaultPosition, wxSize(800,20));
+    mwxTextCtrl = new wxTextCtrl( panel, -1, In,wxDefaultPosition, wxSize(800,20),wxTE_PROCESS_ENTER);
+    Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_ENTER, 
+            (wxObjectEventFunction) 
+            (wxEventFunction)
+            (wxCommandEventFunction) 
+            (void (wxPanel::*)(wxCommandEvent&))
+            &InputTextWidget::OnTextEnter ); 
 
-    // The following was supposed to generate an event, only on ENTER key ...
-    // ... but nothing happens (no event at all ?!?)                     
-    //Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_ENTER,
-    
-     Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_UPDATED,     
+    Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_UPDATED, 
             (wxObjectEventFunction) 
             (wxEventFunction)
             (wxCommandEventFunction) 
             (void (wxPanel::*)(wxCommandEvent&))
             &InputTextWidget::OnTextUpdate ); 
 
+
     wxFlexGridSizer *sizer     = new wxFlexGridSizer(1);
-    /*
-      if (title!=_T(""))
-      {
-    */
     mwxTitle = new wxStaticText(panel, -1, title ); 
     sizer-> Add( mwxTitle ); 
-    //   }
     sizer-> Add( mwxTextCtrl, 1, wxGROW ); 
     sizer-> AddGrowableCol(0);
     
@@ -128,11 +126,24 @@ namespace bbwx
   //--------------------------------------------------------------------------
   void InputTextWidget::OnTextUpdate(wxCommandEvent& event)
   {
-    mBox->bbSetOutputOut( GetValue() );
-    mBox->bbSetInputIn( GetValue() );
-    mBox->bbSignalOutputModification("Out");
+       if (mBox->bbGetInputReactiveOnKeystroke()==2){
+           mBox->bbSetOutputOut( GetValue() );
+           mBox->bbSetInputIn( GetValue() );
+           mBox->bbSignalOutputModification("Out");
+       }
   }
 
+  //--------------------------------------------------------------------------
+  void InputTextWidget::OnTextEnter(wxCommandEvent& event)
+  {
+       if (mBox->bbGetInputReactiveOnKeystroke()==1){
+           mBox->bbSetOutputOut( GetValue() );
+               mBox->bbSetInputIn( GetValue() );
+               mBox->bbSignalOutputModification("Out");
+       }
+  }
+
+
   //--------------------------------------------------------------------------
   //-------------------------------------------------------------------------
   //--------------------------------------------------------------------------
@@ -148,6 +159,7 @@ namespace bbwx
                bbSetInputTitle("");
                bbSetInputIn("");
                bbSetOutputWidget(0);
+               bbSetInputReactiveOnKeystroke(2);
        }
        
        //-----------------------------------------------------------------     

diff --git a/packages/wx/src/bbwxInputText.h b/packages/wx/src/bbwxInputText.h
index 8df43ebf884fce3896c1d37b5be3b762b1aae993..4a3afce12228043597183b815cadb26fc68d5d7d 100644 (file)
--- a/packages/wx/src/bbwxInputText.h
+++ b/packages/wx/src/bbwxInputText.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxInputText.h,v $
   Language:  C++
-  Date:      $Date: 2009/12/02 15:13:25 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2010/04/09 14:02:15 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -63,6 +63,7 @@ namespace bbwx
     BBTK_BLACK_BOX_INTERFACE(InputText,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,std::string);
     BBTK_DECLARE_INPUT(Title,std::string);
+    BBTK_DECLARE_INPUT(ReactiveOnKeystroke,int);
     BBTK_DECLARE_OUTPUT(Out,std::string);
     BBTK_PROCESS(Process);
     void Process();
@@ -82,8 +83,8 @@ namespace bbwx
   BBTK_DESCRIPTION("A zone in which the user can enter a text (wxTextCtrl)");
   BBTK_INPUT(InputText,In,"Initial text (default '')",std::string,"");
 
-  BBTK_INPUT(InputText,Title,"Title of the input zone (default '') ",
-            std::string,"");
+  BBTK_INPUT(InputText,Title,"Title of the input zone (default '') ", std::string,"");
+  BBTK_INPUT(InputText,ReactiveOnKeystroke,"0 not event generated, 1 Enter event genereated, 2 All keys, (default '2') ", int,"");
 
   BBTK_OUTPUT(InputText,Out,"Current text",std::string,"");
   BBTK_END_DESCRIBE_BLACK_BOX(InputText);