#include <config.h>
#include <stdio.h>
+#include <assert.h>
#include <stdlib.h>
#include <X11/StringDefs.h>
#include "xintrinsicp.h"
#include <X11/Shell.h>
#include <X11/ShellP.h>
-#include <X11/Vendor.h>
-#include <X11/VendorP.h>
#include "EmacsShell.h"
#include "ExternalShell.h"
+#define ABORT abort
+
#if 0 /* Not currently used */
/* The root_geometry_manager() method in Shell.c is fucked up with regard
void
EmacsShellSmashIconicHint (Widget shell, int iconic_p)
{
- /* See comment in xfns.c about this */
- WMShellWidget wmshell;
- int old, new;
- if (! XtIsSubclass (shell, wmShellWidgetClass)) abort ();
- wmshell = (WMShellWidget) shell;
- old = (wmshell->wm.wm_hints.flags & StateHint
- ? wmshell->wm.wm_hints.initial_state
- : NormalState);
- new = (iconic_p ? IconicState : NormalState);
+ /* See comment in frame-x.c about this */
+ WMShellWidget wmshell = (WMShellWidget) shell;
+ assert (XtIsSubclass (shell, wmShellWidgetClass));
+ /* old_state = (wmshell->wm.wm_hints.flags & StateHint
+ ? wmshell->wm.wm_hints.initial_state
+ : NormalState); */
wmshell->wm.wm_hints.flags |= StateHint;
- wmshell->wm.wm_hints.initial_state = new;
+ wmshell->wm.wm_hints.initial_state = iconic_p ? IconicState : NormalState;
}
void
TopLevelEmacsShellUpdateSizeHints (gw);
#ifdef EXTERNAL_WIDGET
else if (XtIsSubclass (gw, externalShellWidgetClass))
- /* do what ??? Don't abort! */;
+ /* do what ??? Don't ABORT! */;
#endif
else if (XtIsSubclass (gw, transientEmacsShellWidgetClass))
TransientEmacsShellUpdateSizeHints (gw);
else
- abort ();
+ ABORT ();
}