From: jpr <>
Date: Fri, 18 Jun 2010 07:46:36 +0000 (+0000)
Subject: include itkvtk, as well
X-Git-Tag: v1_0_0~62
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ee77b0d192699ada2897ec40fe0df6aa37b18fcf;p=bbtkGEditor.git

include itkvtk, as well
---

diff --git a/appli/bbEditor/bbEditor.cxx b/appli/bbEditor/bbEditor.cxx
index 6d995a6..ca58467 100644
--- 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 902db26..c4f2c5d 100644
--- 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;