X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolCreator.h;h=2ebd8e095ab5b25c7dd933842c302b383be7823b;hb=b1fc92a91244b405396b95f214cc78262f5c75d7;hp=ff96010ee481e00932bb6e628ba30e11bd581930;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git

diff --git a/vv/vvToolCreator.h b/vv/vvToolCreator.h
index ff96010..2ebd8e0 100644
--- a/vv/vvToolCreator.h
+++ b/vv/vvToolCreator.h
@@ -17,30 +17,35 @@
 ======================================================================-====*/
 #ifndef VVTOOLCREATOR_H
 #define VVTOOLCREATOR_H
+
 #include "vvToolCreatorBase.h"
 
 //------------------------------------------------------------------------------
 template<class ToolType>
 class vvToolCreator: public vvToolCreatorBase {
 public:
-  vvToolCreator(QString name):vvToolCreatorBase(name) {;}
+  static vvToolCreator<ToolType> *&GetInstance();
   virtual void InsertToolInMenu(vvMainWindowBase * m);
   virtual void MenuSpecificToolSlot() { CreateTool<ToolType>(); }
+private:
+  vvToolCreator():vvToolCreatorBase(mToolCreatorName) {;}
   static vvToolCreator<ToolType> * mSingleton;
+  static const QString mToolCreatorName;
 };
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
-#define CREATOR(CLASSNAME) vvToolCreator<CLASSNAME>::mSingleton
+#define CREATOR(CLASSNAME) vvToolCreator<CLASSNAME>::GetInstance()
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
-#define ADD_TOOL(NAME)                                          \
-  template<>                                                    \
-  vvToolCreator<NAME> * vvToolCreator<NAME>::mSingleton =       \
-    new vvToolCreator<NAME>(#NAME);
+// Initiliazes the static parameters and creates a dummy pointer (required for windows)
+#define ADD_TOOL(NAME)                                                           \
+  template<> const QString        vvToolCreator<NAME>::mToolCreatorName = #NAME; \
+  template<> vvToolCreator<NAME> *vvToolCreator<NAME>::mSingleton       = NULL;  \
+  const vvToolCreator<NAME> *dummy##NAME = vvToolCreator<NAME>::GetInstance();
 //------------------------------------------------------------------------------
 
 #include "vvToolCreator.txx"