#3229 vtk8itk4wx3-mingw64 MACOS

diff --git a/appli/bbEditor/CMakeLists.txt b/appli/bbEditor/CMakeLists.txt
index e5b10e07cd06dd4f086d641b98a0f89ce7bbe67b..daece78a334fe92cf5fd4b3495193172d7d71eaf 100644 (file)
--- a/appli/bbEditor/CMakeLists.txt
+++ b/appli/bbEditor/CMakeLists.txt
@@ -38,6 +38,8 @@ INCLUDE_DIRECTORIES(../../lib/EditorGraphicBBS/bbsKernelEditorGraphic)
 INCLUDE_DIRECTORIES(../../lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic)
 INCLUDE_DIRECTORIES(../../data/icons)
 
+
+
 IF(BBTK_USE_WXWIDGETS AND WIN32)
   ADD_EXECUTABLE(bbEditor WIN32 ${SOURCES})  
   IF(MINGW)

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/CMakeLists.txt b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/CMakeLists.txt
index a0ea3d8ad4bf822d18f9039584bee480be124dde..c29995fc54bfd9e0b699d2da3e243341b1c0a84b 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/CMakeLists.txt
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/CMakeLists.txt
@@ -32,6 +32,7 @@ INCLUDE_DIRECTORIES(../bbsWxGUIEditorGraphic)
 
 INCLUDE_DIRECTORIES(../../../data/icons)
 
+
 ADD_LIBRARY(bbsWxGUIEditorGraphic
                 ${bbsWxGUIEditorGraphic_CXX_SOURCES}
                 ${bbsWxGUIEditorGraphic_H_SOURCES} )

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index dda5bce5d86da8aae7dd4e081701721cb86b6c3f..be1251308d39ac6f686036eed696365a41c528f4 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -569,7 +569,7 @@ void wxGUIEditorGraphicBBS::executeScript(std::string script) {
 #endif
 
 #ifdef __APPLE__
-    command = "source ~/.bbtk/profile_creatools; "+command;
+    command = "source ~/.bashrc ; "+command;
 #endif
 
 

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
index 960cdad62c69741d83f8cc1861af317851a26dab..cf2315f8897c1a43f0e0b7e5644129da15d9a2b7 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
@@ -74,8 +74,7 @@ namespace bbtk {
        
 wxVtkSceneManager::wxVtkSceneManager(wxGEditorTabPanel *parent, wxVtk3DBaseView *baseView, int idManager,Factory::Pointer bbtkfactory) 
 {
-       
-       
+
        _cbName                                 = "ComplexBoxName";
        _cbPackageName                  = "PackageName";
        _Author                                 = "Author ??";