#3212 BBTK Feature New Normal - vtk8itk4wx3-mingw64 MACOS

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 7507a2ab51d0f5ca1ca65967f2f31f435345e8a8..f33d84e8f1dd7349a682d6968ed468388208a6e5 100644 (file)
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -1214,10 +1214,7 @@ printf("EED Package::OpenDynamicLibrary  %s   %s \n", libname.c_str(), package_n
            s << "<hr>\n";
            */
          }
-      }
-
-    else 
-      {
+      } else {
        s << "<h1 class=\"settitle\">"<<title<<"</h1>\n";
        s << "<p><TABLE cellspacing=0  cellpadding=3>\n";
        s << "<TR><TD style='vertical-align: top;'><b> Description </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'> " 

diff --git a/kernel/src/bbtkRTTI.cxx b/kernel/src/bbtkRTTI.cxx
index be8ac465564f1cc12570025fb70fd465de60d082..bad76a8b8cf6373970f00b307af0476bddf31c70 100644 (file)
--- a/kernel/src/bbtkRTTI.cxx
+++ b/kernel/src/bbtkRTTI.cxx
@@ -74,8 +74,16 @@ namespace bbtk
                     << " to " << TypeName(target_type) << std::endl);
 
     void* target_pointer = 0;
-#if __GNUC__ > 3 ||                                    \
-  (__GNUC__ == 3 && (__GNUC_MINOR__ > 1 ||             \
+    
+    
+    
+#if __APPLE__
+   //EED2018-08-28  Be careful  #include <typeinfo> is not complete  (CommandLine mechanisme Xcode)
+    printf("EED bbtkRTTI  run_time_up_or_down_cast   2018-08-28 Warnning !!!!  Apple cast missing  __do_upcast   ");
+       return source_pointer;
+#else    
+  #if __GNUC__ > 3 ||                                  \
+    (__GNUC__ == 3 && (__GNUC_MINOR__ > 1 ||           \
                     (__GNUC_MINOR__ == 1 &&            \
                      __GNUC_PATCHLEVEL__ > 0)))
     
@@ -86,31 +94,25 @@ namespace bbtk
 
     void* tmp = source_pointer;
     if (source_type.__do_upcast(targetTI,&tmp)) 
-      {
-       target_pointer = tmp;
-      }
-    else 
-      {
-       bbtkDebugMessage("data",7,
+    {
+         target_pointer = tmp;
+    } else {
+          bbtkDebugMessage("data",7,
                         " * upcast failed : trying dynamic down cast"
                         <<std::endl);
-       const abi::__class_type_info* sourceTI = 
-         (const abi::__class_type_info *)( &(source_type));
-       
-       
-       target_pointer = abi::__dynamic_cast(source_pointer, 
+          const abi::__class_type_info* sourceTI = (const abi::__class_type_info *)( &(source_type));
+          target_pointer = abi::__dynamic_cast(source_pointer, 
                                             sourceTI, 
                                             targetTI, 
                                             -1);   
       }
-    
-    bbtkDebugMessage("data",7," * target   = "<<target_pointer<<std::endl);
-    
-#else
+      bbtkDebugMessage("data",7," * target   = "<<target_pointer<<std::endl);
+  #else
     bbtkWarning("run_time_up_or_down_cast not impl. on Win : to do");
     // target_pointer = __RTDynamicCast(source_pointer, 0, source_type, target_type, 0);
-#endif
+  #endif
     return target_pointer;
+#endif    
     
   }
 

diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h
index ecd60997d2d0c817b0898c589a96e5af9110b58e..44f17bfc24f0565e0962545fff968c3e8d786060 100644 (file)
--- a/kernel/src/bbtkSystem.h
+++ b/kernel/src/bbtkSystem.h
@@ -120,7 +120,7 @@
 //#include "WWW.h"
   #ifdef BBTK_EXPORT_SYMBOLS
     #define BBTK_EXPORT __declspec( dllexport )
-#else
+  #else
     #define BBTK_EXPORT __declspec( dllimport )
   #endif
   #define BBTK_CDECL __cdecl
@@ -148,6 +148,7 @@ namespace bbtk
 #define BBTK_STRINGIFY(A) #A
 #define BBTK_STRINGIFY_SYMBOL(A) BBTK_STRINGIFY(A)
 
+
   extern "C" 
   {
     BBTK_EXPORT inline const std::string& BBTK_CDECL GetVersion() 
@@ -157,6 +158,7 @@ namespace bbtk
     }
   }
 
+
 }
 //-----------------------------------------------------------------------------
 
@@ -181,33 +183,31 @@ typedef  unsigned int        uint32_t;
 #ifdef CMAKE_HAVE_STDINT_H
    #include <stdint.h>
 #else
-#ifdef CMAKE_HAVE_INTTYPES_H
-   // Old system only have this
-   #include <inttypes.h>   // For uint8_t uint16_t and uint32_t
-#else
-   //#include "XXX.h"
-// Broken plateforms do not respect C99 and do not provide those typedef
-// Special case for recent Borland compiler, comes with stdint.h
-#if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560)  \
-                      || defined(__MINGW32__)
-typedef  signed char         int8_t;
-typedef  signed short        int16_t;
-typedef  signed int          int32_t;
-typedef  unsigned char       uint8_t;
-typedef  unsigned short      uint16_t;
-typedef  unsigned int        uint32_t;
-
-/// \todo Find a clever way to deal with int64_t, uint64_t
-
-#else
-#error "Sorry your plateform is not supported"
-#endif // defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560)  || defined(__MINGW32__)
-#endif // CMAKE_HAVE_INTTYPES_H
+  #ifdef CMAKE_HAVE_INTTYPES_H
+     // Old system only have this
+     #include <inttypes.h>   // For uint8_t uint16_t and uint32_t
+  #else
+    //#include "XXX.h"
+    // Broken plateforms do not respect C99 and do not provide those typedef
+    // Special case for recent Borland compiler, comes with stdint.h
+   #if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560)  \
+                         || defined(__MINGW32__)
+     typedef  signed char         int8_t;
+     typedef  signed short        int16_t;
+     typedef  signed int          int32_t;
+     typedef  unsigned char       uint8_t;
+     typedef  unsigned short      uint16_t;
+     typedef  unsigned int        uint32_t;
+      /// \todo Find a clever way to deal with int64_t, uint64_t
+    #else
+       #error "Sorry your plateform is not supported"
+    #endif // defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560)  || defined(__MINGW32__)
+  #endif // CMAKE_HAVE_INTTYPES_H
 #endif // CMAKE_HAVE_STDINT_H
 
 // Basically for VS6 and bcc 5.5.1:
 #ifndef UINT32_MAX
-#define UINT32_MAX    (4294967295U)
+  #define UINT32_MAX    (4294967295U)
 #endif
 
 
@@ -231,18 +231,19 @@ namespace bbtk
 
     // file separator
 #if defined(_WIN32)
-#define VALID_FILE_SEPARATOR "\\"
-#define INVALID_FILE_SEPARATOR "/"
-#define VALID_FILE_SEPARATOR_CHAR '\\'
-#define INVALID_FILE_SEPARATOR_CHAR '/'
+  #define VALID_FILE_SEPARATOR "\\"
+  #define INVALID_FILE_SEPARATOR "/"
+  #define VALID_FILE_SEPARATOR_CHAR '\\'
+  #define INVALID_FILE_SEPARATOR_CHAR '/'
 #else
-#define INVALID_FILE_SEPARATOR "\\"
-#define VALID_FILE_SEPARATOR "/"
-#define INVALID_FILE_SEPARATOR_CHAR '\\'
-#define VALID_FILE_SEPARATOR_CHAR '/'
+  #define INVALID_FILE_SEPARATOR "\\"
+  #define VALID_FILE_SEPARATOR "/"
+  #define INVALID_FILE_SEPARATOR_CHAR '\\'
+  #define VALID_FILE_SEPARATOR_CHAR '/'
 #endif
 
-#endif
+
+#endif  //__bbtkSystem_h__
 
 
 //----------------------------
@@ -266,3 +267,5 @@ namespace bbtk
  * \defgroup interface Graphical User Interface components
  * \defgroup data Data
 */
+
+

diff --git a/kernel/src/bbtkWxGUIPackageBrowser2.cxx b/kernel/src/bbtkWxGUIPackageBrowser2.cxx
index 0193bb3a55ec8145d9d18a2f6618b2e255c2b12a..e87ffcbd5f890e574693e1ffddc2af31b4060618 100644 (file)
--- a/kernel/src/bbtkWxGUIPackageBrowser2.cxx
+++ b/kernel/src/bbtkWxGUIPackageBrowser2.cxx
@@ -271,16 +271,19 @@ int wxCALLBACK MyCompareFunction(long item1, long item2, long WXUNUSED(sortData)
                      //DFGO -> To identify it is a box
                      sendtext += crea::std2wx("box:");
                      sendtext += crea::std2wx(d->GetFullTypeName());
+                     sendtext += _T("<EndEED>");
+              printf("EED WxGUIBlackBoxList::OnBeginDrag <%s>%d  <%s>%d\n",
+                     (const char*)sendtext.mb_str(),sendtext.Len() ,  d->GetFullTypeName().c_str() , d->GetFullTypeName().length() );
                  }
-         }
-         else
-         {
+         } else {
                  wxFAIL_MSG(wxT("wxListCtrl::GetItem() failed"));
          }
 
          wxTextDataObject tdo(sendtext);
+      printf("EED WxGUIBlackBoxList::OnBeginDrag <%s>\n",(const char*) tdo.GetText().mb_str() );
+
          wxDropSource tds(tdo, this);
-         tds.DoDragDrop();
+         tds.DoDragDrop( );
 
     //    const wxPoint& pt = event.m_pointDrag;
 

diff --git a/kernel/src/bbtkWxGUIPackageBrowser2.h b/kernel/src/bbtkWxGUIPackageBrowser2.h
index a4b806297e14a642371f8e9ce12a25e06aaea7ed..762f78bb2c317d3612fb13547d6bfaef519d8a95 100644 (file)
--- a/kernel/src/bbtkWxGUIPackageBrowser2.h
+++ b/kernel/src/bbtkWxGUIPackageBrowser2.h
@@ -193,6 +193,7 @@ private:
 
     wxListItemAttr m_attr;
 
+
     //    DECLARE_NO_COPY_CLASS(WxGUIBlackBoxListCtrl)
     DECLARE_EVENT_TABLE()
 };
