Fixed Window deletion mechanism

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

diff --git a/kernel/src/bbtkMessageManager.h b/kernel/src/bbtkMessageManager.h
index 289f9ebbbdf9718f0662a3a3f7abe81aabc4199c..3832b8537bbf15ace5d8255f046bdcdb20643476 100644 (file)
--- a/kernel/src/bbtkMessageManager.h
+++ b/kernel/src/bbtkMessageManager.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkMessageManager.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/29 21:41:34 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2009/05/28 08:12:06 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -108,11 +108,12 @@
     }                                                  \
   else if (value<= __bbtkOnMessageLevelVariable) 
 
+#define BBTK_PREPEND_MESSAGE_WITH_CODE
 #ifdef BBTK_PREPEND_MESSAGE_WITH_CODE
-#define bbtkMessageCode                                \
-  key[0] << key[1] << key[2] << value << " "
+#define bbtkMessageCode(key,value)                     \
+  bbtk::MessageManager::FormatKey(key,value) 
 #else 
-#define bbtkMessageCode ""
+#define bbtkMessageCode(key,value) ""
 #endif 
 
 #ifdef BBTK_PREPEND_MESSAGE_WITH_TAB
@@ -122,7 +123,7 @@
 #define bbtkMessageTab ""
 #endif
 
-#define BBTK_PREPEND_MESSAGE_WITH_SPACE
+//#define BBTK_PREPEND_MESSAGE_WITH_SPACE
 #ifdef BBTK_PREPEND_MESSAGE_WITH_SPACE
 #define bbtkMessageSpace(value)                        \
   bbtk::MessageManager::GetSpace(value)
@@ -139,7 +140,7 @@
   do {                                                 \
     bbtkOnMessageLevel(key,value)                      \
       {                                                        \
-       std::cout << bbtkMessageCode                    \
+       std::cout << bbtkMessageCode(key,value)         \
                  << bbtkMessageTab                     \
                  << bbtkMessageSpace(value)            \
                  << MESSAGE;                           \
@@ -164,7 +165,7 @@
     {                                                  \
       bbtkOnMessageLevel(key,value)                    \
        {                                               \
-         std::cout << bbtkMessageCode                  \
+         std::cout << bbtkMessageCode(key,value)               \
                    << bbtkMessageTab                   \
                    << bbtkMessageSpace(value)          \
                    << MESSAGE;                         \
@@ -179,7 +180,7 @@
       bbtkOnMessageLevel(key,value)                    \
        {                                               \
          bbtk::MessageManager::DecTab();               \
-         std::cout << bbtkMessageCode                  \
+         std::cout << bbtkMessageCode(key,value)               \
                    << bbtkMessageTab                   \
                    << bbtkMessageSpace(value)          \
                    << MESSAGE;                         \
@@ -236,7 +237,7 @@
     {                                                  \
       bbtkOnMessageLevel(key,value)                    \
        {                                               \
-         std::cout << bbtkMessageCode                  \
+         std::cout << bbtkMessageCode(key,value)               \
                    << bbtkMessageTab                   \
                    << bbtkMessageSpace(value)          \
                    << MESSAGE;                         \
@@ -261,7 +262,7 @@
     {                                                  \
       bbtkOnMessageLevel(key,value)                    \
        {                                               \
-         std::cout << bbtkMessageCode                  \
+         std::cout << bbtkMessageCode(key,value)               \
                    << bbtkMessageTab                   \
                    << bbtkMessageSpace(value)          \
                    << MESSAGE;                         \
@@ -276,7 +277,7 @@
       bbtkOnMessageLevel(key,value)                    \
        {                                               \
          bbtk::MessageManager::DecTab();               \
-         std::cout << bbtkMessageCode                  \
+         std::cout << bbtkMessageCode(key,value)       \
                    << bbtkMessageTab                   \
                    << bbtkMessageSpace(value)          \
                    << MESSAGE;                         \
@@ -439,6 +440,8 @@ namespace bbtk
     ///
     static void PrintInfo();
 
+    static std::string FormatKey(const std::string& key, int value);
+
   private:
     std::map<std::string,int> mMessageLevel;
     std::map<std::string,std::string> mMessageHelp;