diff src/gui-x.c @ 231:557eaa0339bf r20-5b14

Import from CVS: tag r20-5b14
author cvs
date Mon, 13 Aug 2007 10:13:48 +0200
parents d44af0c54775
children 11cf20601dec
line wrap: on
line diff
--- a/src/gui-x.c	Mon Aug 13 10:13:03 2007 +0200
+++ b/src/gui-x.c	Mon Aug 13 10:13:48 2007 +0200
@@ -33,12 +33,10 @@
 #include "buffer.h"
 #include "device.h"
 #include "frame.h"
+#include "gui.h"
 #include "opaque.h"
 
 #ifdef HAVE_POPUPS
-/* count of menus/dboxes currently up */
-int popup_up_p;
-
 Lisp_Object Qmenu_no_selection_hook;
 #endif
 
@@ -221,15 +219,6 @@
   free_widget_value (wv);
 }
 
-DEFUN ("popup-up-p", Fpopup_up_p, 0, 0, 0, /*
-Return t if a popup menu or dialog box is up, nil otherwise.
-See `popup-menu' and `popup-dialog-box'.
-*/
-       ())
-{
-  return popup_up_p ? Qt : Qnil;
-}
-
 /* The following is actually called from somewhere within XtDispatchEvent(),
    called from XtAppProcessEvent() in event-Xt.c */
 
@@ -315,24 +304,6 @@
       slot = (!NILP ((form)))
 #endif
 
-Boolean
-separator_string_p (CONST char *s)
-{
-  CONST char *p;
-  char first;
-
-  if (!s || s[0] == '\0')
-    return False;
-  first = s[0];
-  if (first != '-' && first != '=')
-    return False;
-  for (p = s; *p == first; p++);
-
-  if (*p == '!' || *p == ':' || *p == '\0')
-    return True;
-  return False;
-}
-
 char *
 menu_separator_style (CONST char *s)
 {
@@ -633,7 +604,6 @@
 syms_of_gui_x (void)
 {
 #ifdef HAVE_POPUPS
-  DEFSUBR (Fpopup_up_p);
   defsymbol (&Qmenu_no_selection_hook, "menu-no-selection-hook");
 #endif
 }