@@ -243,6 +244,7 @@ private:
     wxCheckBox                                 *mShowWidgetsFilter;
     wxCheckBox                                 *mShowAdaptorsFilter;
     wxCheckBox                                 *mShowGUIsFilter;
+     
 
        //RaC
        BlackBoxDescriptor          *_actualSelected;

diff --git a/packages/vtk/CMakeLists.txt b/packages/vtk/CMakeLists.txt
index baa3ce5475509314cf2de781bf38de226a3524b8..6689a6089c52f8a5bbe6e345d219eff9ea0db8aa 100644 (file)
--- a/packages/vtk/CMakeLists.txt
+++ b/packages/vtk/CMakeLists.txt
@@ -129,6 +129,7 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_ALL_BBS_APPLI ON)
 #)
 #===========================================================================
 
+
 #===========================================================================
 SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
   # LIST HERE YOUR ADDITIONAL INCLUDE DIRECTORIES 

diff --git a/packages/vtk/src/bbvtkImageBoundaries.cxx b/packages/vtk/src/bbvtkImageBoundaries.cxx
index 67eefef5a99791320c5c0346bda0f53413345c1c..3275137da798188ab483ae753146d7049f218751 100644 (file)
--- a/packages/vtk/src/bbvtkImageBoundaries.cxx
+++ b/packages/vtk/src/bbvtkImageBoundaries.cxx
@@ -32,7 +32,15 @@
 #include "bbvtkPackage.h"
 #include "creaVtk_MACROS.h"
 
+
+/*
+
 #include <omp.h>
+
+*/
+
+
+
 namespace bbvtk
 {
 
@@ -43,7 +51,6 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ImageBoundaries,bbtk::AtomicBlackBox);
 //===== 
 void ImageBoundaries::Process()
 {
-       printf("bbtk:vtk::ImageBoundaries::Process start\n");
        if (bbGetInputIn()!=NULL){
                int i,j,k;      
                int ext[6];