Changeset 21490 for main/trunk

Timestamp:

2010-01-18T14:27:31+13:00 (14 years ago)

Author:

mdewsnip

Message:

Adding new GSDL_USE_WIZARD_ACTION definition to gsdl_modules_cfg.h, to control what happens in wizardaction.cpp and wizardaction.h (the same as what GSDL_USE_COLLECTOR_ACTION does in collectoraction.cpp and collectoraction.h).

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• gsdl_modules_cfg.h (modified) (1 diff)
• wizardaction.cpp (modified) (2 diffs)
• wizardaction.h (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/gsdl_modules_cfg.h

@@ -65 +65 @@
 #define GSDL_USE_TIP_ACTION
 #define GSDL_USE_USERS_ACTION
+#define GSDL_USE_WIZARD_ACTION
 
 #undef  GSDL_USE_CL_DISPLAY_ACTION

main/trunk/greenstone2/runtime-src/src/recpt/wizardaction.cpp

@@ -25 +25 @@
 
 #include "gsdl_modules_cfg.h"
+#ifdef GSDL_USE_WIZARD_ACTION
 
 // note that the wizardaction relies on having direct access to a
@@ -730 +731 @@
 }
 
+#endif //GSDL_USE_WIZARD_ACTION

main/trunk/greenstone2/runtime-src/src/recpt/wizardaction.h

@@ -25 +25 @@
 
 #include "gsdl_modules_cfg.h"
+#ifdef GSDL_USE_WIZARD_ACTION
 
 #ifndef WIZARDACTION_H
@@ -106 +107 @@
 
 #endif //!WIZARDACTION_H
-
+#endif //GSDL_USE_WIZARD_ACTION