From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Mon, 4 Apr 2011 14:49:54 +0000 (+0000)
Subject: no message
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=59c1e1ce3506506ba854b72e6a80bef994bb2d8e;p=bbtk.git

no message
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0989eff..2488fce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ ADD_SUBDIRECTORY(packages)
 # The samples
 #OPTION(BUILD_BBTK_SAMPLES "Build bbtk samples" OFF)
 #IF(BUILD_BBTK_SAMPLES)
-#  ADD_SUBDIRECTORY(samples)
+  ADD_SUBDIRECTORY(samples)
 #ENDIF(BUILD_BBTK_SAMPLES)
 #-----------------------------------------------------------------------------
 
diff --git a/kernel/cmake/BBTKConfigurePackage_bbs.cmake b/kernel/cmake/BBTKConfigurePackage_bbs.cmake
index 6b55795..c190771 100644
--- a/kernel/cmake/BBTKConfigurePackage_bbs.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_bbs.cmake
@@ -5,6 +5,7 @@ IF(${BBTK_PACKAGE_NAME}_INCLUDE_ALL_BBS_BOXES)
     ${BBTK_PACKAGE_NAME}_BBS_BOXES 
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     "boxes/*.bbs"
+    "boxes/*.bbg"
     )
 
 # !! Produces a cmake seg. fault :
@@ -22,6 +23,7 @@ IF(${BBTK_PACKAGE_NAME}_INCLUDE_ALL_BBS_APPLI)
   FILE(GLOB ${BBTK_PACKAGE_NAME}_BBS_APPLI 
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     "appli/*.bbs"
+    "appli/*.bbg"
     )
 ENDIF(${BBTK_PACKAGE_NAME}_INCLUDE_ALL_BBS_APPLI) 
 #----------------------------------------------------------------------------
diff --git a/samples/SampleInsertWxBlackBoxInOwnFrame/CMakeLists.txt b/samples/SampleInsertWxBlackBoxInOwnFrame/CMakeLists.txt
index 6eed45f..c15d2fa 100644
--- a/samples/SampleInsertWxBlackBoxInOwnFrame/CMakeLists.txt
+++ b/samples/SampleInsertWxBlackBoxInOwnFrame/CMakeLists.txt
@@ -17,9 +17,11 @@ CREA_FIND_AND_USE_LIBRARIES()
 SET(SAMPLE bbtkSampleInsertWxBlackBoxInOwnFrame)
 
 # main 
-ADD_EXECUTABLE(${SAMPLE} WIN32 ${SAMPLE})
 IF(WIN32)
+  ADD_EXECUTABLE(${SAMPLE} WIN32 ${SAMPLE})
   SET_TARGET_PROPERTIES(${SAMPLE} PROPERTIES LINK_FLAGS /subsystem:console )
+ELSE(WIN32)
+  ADD_EXECUTABLE(${SAMPLE} MACOSX_BUNDLE ${SAMPLE})
 ENDIF(WIN32)
 # Link against bbwx
 TARGET_LINK_LIBRARIES(${SAMPLE} ${BBTK_LIBRARIES} ${bbwx_LIBRARIES}  ${WXWIDGETS_LIBRARIES})
diff --git a/samples/SampleOutputObserver/CMakeLists.txt b/samples/SampleOutputObserver/CMakeLists.txt
index a72b24d..0a9e19a 100644
--- a/samples/SampleOutputObserver/CMakeLists.txt
+++ b/samples/SampleOutputObserver/CMakeLists.txt
@@ -17,9 +17,13 @@ SET(USE_WXWIDGETS ON)
 CREA_FIND_AND_USE_LIBRARIES()
 
 # main 
-ADD_EXECUTABLE(${SAMPLE} WIN32 ${SAMPLE})
 IF(WIN32)
+  ADD_EXECUTABLE(${SAMPLE} WIN32 ${SAMPLE})
   SET_TARGET_PROPERTIES(${SAMPLE} PROPERTIES LINK_FLAGS /subsystem:console )
+ELSE(WIN32)
+  ADD_EXECUTABLE(${SAMPLE} MACOSX_BUNDLE ${SAMPLE})
 ENDIF(WIN32)
+
+
 # Link against bbwx
 TARGET_LINK_LIBRARIES(${SAMPLE} ${bbwx_LIBRARIES} ${BBTK_LIBRARIES} ${WXWIDGETS_LIBRARIES})
diff --git a/samples/SampleWidgetsBase/CMakeLists.txt b/samples/SampleWidgetsBase/CMakeLists.txt
index b264e2f..8bb1932 100644
--- a/samples/SampleWidgetsBase/CMakeLists.txt
+++ b/samples/SampleWidgetsBase/CMakeLists.txt
@@ -16,9 +16,12 @@ CREA_FIND_AND_USE_LIBRARIES()
 SET(SAMPLE bbtkSampleWidgetsBase)
 
 # main 
-ADD_EXECUTABLE(${SAMPLE} WIN32 ${SAMPLE})
 IF(WIN32)
+  ADD_EXECUTABLE(${SAMPLE} WIN32 ${SAMPLE})
   SET_TARGET_PROPERTIES(${SAMPLE} PROPERTIES LINK_FLAGS /subsystem:console )
+ELSE(WIN32)
+  ADD_EXECUTABLE(${SAMPLE} MACOSX_BUNDLE ${SAMPLE})
 ENDIF(WIN32)
+
 # Link against bbwx
 TARGET_LINK_LIBRARIES(${SAMPLE} ${bbwx_LIBRARIES} ${BBTK_LIBRARIES} ${WXWIDGETS_LIBRARIES})
diff --git a/samples/SampleWidgetsBase/bbtkSampleWidgetsBase.cxx b/samples/SampleWidgetsBase/bbtkSampleWidgetsBase.cxx
index 6163c94..66bc3c9 100644
--- a/samples/SampleWidgetsBase/bbtkSampleWidgetsBase.cxx
+++ b/samples/SampleWidgetsBase/bbtkSampleWidgetsBase.cxx
@@ -9,13 +9,14 @@
 //=========================================================================
 void SimpleSliderDialog()
 {
-  std::cout << "============== Simple Slider dialog" 
-	    << std::endl;
+  std::cout << "============== Simple Slider dialog 1" << std::endl;
    try
     {
       bbwx::Slider::Pointer slider = bbwx::Slider::New("slider");
+		std::cout << "============== Simple Slider dialog " << std::endl;
       //      slider->bbGetHelp();
       slider->bbSetInputWinDialog(true);  // mandatory
+		std::cout << "============== Simple Slider dialog 3" << std::endl; 
       slider->bbExecute();
       std::cout << "Slider Output = "<< slider->bbGetOutputOut() << std::endl;
     }