include itkvtk, as well

diff --git a/appli/bbEditor/bbEditor.cxx b/appli/bbEditor/bbEditor.cxx
index 6d995a6d700549824e2555bb68deb13f763b2c4a..ca584671744db6168b083f3fcbedb16c6a29912b 100644 (file)
--- a/appli/bbEditor/bbEditor.cxx
+++ b/appli/bbEditor/bbEditor.cxx
@@ -27,11 +27,11 @@ IMPLEMENT_APP(wxBBEditorApp);
 // main frame
 bool wxBBEditorApp::OnInit( )
 {
-#ifdef MACOSX /* assume this is OSX */
+#ifdef MACOSX
+       /* assume this is OSX */
        wxSystemOptions::SetOption("mac.listctrl.always_use_generic", 1);
-#endif MACOSX 
+#endif
 
-       
        wxApp::OnInit();
 #ifdef __WXGTK__
   //See http://www.wxwindows.org/faqgtk.htm#locale

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
index 902db263402a2189e8e5190bb88de0d80f14063f..c4f2c5d4c9432fe5edf5a42b42548c397f9ade89 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
@@ -947,6 +947,8 @@ namespace bbtk
                script+="# ----------------------\n";
                if(existsExec)
                {
+                       script+="include std\n"; // EED
+                       script+="include itkvtk\n"; // EED
                        int i;
                        for(i = 0; i<packages.size();i++)
                        {
@@ -955,7 +957,7 @@ namespace bbtk
                                script+="\n";
                        }
 
-                       script+="include std\n";
+                       // script+="include std\n"; // JPR
 
                        for(i = 0; i<boxes.size();i++)
                        {
@@ -1076,6 +1078,9 @@ namespace bbtk
                }
 
                std::string script = "";
+
+               script+="include std\n";    // EED
+               script+="include itkvtk\n"; // EED
                int i;
                for(i = 0; i<packages.size();i++)
                {
@@ -1084,8 +1089,6 @@ namespace bbtk
                        script+="\n";
                }
 
-               script+="include std\n";
-
                // Definition of a complex box
                script+="define ";
                script+=cbName;