Begin moving resource declarations into the fallback.

diff --git a/src/xio.c b/src/xio.c
index 63faceada62e4320fc425ff2f14af61b19a22360..0c5b225013cfba61330ad603757c130fb20095e3 100644 (file)
--- a/src/xio.c
+++ b/src/xio.c
@@ -9,7 +9,12 @@
 XtAppContext app_context;
 Widget toplevel, form, buttons, quit, destruct, text;
 
 XtAppContext app_context;
 Widget toplevel, form, buttons, quit, destruct, text;
 

-void quit_proc (Widget w, XtPointer client_data, XtPointer call_data)
+String fallback[] = {
+    "*destruct.fromHoriz: quit",
+    NULL,
+};
+
+static void quit_proc (Widget w, XtPointer client_data, XtPointer call_data)

 { 
     XtDestroyApplicationContext (app_context);
     exit (0);
 { 
     XtDestroyApplicationContext (app_context);
     exit (0);


@@ -18,21 +23,24 @@ void quit_proc (Widget w, XtPointer client_data, XtPointer call_data)
 int main (int argc, char **argv)
 { 
     toplevel = XtVaOpenApplication (&app_context, "XThird", NULL, 0, &argc,
 int main (int argc, char **argv)
 { 
     toplevel = XtVaOpenApplication (&app_context, "XThird", NULL, 0, &argc,

-                                   argv, NULL, applicationShellWidgetClass,
+                                   argv, fallback, 
+                                   applicationShellWidgetClass,

                                    XtNallowShellResize, True, NULL);
                                    XtNallowShellResize, True, NULL);

-    form = XtVaCreateManagedWidget ("form", formWidgetClass, toplevel, NULL); 
-    buttons = XtVaCreateManagedWidget ("form", formWidgetClass, form, NULL); 
+    form = XtVaCreateManagedWidget ("form", formWidgetClass, toplevel, NULL);
+    /* The button panel */
+    buttons  = XtVaCreateManagedWidget ("form", formWidgetClass, form, NULL); 

     quit     = XtVaCreateManagedWidget("quit", 
                                       commandWidgetClass, buttons, 
                                       XtNlabel, "Quit", NULL);
     quit     = XtVaCreateManagedWidget("quit", 
                                       commandWidgetClass, buttons, 
                                       XtNlabel, "Quit", NULL);

+    XtAddCallback (quit, XtNcallback, quit_proc, NULL);

     destruct = XtVaCreateManagedWidget("destruct", 
                                       commandWidgetClass, buttons, 
     destruct = XtVaCreateManagedWidget("destruct", 
                                       commandWidgetClass, buttons, 

-                                      XtNfromHoriz, quit,

                                       XtNlabel, "Destruct", NULL);
                                       XtNlabel, "Destruct", NULL);

+    /* the command window */

     text = XtVaCreateManagedWidget ("text", asciiTextWidgetClass, form, 
     text = XtVaCreateManagedWidget ("text", asciiTextWidgetClass, form, 

-                                   XtNfromVert, buttons, XtNresize,
-                                   XawtextResizeBoth, XtNresizable, True, NULL);
-    XtAddCallback (quit, XtNcallback, quit_proc, NULL);
+                                   XtNfromVert, buttons, 
+                                   XtNresize, XawtextResizeBoth, 
+                                   XtNresizable, True, NULL);

 
     /* sample text so the widget will be identifiable */
     XtVaSetValues (text, XtNtype, XawAsciiString, 
 
     /* sample text so the widget will be identifiable */
     XtVaSetValues (text, XtNtype, XawAsciiString, 


@@ -40,5 +48,7 @@ int main (int argc, char **argv)
     XtVaSetValues (text, XtNeditType, XawtextRead, XtNdisplayCaret, False, NULL);
     XtRealizeWidget (toplevel);
     XtAppMainLoop (app_context);
     XtVaSetValues (text, XtNeditType, XawtextRead, XtNdisplayCaret, False, NULL);
     XtRealizeWidget (toplevel);
     XtAppMainLoop (app_context);

+    /* loop may be interrupted */
+    XtDestroyApplicationContext (app_context);

     exit(0);
 }
     exit(0);
 }