]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Fri, 3 Oct 2008 14:27:40 +0000 (14:27 +0000)
committerguigues <guigues>
Fri, 3 Oct 2008 14:27:40 +0000 (14:27 +0000)
CMakeLists.txt
INSTALL.txt
kernel/cmake/BBTKConfigurePackagePaths.cmake
kernel/cmake/BBTKFindLibraries.cmake
kernel/cmake/BBTKKernelConfig.cmake
kernel/cmake/BBTKSetDeducedPaths.cmake
kernel/install/CMakeLists.txt
kernel/install/cpack/CMakeLists.txt [new file with mode: 0644]
kernel/src/bbtkWxGUITextEditor.cxx
kernel/src/bbtkWxGUITextEditor.h

index 269e8e91d77696706790d435a8c5c6f0c0d6f547..fbb741f913a4ec364185111f0cef2d692eab2240 100644 (file)
@@ -1,7 +1,8 @@
 #cmake_minimum_required(VERSION 2.4)
 #if(COMMAND cmake_policy)
   # UNCOMMENT the 3 lines 'cmake_policy(...
-  # If you'er using cmake 2.6
+  # If you are using cmake 2.6 
+  # We can test it automatically, no JP ?
   #cmake_policy(SET CMP0000 OLD)
   #cmake_policy(SET CMP0005 NEW)
   #cmake_policy(SET CMP0003 NEW)
@@ -27,39 +28,3 @@ SUBDIRS(kernel)
 SUBDIRS(packages)
 #-----------------------------------------------------------------------------
 
-
-#---Documentation-------------
-#http://www.cmake.org/Wiki/CMake:Packaging_With_CPack
-#http://www.cmake.org/Wiki/CMake:CPackConfiguration
-#http://www.cmake.org/Wiki/CMake:Install_Commands
-
-
-
-INCLUDE(InstallRequiredSystemLibraries)
-
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Black Box Tool Kit (bbtk) - Creatis-LRMN")
-SET(CPACK_PACKAGE_VENDOR "Creatis-LRMN")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
-SET(CPACK_PACKAGE_VERSION_MAJOR ${BBTK_MAJOR_VERSION})
-SET(CPACK_PACKAGE_VERSION_MINOR ${BBTK_MINOR_VERSION})
-SET(CPACK_PACKAGE_VERSION_PATCH ${BBTK_BUILD_VERSION})
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}")
-IF(WIN32 AND NOT UNIX)
-  # There is a bug in NSI that does not handle full unix paths properly. Make
-  # sure there is at least one set of four (4) backlasshes.
-#EED  SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp")
-  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/BBI_EXE.exe")
-  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} My Famous Project BBTK")
-  SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/software/bbtk")
-  SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr")
-  SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr")
-  SET(CPACK_NSIS_MODIFY_PATH ON)
-ELSE(WIN32 AND NOT UNIX)
-  SET(CPACK_STRIP_FILES "bin/bbi")
-  SET(CPACK_SOURCE_STRIP_FILES "")
-ENDIF(WIN32 AND NOT UNIX)
-SET(CPACK_PACKAGE_EXECUTABLES "bbi" "bbs interpreter" "bbhelp" "bbtk documentation" "bbed" "bbs Editor")
-  
-
-INCLUDE(CPack)
index 12d00ae131f9b578549e601060fc59392d76cc4d..3fe4e09aada4deaf6db2eeba8a20192e3e3c30b1 100644 (file)
@@ -41,7 +41,7 @@ type root password
 
 1)
 INSTALL SOFA
-   (See enviremental variables  VTK ITK GDCM WXWIN ..)
+   (See environment variables  VTK ITK GDCM WXWIN ..)
 
 2)
 Install from 
@@ -49,7 +49,7 @@ Install from
        -basic-miktex-2.6.2742.exe
          (You have to make update) 
        -tth_exe.zip     (c:\Creatis\tth_exe)
-        -nsis-2.34-setup.exe
+    -nsis-2.34-setup.exe
   http://www.creatis.insa-lyon.fr/~davila/bbtk/Software/new/
        -graphviz-2.2.1.exe
        -doxygen-1.5.3-setup.exe
index b9f4e0138fc876164fb3bf80166897dc6449c18d..0681539032923aa347dcb0f8997a410e8e2c32a7 100644 (file)
@@ -4,7 +4,6 @@ IF(WIN32)
   SET (EXECUTABLE_OUTPUT_REL_PATH "") 
   SET (LIBRARY_OUTPUT_REL_PATH    "")
   FILE(TO_NATIVE_PATH  ${PROJECT_BINARY_DIR}/$(OutDir)  BBTK_BIN_PATH)
-  # TO DO : use computed path for build/install tree
   SET(BBTK_BBI "${BBTK_DIR}/bin/bbi")
   SET(BBTK_BBS2CPP "${BBTK_DIR}/bin/bbs2cpp")
   SET(BBTK_BBC "${BBTK_DIR}/bin/bbc")
index 21d8599efa703b2993b885ca72c00b90cb05da26..8a9eec7b5af59318dbb7ba8c3761a9d964b94f13 100644 (file)
@@ -170,6 +170,16 @@ IF(USE_DOXYGEN)
 ENDIF(USE_DOXYGEN)
 #-----------------------------------------------------------------------------
 
