Merge from emacs-24; up to 2012-12-07T08:13:49Z!dmantipov@yandex.ru

[bpt/emacs.git] / oldXMenu / XMenuInt.h

diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index 683ed14..1edef30 100644 (file)
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -1,6 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985  */
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+
+#include "copyright.h"
+
 
 /*
  * XMenu:      MIT Project Athena, X Window system menu package
@@ -16,6 +17,8 @@
 #ifndef _XMenuInternal_h_
 #define _XMenuInternal_h_
 
+#include <config.h>
+
 /* Avoid warnings about redefining NULL by including <stdio.h> first;
    the other file which wants to define it (<stddef.h> on Ultrix
    systems) can deal if NULL is already defined, but <stdio.h> can't.  */
@@ -36,7 +39,7 @@
 /*
  * XMenu internal event handler variable.
  */
-extern int (*_XMEventHandler)();
+extern int (*_XMEventHandler)(XEvent*);
 
 #ifndef Pixel
 #define Pixel unsigned long
@@ -45,22 +48,24 @@ extern int (*_XMEventHandler)();
 /*
  * Internal routine declarations.
  */
-int _XMWinQueInit();           /* No value actually returned. */
-int _XMWinQueAddPane();
-int _XMWinQueAddSelection();
-int _XMWinQueFlush();
-XMPane *_XMGetPanePtr();
-XMSelect *_XMGetSelectionPtr();
-int _XMRecomputeGlobals();     /* No value actually returned. */
-int _XMRecomputePane();
-int _XMRecomputeSelection();
-int _XMTransToOrigin();                /* No value actually returned. */
-int _XMRefreshPane();          /* No value actually returned. */
-int _XMRefreshSelections();    /* No value actually returned. */
-int _XMHighlightSelection();   /* No value actually returned. */
+void _XMWinQueInit(void);
+int _XMWinQueAddPane(Display *display, XMenu *menu, XMPane *p_ptr);
+int _XMWinQueAddSelection(Display *display, XMenu *menu, XMSelect *s_ptr);
+int _XMWinQueFlush(Display *display, XMenu *menu, XMPane *pane, XMSelect *select);
+XMPane *_XMGetPanePtr(XMenu *menu, int p_num);
+XMSelect *_XMGetSelectionPtr(XMPane *p_ptr, int s_num);
+void _XMRecomputeGlobals(Display *display, XMenu *menu);
+int _XMRecomputePane(Display *display, XMenu *menu, XMPane *p_ptr, int p_num);
+int _XMRecomputeSelection(Display *display, XMenu *menu, XMSelect *s_ptr, int s_num);
+void _XMTransToOrigin(Display *display, XMenu *menu, XMPane *p_ptr, XMSelect *s_ptr, int x_pos, int y_pos, int *orig_x, int *orig_y);
+void _XMRefreshPane(Display *display, XMenu *menu, XMPane *pane);
+void _XMRefreshSelection(Display *display, XMenu *menu, XMSelect *select);
+void emacs_insque (void *elem, void *prev);
+void emacs_remque (void *elem);
+void XDeleteAssoc(Display *dpy, XAssocTable *table, XID x_id);
+void XDestroyAssocTable(XAssocTable *table);
+void XMakeAssoc(Display *dpy, XAssocTable *table, XID x_id, void *data);
+void XDeleteAssoc(Display *dpy, XAssocTable *table, XID x_id);
 
 #endif
 /* Don't add stuff after this #endif */
-
-/* arch-tag: 00640af1-9386-48b5-a4be-35620b8cd3aa
-   (do not change this comment) */