Corrected tool mechanism for windows: static data members seem to be initialized...

[clitk.git] / vv / vvToolBase.h

diff --git a/vv/vvToolBase.h b/vv/vvToolBase.h
index a6629504bb23329e038a9e0ffa56ca0b11fc2d3f..f28fc8bb5aaea4b960d5aa745897c39e3d4ff28f 100644 (file)
--- a/vv/vvToolBase.h
+++ b/vv/vvToolBase.h
@@ -18,6 +18,7 @@
 
 #ifndef VVTOOLBASE_H
 #define VVTOOLBASE_H
+
 #include "vvToolBaseBase.h"
 #include "vvToolCreator.h"
 
@@ -28,11 +29,11 @@ public:
   vvToolBase(vvMainWindowBase * m);
   static void Initialize();  // can't be virtual, must be overwritten
 
-  static void SetToolName(QString n) { vvToolCreator<ToolType>::mSingleton->mToolName = n; }
-  static void SetToolMenuName(QString n) { vvToolCreator<ToolType>::mSingleton->mToolMenuName = n; }
-  static void SetToolIconFilename(QString n) { vvToolCreator<ToolType>::mSingleton->mToolIconFilename = n; }
-  static void SetToolTip(QString n) { vvToolCreator<ToolType>::mSingleton->mToolTip = n; }
-  static void SetToolExperimental(bool exp) { vvToolCreator<ToolType>::mSingleton->mExperimental = exp; }
+  static void SetToolName(QString n) { vvToolCreator<ToolType>::GetInstance()->mToolName = n; }
+  static void SetToolMenuName(QString n) { vvToolCreator<ToolType>::GetInstance()->mToolMenuName = n; }
+  static void SetToolIconFilename(QString n) { vvToolCreator<ToolType>::GetInstance()->mToolIconFilename = n; }
+  static void SetToolTip(QString n) { vvToolCreator<ToolType>::GetInstance()->mToolTip = n; }
+  static void SetToolExperimental(bool exp) { vvToolCreator<ToolType>::GetInstance()->mExperimental = exp; }
 
   void AddImage(vvImage::Pointer image,std::string filename) {
     CREATOR(ToolType)->GetMainWindow()->AddImage(image,filename);