Remove unnecessary includes of "Modhdr.h".

The last change meant it was no longer being generated, so ammended the code to not need it in line with all the other toolbox modules.

Version 0.34. Tagged as 'Gadgets-0_34'

VersionNum

-/* (0.33)
+/* (0.34)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.33
+#define Module_MajorVersion_CMHG        0.34
 #define Module_MinorVersion_CMHG        
 #define Module_Date_CMHG                14 Jan 2012
 
-#define Module_MajorVersion             "0.33"
-#define Module_Version                  33
+#define Module_MajorVersion             "0.34"
+#define Module_Version                  34
 #define Module_MinorVersion             ""
 #define Module_Date                     "14 Jan 2012"
 
@@ -18,6 +18,6 @@
 #define Module_ComponentName            "Gadgets"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Toolbox/Gadgets"
 
-#define Module_FullVersion              "0.33"
-#define Module_HelpVersion              "0.33 (14 Jan 2012)"
-#define Module_LibraryVersionInfo       "0:33"
+#define Module_FullVersion              "0.34"
+#define Module_HelpVersion              "0.34 (14 Jan 2012)"
+#define Module_LibraryVersionInfo       "0:34"

c/ScrollList

@@ -65,7 +65,6 @@
 #include "ScrollLisP.h"
 #include "ScrollLisS.h"
 #include "Sizes.h"
-#include "ModHdr.h"
 #include "utils.h"
 
 #ifdef MemCheck_MEMCHECK

c/Scrollbar

@@ -47,7 +47,6 @@
 #include "TextGadget.h"
 #include "Scrollbar.h"
 #include "ScrollbarP.h"
-#include "ModHdr.h"
 #include "Utils.h"
 
 #ifdef MemCheck_MEMCHECK

c/TextArea

@@ -62,7 +62,6 @@
 #include "Scrollbar.h"
 #include "ScrollbarP.h"
 #include "Sizes.h"
-#include "ModHdr.h"
 #include "utils.h"
 
 extern void print_info(FILE *);

c/main

@@ -35,7 +35,6 @@
 
 #include "wimplib.h"
 #include "TextGadget.h"
-#include "ModHdr.h"
 #include "glib.h"
 #include "rmensure.h"
 #include "TextArea.h"
@@ -52,12 +51,6 @@
 #include "MemCheck:MemCheck.h"
 #endif
 
-#if CMHG_VERSION < 516
-#  define CMHG_CONST
-#else
-#  define CMHG_CONST const
-#endif
-
 #define IGNORE(a) a=a
 unsigned int    redrawing_window = 0;
 
@@ -141,7 +134,7 @@ static void register_gadgets(void)
     		features.mask, TextGadgets_Scrollbar);
 }
 
-_kernel_oserror *TextGadgets_init(CMHG_CONST char *cmd_tail, int podule_base, void *pw)
+_kernel_oserror *TextGadgets_init(const char *cmd_tail, int podule_base, void *pw)
 {
     _kernel_oserror *e;
 
@@ -233,7 +226,7 @@ _kernel_oserror *TextGadgets_SWI_handler(int swi_no, _kernel_swi_regs *r,
 #endif
 
     switch (swi_no) {
-        case (TextGadgets_TextArea-TextGadgets_00):
+        case (TextGadgets_TextArea - TextGadgets_SWIChunkBase):
            switch (r->r[2]) {
               case GADGET_ADD:
 #ifdef MemCheck_MEMCHECK
@@ -268,7 +261,7 @@ _kernel_oserror *TextGadgets_SWI_handler(int swi_no, _kernel_swi_regs *r,
            }
            break;
 
-        case (TextGadgets_ScrollList-TextGadgets_00):
+        case (TextGadgets_ScrollList - TextGadgets_SWIChunkBase):
            switch (r->r[2]) {
               case GADGET_ADD:
 #ifdef MemCheck_MEMCHECK
@@ -304,7 +297,7 @@ _kernel_oserror *TextGadgets_SWI_handler(int swi_no, _kernel_swi_regs *r,
            }
            break;
 
-        case (TextGadgets_Scrollbar-TextGadgets_00):
+        case (TextGadgets_Scrollbar - TextGadgets_SWIChunkBase):
            switch (r->r[2]) {
               case GADGET_ADD:
 #ifdef MemCheck_MEMCHECK
@@ -339,12 +332,12 @@ _kernel_oserror *TextGadgets_SWI_handler(int swi_no, _kernel_swi_regs *r,
            }
            break;
 
-        case (TextGadgets_RedrawAll - TextGadgets_00):
+        case (TextGadgets_RedrawAll - TextGadgets_SWIChunkBase):
 //            e = scrolllist_redraw_all(r->r[0], r->r[1]);
             // add other gadget redraw functions here...
             break;
 
-        case (TextGadgets_Filter - TextGadgets_00):
+        case (TextGadgets_Filter - TextGadgets_SWIChunkBase):
             textarea_filter(r);
             scrolllist_filter(r);
             scrollbar_filter(r);

h/TextGadget

@@ -22,6 +22,13 @@
 #ifndef _TEXTGADGETS_H
 #define _TEXTGADGETS_H
 
+#include "kernel.h"
+
+extern _kernel_oserror *TextGadgets_init(const char *cmd_tail, int podule_base, void *pw);
+extern _kernel_oserror *TextGadgets_final(int fatal, int podule, void *pw);
+extern void TextGadgets_services(int service_number, _kernel_swi_regs *r, void *pw);
+extern _kernel_oserror *TextGadgets_SWI_handler(int swi_offset, _kernel_swi_regs *r, void *pw);
+
 // Horrible. Need to work this out properly and change on mode changes.
 #define SCROLLBAR_SIZE	44