*** empty log message ***

[bbtk.git] / kernel / src / bbtkWx.h

diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h
index d3f3318f86bd3a854ad93d266d743ebb3320e20a..b2ed350963d3a5bbfdc59ecd94b9915d12921986 100644 (file)
--- a/kernel/src/bbtkWx.h
+++ b/kernel/src/bbtkWx.h
@@ -1,9 +1,63 @@
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbtkWx.h,v $
+  Language:  C++
+  Date:      $Date: 2008/12/11 15:30:04 $
+  Version:   $Revision: 1.9 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
+
 #ifndef __bbtkWx_h_INCLUDED__
 #define __bbtkWx_h_INCLUDED__
 
 //===========================================================================
 // Wx headers
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 #include <wx/datetime.h>
@@ -22,12 +76,12 @@
 #endif //__WXGTK__
 // EO Wx headers
 
-#else //_USE_WXWIDGETS_
+#else //USE_WXWIDGETS
 
 // define wxWindow
 typedef void wxWindow;
 
-#endif // EO _USE_WXWIDGETS_
+#endif // EO USE_WXWIDGETS
 //===========================================================================
 
 //===========================================================================
@@ -54,6 +108,8 @@ namespace bbtk
   Wx::AddSignalObserver(boost::bind(&METHOD, this))
 // \BBTKWXSIG
 
+#define BBTK_BUSY_CURSOR bbtk::Wx::BusyCursor __bbtk_dummy_busy_cursor;
+
   struct BBTK_EXPORT Wx
   {    
   public:
@@ -76,6 +132,7 @@ namespace bbtk
     public:
       BusyCursor();
       ~BusyCursor();
+      wxBusyCursor* mCursor;
     };
 
     static void SetTopWindowParent(wxWindow*);
@@ -116,7 +173,7 @@ namespace bbtk
 
 
 
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
   //==================================================================
   /// Conversion std::string to wxString 
   inline wxString std2wx(const std::string& s){