c/PaintLib

@@ -14,9 +14,9 @@
  */
 #include "PaintLib.h"
 
-os_error* PaintLib_get_wind_info(wimp_winfo* winfo)
-{
-  return wimp_get_wind_info((wimp_winfo*)(1 | (int)winfo));
+os_error *paintlib_get_wind_info (wimp_winfo *winfo)
+
+{ return wimp_get_wind_info ((wimp_winfo *)(1 | (int)winfo));
 }
 
 

c/ToolWindow

@@ -49,10 +49,10 @@ wimp_w toolwindow_handle;
 toolwindow_block *toolwindow_current_tool;
 int toolwindow_current_mode = 0;
 
-#ifdef ModuleVersion
 static toolwindow_block *toolarray [tools_COUNT];
 static void init_toolarray (void)
-{ toolarray [0]  = NULL;
+{ /* Required to generate relocatable code */
+  toolarray [0]  = NULL;
   toolarray [1]  = &tools_pixelpaint;
   toolarray [2]  = &tools_spraycanpaint;
   toolarray [3]  = &tools_floodfillpaint;
@@ -75,32 +75,6 @@ static void init_toolarray (void)
   toolarray [20] = &tools_parallelogramoutlinepaint;
   toolarray [21] = &tools_brushpaint;
 }
-#else
-static toolwindow_block *toolarray [tools_COUNT] =
-{ NULL,                     /* zeroth icon n'existe pas */
-  &pixelpaint,              /* 1 */
-  &spraycanpaint,           /* 2 */
-  &floodfillpaint,          /* 3 */
-  &linepaint,               /* 4 */
-  &ellipseoutlinepaint,     /* 5 */
-  &ellipsepaint,            /* 6 */
-  &circleoutlinepaint,      /* 7 */
-  &circlepaint,             /* 8 */
-  &trianglepaint,           /* 9 */
-  &arcpaint,                /* 10 */
-  &segmentpaint,            /* 11 */
-  &sectorpaint,             /* 12 */
-  &camerapaint,             /* 13 */
-  &scissorpaint,            /* 14 */
-  &textpaint,               /* 15 */
-  &grabberpaint,            /* 16 */
-  &rectanglepaint,          /* 17 */
-  &rectangleoutlinepaint,   /* 18 */
-  &parallelogrampaint,      /* 19 */
-  &parallelogramoutlinepaint, /* 20 */
-  &brushpaint               /* 21 */
-};
-#endif
 
 static char
     *onlydigits  = "A0-9";
@@ -438,7 +412,8 @@ static void sprite_tool_event_handler (wimp_eventstr *e, void *handle)
             tools_brush_use_gcol = (i.flags & wimp_ISELECTED) != 0;
 
             performbrushGOaction ();
-        } }
+          }
+        }
         else if (toolwindow_current_tool == &tools_floodfillpaint)
         { wimp_icon i;
           wimpt_noerr (wimp_get_icon_info (toolwindow_handle,
@@ -621,7 +596,5 @@ void toolwindow_init (void)
 
 { toolwindow_handle = 0;
   toolwindow_current_tool   = &tools_pixelpaint;
-#ifdef ModuleVersion
   init_toolarray ();
-#endif
 }

debug/!Paint/!Boot,feb

-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-Set Alias$@RunType_FF9 /<Obey$Dir> 
-Set Alias$@PrintType_FF9 /<Obey$Dir> -print 

debug/!Paint/!Help

-The Paint application allows you to create and edit
-sprite files. A sprite file contains one or more
-graphic images, each stored as a bitmap.

debug/!Paint/!Run,feb

-| Copyright 1996 Acorn Computers Ltd
-|
-| Licensed under the Apache License, Version 2.0 (the "License");
-| you may not use this file except in compliance with the License.
-| You may obtain a copy of the License at
-|
-|     http://www.apache.org/licenses/LICENSE-2.0
-|
-| Unless required by applicable law or agreed to in writing, software
-| distributed under the License is distributed on an "AS IS" BASIS,
-| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-| See the License for the specific language governing permissions and
-| limitations under the License.
-|
-RMEnsure UtilityModule 3.50 Error This version of Paint requires RISC OS 3.50
-RMEnsure SpriteExtend 0.80 Error This version of Paint requires Sprite Extend 0.80
-If "<Wimp$ScrapDir>"="" then Error Paint requires a scrap directory: open a directory that contains the Scrap application
-
-Set Paint$Dir <Obey$Dir>
-Set Paint$Path <Obey$Dir>.,Resources:$.Resources.Paint.
-/<Paint$Dir>.!Boot
-WIMPSlot -min 384K
-WIMPSlot -max 352K
-/<Paint$Dir>.!RunImage %*0