HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/*.h: Remove unused parameters and functions.
[bpt/emacs.git]
/
src
/
xmenu.c
diff --git
a/src/xmenu.c
b/src/xmenu.c
index
c79db08
..
8ecef00
100644
(file)
--- a/
src/xmenu.c
+++ b/
src/xmenu.c
@@
-124,11
+124,11
@@
static int update_frame_menubar (struct frame *);
Xt on behalf of one of the widget sets. */
static int popup_activated_flag;
Xt on behalf of one of the widget sets. */
static int popup_activated_flag;
-static int next_menubar_widget_id;
-
\f
#ifdef USE_X_TOOLKIT
\f
#ifdef USE_X_TOOLKIT
+static int next_menubar_widget_id;
+
/* Return the frame whose ->output_data.x->id equals ID, or 0 if none. */
static struct frame *
/* Return the frame whose ->output_data.x->id equals ID, or 0 if none. */
static struct frame *
@@
-383,7
+383,7
@@
x_menu_wait_for_event (void *data)
#endif
)
{
#endif
)
{
- EMACS_TIME next_time = timer_check (
1
), *ntp;
+ EMACS_TIME next_time = timer_check (), *ntp;
long secs = EMACS_SECS (next_time);
long usecs = EMACS_USECS (next_time);
SELECT_TYPE read_fds;
long secs = EMACS_SECS (next_time);
long usecs = EMACS_USECS (next_time);
SELECT_TYPE read_fds;
@@
-712,7
+712,7
@@
show_help_event (FRAME_PTR f, xt_or_gtk_widget widget, Lisp_Object help)
break;
}
#endif
break;
}
#endif
- show_help_echo (help, Qnil, Qnil, Qnil
, 1
);
+ show_help_echo (help, Qnil, Qnil, Qnil);
}
}
}
}
@@
-922,7
+922,7
@@
set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
#endif
Lisp_Object items;
widget_value *wv, *first_wv, *prev_wv = 0;
#endif
Lisp_Object items;
widget_value *wv, *first_wv, *prev_wv = 0;
-
int
i, last_i = 0;
+
EMACS_UINT
i, last_i = 0;
int *submenu_start, *submenu_end;
int *submenu_top_level_items, *submenu_n_panes;
int *submenu_start, *submenu_end;
int *submenu_top_level_items, *submenu_n_panes;
@@
-1388,7
+1388,7
@@
menu_position_func (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer
/* Check if there is room for the menu. If not, adjust x/y so that
the menu is fully visible. */
/* Check if there is room for the menu. If not, adjust x/y so that
the menu is fully visible. */
- gtk_widget_
size_request (GTK_WIDGET (menu)
, &req);
+ gtk_widget_
get_preferred_size (GTK_WIDGET (menu), NULL
, &req);
if (data->x + req.width > disp_width)
*x -= data->x + req.width - disp_width;
if (data->y + req.height > disp_height)
if (data->x + req.width > disp_width)
*x -= data->x + req.width - disp_width;
if (data->y + req.height > disp_height)
@@
-1598,7
+1598,7
@@
create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv,
Lisp_Object
xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
Lisp_Object
xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
- Lisp_Object title, const char **error, EMACS_UINT timestamp)
+ Lisp_Object title, const char **error
_name
, EMACS_UINT timestamp)
{
int i;
widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;
{
int i;
widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;
@@
-1613,11
+1613,11
@@
xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
if (! FRAME_X_P (f))
abort ();
if (! FRAME_X_P (f))
abort ();
- *error = NULL;
+ *error
_name
= NULL;
if (menu_items_used <= MENU_ITEMS_PANE_LENGTH)
{
if (menu_items_used <= MENU_ITEMS_PANE_LENGTH)
{
- *error = "Empty menu";
+ *error
_name
= "Empty menu";
return Qnil;
}
return Qnil;
}
@@
-1662,7
+1662,7
@@
xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
{
/* Create a new pane. */
Lisp_Object pane_name, prefix;
{
/* Create a new pane. */
Lisp_Object pane_name, prefix;
- char *pane_string;
+ c
onst c
har *pane_string;
pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);
prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);
prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
@@
-2010,7
+2010,7
@@
xdialog_show (FRAME_PTR f,
representing the text label and buttons. */
{
Lisp_Object pane_name, prefix;
representing the text label and buttons. */
{
Lisp_Object pane_name, prefix;
- char *pane_string;
+ c
onst c
har *pane_string;
pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME];
prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX];
pane_string = (NILP (pane_name)
pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME];
prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX];
pane_string = (NILP (pane_name)
@@
-2201,7
+2201,7
@@
menu_help_callback (char *help_string, int pane, int item)
Fcons (pane_name,
Fcons (make_number (pane), Qnil)));
show_help_echo (help_string ? build_string (help_string) : Qnil,
Fcons (pane_name,
Fcons (make_number (pane), Qnil)));
show_help_echo (help_string ? build_string (help_string) : Qnil,
- Qnil, menu_object, make_number (item)
, 1
);
+ Qnil, menu_object, make_number (item));
}
static Lisp_Object
}
static Lisp_Object
@@
-2305,7
+2305,7
@@
xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
{
/* Create a new pane. */
Lisp_Object pane_name, prefix;
{
/* Create a new pane. */
Lisp_Object pane_name, prefix;
- char *pane_string;
+ c
onst c
har *pane_string;
maxlines = max (maxlines, lines);
lines = 0;
maxlines = max (maxlines, lines);
lines = 0;