From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Mon, 28 Jan 2008 14:32:54 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~327
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=inline;h=aeafe748c859675cf481bd9e5e5a5afa84a3fa52;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index 4cf2c8a..f752ef4 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -1,8 +1,7 @@
 #---------------------------------------------------------------------------
-# If not a core package must find bbtk and include necessary cmake scripts
+# If not a core package must include necessary cmake scripts
 IF(NOT BBTK_CORE_PACKAGE)
 ## TO DO 
-# FIND_LIBRARY(BBTK)
 # INCLUDE(${BBTK_DIR}/BBTKMacros.cmake)
 # INCLUDE(${BBTK_DIR}/BBTKFindLibraries.cmake)
 # etc.
diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 4b73164..5f4346c 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -136,7 +136,7 @@ IF(WIN32)
   # Why forcing verbosity ?
   # SET(CMAKE_VERBOSE_MAKEFILE TRUE)
 
-  INCLUDE (${BBTK_DIR}/BBTKFindWX_WIN)
+  INCLUDE (${BBTK_DIR}/BBTKFindWX_WIN.cmake)
   #
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${WXWIDGETS_CXX_FLAGS}")
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}${WXWIDGETS_EXE_LINKER_FLAGS}")
diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index 5fa33e4..0f832e5 100644
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -47,13 +47,22 @@ MACRO(BBTK_DOC_INSTALL_IMAGES DOC_RELATIVE_INSTALL_PATH)
     ${JPG_IMAGES}
     ${TIF_IMAGES}
     )
+ #   MESSAGE(ERROR ${IMAGES})
   FOREACH(image ${IMAGES})  
     GET_FILENAME_COMPONENT(filename "${image}" NAME)
     CONFIGURE_FILE(
       ${image}
        ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}
       COPYONLY
-      )  
+      ) 
+      IF (WIN32)
+	CONFIGURE_FILE(
+          ${image}
+          ${CMAKE_CURRENT_BINARY_DIR}/${filename}
+          COPYONLY
+	  )
+      ENDIF(WIN32)
+    # MESSAGE(ERROR "${image} (${filename}) in :  ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}")
   ENDFOREACH(image)
   INSTALL( 
       FILES ${IMAGES} 
diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 431f891..9e2507a 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:41:34 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/01/28 14:32:54 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -34,6 +34,7 @@
 
 
 
+
 namespace bbtk
 {
 
diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index d074414..fcd35be 100644
--- a/kernel/src/bbtkWxBlackBox.h
+++ b/kernel/src/bbtkWxBlackBox.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:41:34 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/01/28 14:32:54 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -87,15 +87,15 @@ namespace bbtk
     /// Sets the global parent of all bbtk windows
     static void bbGlobalSetTopWindow(wxWindow*);
 
-    static void bbGlobalIncNbWindowsAlive() { bbmgNbWindowsAlive++; }
+	static void bbGlobalIncNbWindowsAlive() { WxBlackBox::bbmgNbWindowsAlive++; }
     static void bbGlobalDecNbWindowsAlive();
-    static int  bbGlobalGetNbWindowsAlive() { return bbmgNbWindowsAlive; }
-    static bool bbGlobalIsSomeWindowAlive() { return (bbmgNbWindowsAlive>0);}
+    static int  bbGlobalGetNbWindowsAlive() { return WxBlackBox::bbmgNbWindowsAlive; }
+    static bool bbGlobalIsSomeWindowAlive() { return (WxBlackBox::bbmgNbWindowsAlive>0);}
 
     static void bbGlobalDecNbWindowsShown();
-    static void bbGlobalIncNbWindowsShown() { bbmgNbWindowsShown++; }
-    static int  bbGlobalGetNbWindowsShown() { return bbmgNbWindowsShown; }
-    static bool bbGlobalIsSomeWindowShown() { return (bbmgNbWindowsShown>0);}
+    static void bbGlobalIncNbWindowsShown() { WxBlackBox::bbmgNbWindowsShown++; }
+	static int  bbGlobalGetNbWindowsShown() { return WxBlackBox::bbmgNbWindowsShown; }
+	static bool bbGlobalIsSomeWindowShown() { return (WxBlackBox::bbmgNbWindowsShown>0);}
 
 
   private:
diff --git a/packages/wx/CMakeLists.txt b/packages/wx/CMakeLists.txt
index d3ecb9a..b6dfdef 100644
--- a/packages/wx/CMakeLists.txt
+++ b/packages/wx/CMakeLists.txt
@@ -1,3 +1,6 @@
+IF(NOT BBTK_CORE_PACKAGE)
+# HAVE TO FIND BBTK
+ENDIF(NOT BBTK_CORE_PACKAGE)
 
 #===========================================================================
 # Include user defined package settings 
diff --git a/packages/wx/bbs/appli/testSlider.bbs b/packages/wx/bbs/appli/testSlider.bbs
index 96900ea..f10844a 100644
--- a/packages/wx/bbs/appli/testSlider.bbs
+++ b/packages/wx/bbs/appli/testSlider.bbs
@@ -1,5 +1,6 @@
 description "Simple test of wx::Slider widget"
 author "laurent.guigues@creatis.insa-lyon.fr"
+category "test"
 
 load wx
 new Slider slider