+#-----------------------------------------------------------------------------
+IF(USE_DOT)
+  IF(WIN32)
+    FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} )
+    IF(NOT DOT_DIR)
+      MESSAGE(FATAL_ERROR "Dot not found : set DOT_DIR to the folder containing dot.exe")
+    ENDIF(NOT DOT_DIR)
+  ENDIF(WIN32)  
+ENDIF(USE_DOT) 
+#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 IF(USE_LATEX) 
index 912c1207bee1df22d9ac9d0fd0d8460e5a1419d6..1600776e414971618d06e6b42292df1b4cef0223 100644 (file)
@@ -64,10 +64,6 @@ ENDIF(WIN32)
 
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-SET(BBTK_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-#-----------------------------------------------------------------------------
-
 #-----------------------------------------------------------------------------
 # The vars BBTK_DOC_REL_PATH and BBTK_BBS_REL_PATH
 # store documentation and scripts **RELATIVE** paths  
index 27b1d3a0ec1ad116e92407fc28cf0122bf493ea8..914e4dd1c69918fbdf34ad5edeb266797d80fd69 100644 (file)
@@ -65,15 +65,9 @@ ENDIF(BBTK_CORE_PACKAGE)
 
 #-----------------------------------------------------------------------------
 IF(WIN32)
-IF(USE_DOT)
-  FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} )
-  IF(NOT DOT_DIR)
-    MESSAGE(FATAL_ERROR "Dot not found")
-  ENDIF(NOT DOT_DIR)
-ENDIF(USE_DOT) 
-SET(CREA_ADDITIONAL_DLL_PATH "C:/Creatis/dlls" CACHE PATH "Addictional paths in which to look for dlls")
-SET(CREA_PATH0 Path=${CREA_ADDITIONAL_DLL_PATH}__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%__RR__${DOT_DIR})
-STRING(REPLACE "__RR__" "\;" CREA_PATH ${CREA_PATH0} )
+  SET(CREA_ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Addictional paths in which to look for dlls")
+  SET(CREA_PATH0 Path=${CREA_ADDITIONAL_DLL_PATH}__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%__RR__${DOT_DIR})
+  STRING(REPLACE "__RR__" "\;" CREA_PATH ${CREA_PATH0} )
 ENDIF(WIN32)
 #-----------------------------------------------------------------------------
 
index 4e869e380f115473f35f10c73c231749f294dbdc..1c906e587046339cf0782ab835bae5f845ce88bc 100644 (file)
@@ -3,71 +3,9 @@ IF(UNIX)
   SUBDIRS(gnome)
 ENDIF(UNIX)
 
+SUBDIRS(cpack)
 
-# Aditional INSTALL for CPACK mecanism.
 
-IF(WIN32)
-  STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
-  INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll                             DESTINATION bin/ )
-  INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll                             DESTINATION bin/ )
-
-  IF(USE_VTK)
-    IF(${VTK_DIR})
-    # ????????? Why this line doesn't works ...?????
-      FILE(GLOB_RECURSE LST_FILE_VTKDLL RELATIVE ${VTK_DIR} *.dll )
-      FOREACH( iLST  ${LST_FILE_VTKDLL} )
-        message("EED kernel/install/CMakeLists.txt " ${iLST} )
-        INSTALL( 
-          FILES ${iLST}
-          DESTINATION bin/
-        )
-      ENDFOREACH(iLST)
-    ENDIF(${VTK_DIR})
-
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkCommon.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkDICOMParser.dll                           DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkexoIIc.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkexpat.dll                                 DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkFiltering.dll                     DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkfreetype.dll                      DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkftgl.dll                                  DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkGenericFiltering.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkGraphics.dll                      DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkHybrid.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkImaging.dll                               DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkIO.dll                                    DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkjpeg.dll                                  DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkNetCDF.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkpng.dll                                           DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkRendering.dll                     DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtksys.dll                                           DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtktiff.dll                                  DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkVolumeRendering.dll               DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkWidgets.dll                               DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkzlib.dll                                  DESTINATION bin/ )
-  ENDIF(USE_VTK)
-  
-  IF(USE_ITK)
-    INSTALL(   FILES ${ITK_DIR}/../../bin/ITKCommon.dll        DESTINATION bin/ )
-  ENDIF(USE_ITK)
-
-  IF(USE_WXWIDGETS)
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll          DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll             DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll                          DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll             DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll                      DESTINATION bin/ )
-  ENDIF(USE_WXWIDGETS)
-
-ENDIF(WIN32)
 
 INSTALL(
   DIRECTORY  ${BBTK_BINARY_DIR}/${BBTK_DOC_REL_PATH}
diff --git a/kernel/install/cpack/CMakeLists.txt b/kernel/install/cpack/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6d17f8d
--- /dev/null
@@ -0,0 +1,89 @@
+
+#-----------------------------------------------------------------------------
+IF(WIN32)
+       SET(CMAKE_INSTALL_PREFIX C:/CreaTools/bbtk)
+ENDIF(WIN32)
+SET(BBTK_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+#-----------------------------------------------------------------------------
+
+#---Documentation-------------
+#http://www.cmake.org/Wiki/CMake:Packaging_With_CPack
+#http://www.cmake.org/Wiki/CMake:CPackConfiguration
+#http://www.cmake.org/Wiki/CMake:Install_Commands
+
+
+INCLUDE(InstallRequiredSystemLibraries)
+
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Black Box Toolkit (bbtk) - CREATIS-LRMN")
+SET(CPACK_PACKAGE_VENDOR "CREATIS-LRMN")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt")
+SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
+SET(CPACK_PACKAGE_VERSION_MAJOR ${BBTK_MAJOR_VERSION})
+SET(CPACK_PACKAGE_VERSION_MINOR ${BBTK_MINOR_VERSION})
+SET(CPACK_PACKAGE_VERSION_PATCH ${BBTK_BUILD_VERSION})
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "bbtk ${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}")
+IF(WIN32 AND NOT UNIX)
+  # There is a bug in NSI that does not handle full unix paths properly. Make
+  # sure there is at least one set of four (4) backlasshes.
+#EED  SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp")
+  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/BBI_EXE.exe")
+  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
+  SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/bbtk")
+  SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/bbtk")
+  SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr")
+  SET(CPACK_NSIS_MODIFY_PATH ON)
+ELSE(WIN32 AND NOT UNIX)
+  SET(CPACK_STRIP_FILES "bin/bbi")
+  SET(CPACK_SOURCE_STRIP_FILES "")
+ENDIF(WIN32 AND NOT UNIX)
+SET(CPACK_PACKAGE_EXECUTABLES "bbStudio" "bbStudio" "bbPackageBrowser" "bbPackageBrowser" "bbi" "bbInterpreter")
+  
+
+INCLUDE(CPack)
+
+
+# Aditional INSTALL for CPACK mecanism.
+
+IF(WIN32)
+
+OPTION(BBTK_STANDALONE_INSTALLER "Install and add to installer all dlls needed, including from external toolkits (wx,itk,vtk)?" OFF)
+
+IF(BBTK_STANDALONE_INSTALLER)
+  STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
+  INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll                             DESTINATION bin/ )
+  INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll                             DESTINATION bin/ )
+
+  IF(USE_VTK)
+    SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
+
+    FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll")
+    FOREACH( iLST  ${LST_FILE_VTKDLL} )
+       INSTALL( 
+         FILES ${iLST}
+         DESTINATION bin/
+       )
+    ENDFOREACH(iLST)
+  ENDIF(USE_VTK)
+    
+  IF(USE_ITK)
+    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll      DESTINATION bin/ )
+  ENDIF(USE_ITK)
+
+  IF(USE_WXWIDGETS)
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll                       DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll          DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll                                DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll             DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll              DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll                                DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll              DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll                       DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll                       DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll              DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll                          DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll             DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll                      DESTINATION bin/ )
+  ENDIF(USE_WXWIDGETS)
+ENDIF(BBTK_STANDALONE_INSTALLER)
+
+ENDIF(WIN32)
index b6cb137344c2b460eaddc79d18236532608c6be3..643c962ac0dd0eb44261bbfc4b7747e6169416f3 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUITextEditor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/09/10 07:25:23 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2008/10/03 14:27:52 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -107,7 +107,6 @@ namespace bbtk
   //================================================================
   
   
