Commit 50603298 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Added export of assembler headers for Window and Toolbox modules.

  C headers protect their definitions of service calls to avoid clashes
Detail:
  Exported headers contain SWI definitions only.
  Exported C headers protect their definitions of service call symbols
    to avoid clashes with Global/Services.h (which will contain them
    all from the next source drop)
Admin:
  Tested with the Window module.

Version 0.05. Tagged as 'Common-0_05'
parent cb30a819
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
# Paths # Paths
# #
LIBDIR = <Lib$Dir> LIBDIR = <Lib$Dir>
EXP_HDR = <export$dir>
# #
# Generic options: # Generic options:
# #
...@@ -117,6 +119,7 @@ export: export_${PHASE} ...@@ -117,6 +119,7 @@ export: export_${PHASE}
export_hdrs: dirs export_hdrs: dirs
${CP} objects ${EXPORTS}.objects ${CPFLAGS} ${CP} objects ${EXPORTS}.objects ${CPFLAGS}
${CP} h.* ${EXPORTS}.h.* ${CPFLAGS} ${CP} h.* ${EXPORTS}.h.* ${CPFLAGS}
${CP} hdr.* ${EXP_HDR}.* ${CPFLAGS}
@echo ${DEBUGLIB} and ${TBOXLIB}: export complete (hdrs) @echo ${DEBUGLIB} and ${TBOXLIB}: export complete (hdrs)
export_libs: ${TBOXLIB} ${TBOXLIBZM} ${DEBUGLIB} ${DEBUGLIBZM} dirs export_libs: ${TBOXLIB} ${TBOXLIBZM} ${DEBUGLIB} ${DEBUGLIBZM} dirs
......
/* (0.04) /* (0.05)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* *
*/ */
#define Module_MajorVersion_CMHG 0.04 #define Module_MajorVersion_CMHG 0.05
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 17 Mar 1999 #define Module_Date_CMHG 16 Nov 1999
#define Module_MajorVersion "0.04" #define Module_MajorVersion "0.05"
#define Module_Version 4 #define Module_Version 5
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "17 Mar 1999" #define Module_Date "16 Nov 1999"
#define Module_FullVersion "0.05"
...@@ -47,46 +47,7 @@ SWIClass SETS "Toolbox" ; Hdr:SWIs calls it Toolkit wrongly ...@@ -47,46 +47,7 @@ SWIClass SETS "Toolbox" ; Hdr:SWIs calls it Toolkit wrongly
AddSWI Initialise AddSWI Initialise
AddSWI LoadResources AddSWI LoadResources
AddSWI 17 ^ ToolkitSWI_Base + 57
AddSWI 18
AddSWI 19
AddSWI 20
AddSWI 21
AddSWI 22
AddSWI 23
AddSWI 24
AddSWI 25
AddSWI 26
AddSWI 27
AddSWI 28
AddSWI 29
AddSWI 30
AddSWI 31
AddSWI 32
AddSWI 33
AddSWI 34
AddSWI 35
AddSWI 36
AddSWI 37
AddSWI 38
AddSWI 39
AddSWI 40
AddSWI 41
AddSWI 42
AddSWI 43
AddSWI 44
AddSWI 45
AddSWI 46
AddSWI 47
AddSWI 48
AddSWI 49
AddSWI 50
AddSWI 51
AddSWI 52
AddSWI 53
AddSWI 54
AddSWI 55
AddSWI 56
AddSWI Memory AddSWI Memory
AddSWI DeRegisterObjectModule AddSWI DeRegisterObjectModule
......
...@@ -42,57 +42,11 @@ SWIClass SETS "Window" ; Hdr:SWIs calls it Windows wrongly ...@@ -42,57 +42,11 @@ SWIClass SETS "Window" ; Hdr:SWIs calls it Windows wrongly
AddSWI EnumerateGadgets AddSWI EnumerateGadgets
AddSWI GadgetGetIconList AddSWI GadgetGetIconList
AddSWI 12 ^ WindowsSWI_Base + 32
AddSWI 13
AddSWI 14
AddSWI 15
AddSWI 16
AddSWI 17
AddSWI 18
AddSWI 19
AddSWI 20
AddSWI 21
AddSWI 22
AddSWI 23
AddSWI 24
AddSWI 25
AddSWI 26
AddSWI 27
AddSWI 28
AddSWI 29
AddSWI 30
AddSWI 31
AddSWI InternalOp AddSWI InternalOp
AddSWI 33 ^ WindowsSWI_Base + 61
AddSWI 34
AddSWI 35
AddSWI 36
AddSWI 37
AddSWI 38
AddSWI 39
AddSWI 40
AddSWI 41
AddSWI 42
AddSWI 43
AddSWI 44
AddSWI 45
AddSWI 46
AddSWI 47
AddSWI 48
AddSWI 49
AddSWI 50
AddSWI 51
AddSWI 52
AddSWI 53
AddSWI 54
AddSWI 55
AddSWI 56
AddSWI 57
AddSWI 58
AddSWI 59
AddSWI 60
AddSWI PreSubMenuShow AddSWI PreSubMenuShow
AddSWI ExtractGadgetInfo AddSWI ExtractGadgetInfo
......
...@@ -350,9 +350,17 @@ typedef struct ...@@ -350,9 +350,17 @@ typedef struct
#define Service_ToolboxBase (Toolbox_SWIChunkBase+1) #define Service_ToolboxBase (Toolbox_SWIChunkBase+1)
#ifndef Service_ToolboxStarting
#define Service_ToolboxStarting (Service_ToolboxBase + 0) #define Service_ToolboxStarting (Service_ToolboxBase + 0)
#endif
#ifndef Service_ToolboxTaskBorn
#define Service_ToolboxTaskBorn (Service_ToolboxBase + 1) #define Service_ToolboxTaskBorn (Service_ToolboxBase + 1)
#endif
#ifndef Service_ToolboxTaskDied
#define Service_ToolboxTaskDied (Service_ToolboxBase + 2) #define Service_ToolboxTaskDied (Service_ToolboxBase + 2)
#endif
#ifndef Service_ToolboxDying
#define Service_ToolboxDying (Service_ToolboxBase + 3) #define Service_ToolboxDying (Service_ToolboxBase + 3)
#endif
#endif #endif
...@@ -919,11 +919,11 @@ typedef struct ...@@ -919,11 +919,11 @@ typedef struct
int scx, int scx,
scy; /* scroll offsets */ scy; /* scroll offsets */
int behind; /* handle to open window behind */ int behind; /* handle to open window behind */
/* The following are only used with the extended Toolbox_ShowObject /* The following are only used with the extended Toolbox_ShowObject
* method (when Toolbox_ShowObject_AsSubWindow is set in flags) */ * method (when Toolbox_ShowObject_AsSubWindow is set in flags) */
unsigned int window_flags; unsigned int window_flags;
unsigned int parent_window_handle; unsigned int parent_window_handle;
unsigned int alignment_flags; unsigned int alignment_flags;
} WindowShowObjectBlock; } WindowShowObjectBlock;
...@@ -985,10 +985,18 @@ typedef struct ...@@ -985,10 +985,18 @@ typedef struct
/* service calls */ /* service calls */
#ifndef Service_WindowModuleStarting
#define Service_WindowModuleStarting (Window_SWIChunkBase + 1) #define Service_WindowModuleStarting (Window_SWIChunkBase + 1)
#endif
#ifndef Service_WindowModuleDying
#define Service_WindowModuleDying (Window_SWIChunkBase + 2) #define Service_WindowModuleDying (Window_SWIChunkBase + 2)
#endif
#ifndef Service_GadgetRegistered
#define Service_GadgetRegistered (Window_SWIChunkBase + 3) #define Service_GadgetRegistered (Window_SWIChunkBase + 3)
#endif
#ifndef Service_GadgetDeregistered
#define Service_GadgetDeregistered (Window_SWIChunkBase + 4) #define Service_GadgetDeregistered (Window_SWIChunkBase + 4)
#endif
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment