Added support for nested windows.

Changed ActionButton style slightly so fonts can be used.

h/style

@@ -100,7 +100,7 @@
                                               (wimp_ICONFLAGS_FORECOL * style_ACTION_BUTTON_FORECOL) |\
                                               (wimp_ICONFLAGS_BACKCOL * style_ACTION_BUTTON_BACKCOL)\
                                              )
-#define style_ACTION_BUTTON_VALIDSTR         "R5,3"
+#define style_ACTION_BUTTON_VALIDSTR         "R5,3;f17"
 
 
 #define style_DEFAULT_ACTION_HEIGHT          68 /* OS Units */

h/twimp

@@ -15,7 +15,8 @@
 /* Title:   wimp.h
  * Purpose: C interface to RISC OS Wimp routines.
  * Author:  IDJ
- * History: 16-Sep-93: created
+ * History: 16-Sep-93: IDJ: created
+ *          25-Nov-96: EPW: Updated structures for nested window support
  */
 
 # ifndef __wimp_h
@@ -308,9 +309,18 @@ typedef struct
         int           scx,
                       scy;                   /* scroll offsets */
         int           behind;                /* handle to open window behind */
-
 } wimp_OpenWindow;
 
+typedef struct
+{
+        int           window_handle;         /* handle of window to open */
+        wimp_Bbox     visible_area;          /* visible area coords */
+        int           scx,
+                      scy;                   /* scroll offsets */
+        int           behind;                /* handle to open window behind */
+	/* The following requires nested window support in the Wimp */
+	int           window_flags;
+} wimp_NestedOpenWindow;
 
 #define wimp_OpenWindow_TopOfStack      (-1)
 #define wimp_OpenWindow_BottomOfStack   (-2)