-
   //================================================================  
   /*  BEGIN_EVENT_TABLE(WxGUITextEditorPage, wxPanel)
     EVT_CLOSE(WxGUITextEditorPage::OnClose)
@@ -122,9 +121,13 @@ namespace bbtk
       mName(""),
       mAskFilename(true)
   {  
+
+         //      std::cout << "WxGUITextEditorPage::WxGUITextEditorPage("<<mName<<")"<<std::endl;
+
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
  
     mwxInputText = 
+               
       new WxTextCtrlGettingKeyEvents(this,
                                     -1, //ID_InputText,
                                     _T(""),
@@ -132,12 +135,22 @@ namespace bbtk
                                     wxDefaultSize,
                                     wxTE_MULTILINE 
                                     //    |wxTE_PROCESS_ENTER
-                                    | wxTE_PROCESS_TAB 
+                                    //| wxTE_PROCESS_TAB 
                                     //             | wxWANTS_CHARS 
-                                    |  wxTAB_TRAVERSAL
+                                   // |  wxTAB_TRAVERSAL
                                     );
     mwxInputText->SetWxGUITextEditor(mEditor);
-    
+    /*
+       new wxTextCtrl(this,-1,_T(""),
+               wxDefaultPosition,
+                                            wxDefaultSize,
+                                            wxTE_MULTILINE 
+                                            //    |wxTE_PROCESS_ENTER
+                                       //       | wxTE_PROCESS_TAB 
+                               //                  | wxWANTS_CHARS 
+                                //    |  wxTAB_TRAVERSAL
+                                    );
+                                        */
     wxFont* FixedFont = new wxFont(10,
                                    wxFONTFAMILY_MODERN,
                                    wxFONTSTYLE_NORMAL,
@@ -245,11 +258,25 @@ namespace bbtk
       mUser(user),
       mFileNameFilter("*.*")
   {
-    m_mgr.SetManagedWindow(this);
-    
-    //    wxInitAllImageHandlers();
-      
-    mwxNotebook = new wxAuiNotebook(this,  
+  //  m_mgr.SetManagedWindow(this);
+                   //    wxInitAllImageHandlers();
+     
+       //  std::cout << "WxGUITextEditor::WxGUITextEditor"<<std::endl;
+
+      wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+    mwxNotebook = new wxNotebook(this,-1,
+               wxDefaultPosition, wxDefaultSize, 
+               wxNB_TOP 
+
+               
+               );
+               
+   sizer->Add(mwxNotebook,1,wxGROW);
+
+               
+               /*
+   mwxNotebook =               new wxAuiNotebook(this,  
                                    -1,
                                    wxPoint(0, 0),
                                    wxSize(500,500),
@@ -274,7 +301,7 @@ namespace bbtk
                  .Center()
                  .MinSize(wxSize(100,50))
                  );   
-
+*/
  
     /*   
     wxBitmap bmp_new(cc_new_xpm);
@@ -319,6 +346,9 @@ namespace bbtk
     mwxToolBar->AddControl(mwxPosition);
     mwxToolBar->Realize();
 
+         sizer->Add(mwxToolBar,0,wxGROW);
+
+       /*
     m_mgr.AddPane(mwxToolBar, 
                  wxAuiPaneInfo().Name(wxT("toolBar"))
                  .Caption(wxT(""))
@@ -327,20 +357,24 @@ namespace bbtk
                  .MinSize(wxSize(100,50))
                  .LeftDockable(false).RightDockable(false)
                  );   
-
-    NewPage("");
-    UpdateInfo();
+*/
+  SetSizer(sizer);
+  
     
-    m_mgr.Update();
+//    m_mgr.Update();
     SetAutoLayout(true);
     Layout();
+
+    NewPage("");
+    UpdateInfo();
+
   }
   //================================================================
   
   //================================================================
   WxGUITextEditor::~WxGUITextEditor()
   {
-    m_mgr.UnInit();
+  //  m_mgr.UnInit();
 
     //    delete mInterpreter;
   }
@@ -614,7 +648,7 @@ namespace bbtk
   //================================================================
   void WxGUITextEditor::OnKeyUp(wxKeyEvent& event)
   {
-    //  std::cout << "U" << std::endl;
+  //    std::cout << "U" << std::endl;
     UpdateInfo();
   }
   //================================================================
@@ -622,7 +656,7 @@ namespace bbtk
   //================================================================
   void WxGUITextEditor::OnKeyDown(wxKeyEvent& event)
   {
-    //    std::cout << "D" << std::endl;
+     //   std::cout << "D" << std::endl;
     // std::cout << "Key="<<event.GetKeyCode()<<std::endl;
     if ( event.ControlDown() )
       {
index deada66ef1c9ba80cdf379eedaec3184b307886f..e4dd052a77b3d64df7e27f0916f0bbf656438a87 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUITextEditor.h,v $
   Language:  C++
-  Date:      $Date: 2008/07/23 11:46:11 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/10/03 14:27:52 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -49,7 +49,8 @@ namespace bbtk
 {
 
   class WxTextCtrlGettingKeyEvents;
-  class WxGUITextEditor;
+//   typedef wxTextCtrl WxTextCtrlGettingKeyEvents;
+       class WxGUITextEditor;
  
 
   /// Abstract class which defines the callbacks invoked by WxGUITextEditor
@@ -141,8 +142,9 @@ namespace bbtk
   private:
     WxGUITextEditorUser* mUser;
 
-    wxAuiManager m_mgr;
-    wxAuiNotebook* mwxNotebook;
+//    wxAuiManager m_mgr;
+//    wxAuiNotebook*
+       wxNotebook* mwxNotebook;
  
     wxToolBar* mwxToolBar;