#3229 vtk8itk4wx3-mingw64 MACOS

diff --git a/appli/bbEditor/CMakeLists.txt b/appli/bbEditor/CMakeLists.txt
index e5b10e0..daece78 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 a0ea3d8..c29995f 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 dda5bce..be12513 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 960cdad..cf2315f 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 ??";