From ee6e5669242906f575db12c6408aa3e398d55bba Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Mon, 15 Sep 2008 09:27:56 +0000
Subject: [PATCH] *** empty log message ***

---
 kernel/cmake/BBTKFindLibraries.cmake       |  8 +++++++-
 kernel/src/bbtkWxGUIScriptingInterface.cxx | 16 ++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 76f522e..80997c0 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -117,9 +117,15 @@ IF(USE_GDCM)
 
     MESSAGE ( STATUS "Looking for GDCM... found")
     MESSAGE ( STATUS "* Dir       = ${GDCM_DIR}")
-    MESSAGE ( STATUS "* Version   = ${GDCM_VERSION_MAJOR}.${GDCM_VERSION_MINOR}.${GDCM_VERSION_PATCH}")
+    MESSAGE ( STATUS "* Version   = ${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
     MESSAGE ( STATUS "* Namespace = ${GDCM_NAME_SPACE}")
 
+    # Test that GDCM_NAME_SPACE is **NOT** "gdcm" or will conflict with 
+    # embedded gdcm in ITK and will result in hard seg faults !
+    IF (GDCM_NAME_SPACE STREQUAL "gdcm")
+      MESSAGE(FATAL_ERROR "GDCM_NAME_SPACE value is 'gdcm' which conflicts with ITK embededd gdcm namespace : rebuild gdcm with another GDCM_NAME_SPACE value")
+    ENDIF (GDCM_NAME_SPACE STREQUAL "gdcm")
+
     MARK_AS_ADVANCED(GDCM_DIR)
     
     SET(BBTK_GDCM_LIBRARIES
diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index 2eb5ebe..dd56ef1 100644
--- a/kernel/src/bbtkWxGUIScriptingInterface.cxx
+++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/09/10 12:38:24 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2008/09/15 09:27:56 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -549,9 +549,9 @@ namespace bbtk
     f.open(fname.c_str(), std::ios::out );
     f << conf << std::endl;
 
-    int x,y;
-    GetPosition(&x,&y);
-    f << x << "  " << y << std::endl;
+    //    int x,y;
+    //    GetPosition(&x,&y);
+    //    f << x << "  " << y << std::endl;
 
 
     int w,h;
@@ -577,8 +577,8 @@ namespace bbtk
 	std::string conf;
 	f >> conf;
 
-	int x,y;
-	f >> x >> y ;
+	//	int x,y;
+	//	f >> x >> y ;
 
 	int w,h;
 	f >> w >> h ;
@@ -587,7 +587,7 @@ namespace bbtk
 	
 	//	std::cout << conf << std::endl;
 
-	Move(x,y);
+	//	Move(x,y);
 	SetSize(w,h);
 	m_mgr.LoadPerspective(std2wx(conf));
       }
-- 
2.45.1