HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop FRAME_PTR typedef.
[bpt/emacs.git]
/
src
/
xmenu.c
diff --git
a/src/xmenu.c
b/src/xmenu.c
index
66365a7
..
cad8924
100644
(file)
--- a/
src/xmenu.c
+++ b/
src/xmenu.c
@@
-111,7
+111,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
static Lisp_Object Qdebug_on_next_call;
#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
static Lisp_Object Qdebug_on_next_call;
#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
-static Lisp_Object xdialog_show (
FRAME_PTR
, bool, Lisp_Object, Lisp_Object,
+static Lisp_Object xdialog_show (
struct frame *
, bool, Lisp_Object, Lisp_Object,
const char **);
#endif
\f
const char **);
#endif
\f
@@
-130,7
+130,7
@@
static struct frame *
menubar_id_to_frame (LWLIB_ID id)
{
Lisp_Object tail, frame;
menubar_id_to_frame (LWLIB_ID id)
{
Lisp_Object tail, frame;
-
FRAME_PTR
f;
+
struct frame *
f;
FOR_EACH_FRAME (tail, frame)
{
FOR_EACH_FRAME (tail, frame)
{
@@
-154,7
+154,7
@@
menubar_id_to_frame (LWLIB_ID id)
the scroll bar or the edit window. Fx_popup_menu needs to be
sure it is the edit window. */
void
the scroll bar or the edit window. Fx_popup_menu needs to be
sure it is the edit window. */
void
-mouse_position_for_popup (
FRAME_PTR
f, int *x, int *y)
+mouse_position_for_popup (
struct frame *
f, int *x, int *y)
{
Window root, dummy_window;
int dummy;
{
Window root, dummy_window;
int dummy;
@@
-219,7
+219,7
@@
for instance using the window manager, then this produces a quit and
`x-popup-dialog' does not return. */)
(Lisp_Object position, Lisp_Object contents, Lisp_Object header)
{
`x-popup-dialog' does not return. */)
(Lisp_Object position, Lisp_Object contents, Lisp_Object header)
{
-
FRAME_PTR
f = NULL;
+
struct frame *
f = NULL;
Lisp_Object window;
/* Decode the first argument: find the window or frame to use. */
Lisp_Object window;
/* Decode the first argument: find the window or frame to use. */
@@
-229,7
+229,7
@@
for instance using the window manager, then this produces a quit and
{
#if 0 /* Using the frame the mouse is on may not be right. */
/* Use the mouse's current position. */
{
#if 0 /* Using the frame the mouse is on may not be right. */
/* Use the mouse's current position. */
-
FRAME_PTR
new_f = SELECTED_FRAME ();
+
struct frame *
new_f = SELECTED_FRAME ();
Lisp_Object bar_window;
enum scroll_bar_part part;
Time time;
Lisp_Object bar_window;
enum scroll_bar_part part;
Time time;
@@
-481,7
+481,7
@@
If FRAME is nil or not given, use the selected frame. */)
(Lisp_Object frame)
{
XEvent ev;
(Lisp_Object frame)
{
XEvent ev;
-
FRAME_PTR
f = decode_window_system_frame (frame);
+
struct frame *
f = decode_window_system_frame (frame);
Widget menubar;
block_input ();
Widget menubar;
block_input ();
@@
-559,10
+559,7
@@
If FRAME is nil or not given, use the selected frame. */)
(Lisp_Object frame)
{
GtkWidget *menubar;
(Lisp_Object frame)
{
GtkWidget *menubar;
- FRAME_PTR f;
-
- /* gcc 2.95 doesn't accept the FRAME_PTR declaration after
- block_input (). */
+ struct frame *f;
block_input ();
f = decode_window_system_frame (frame);
block_input ();
f = decode_window_system_frame (frame);
@@
-620,7
+617,7
@@
popup_widget_loop (int do_timers, GtkWidget *widget)
execute Lisp code. */
void
execute Lisp code. */
void
-x_activate_menubar (
FRAME_PTR
f)
+x_activate_menubar (
struct frame *
f)
{
eassert (FRAME_X_P (f));
{
eassert (FRAME_X_P (f));
@@
-682,7
+679,7
@@
popup_deactivate_callback (
for that widget.
F is the frame if known, or NULL if not known. */
static void
for that widget.
F is the frame if known, or NULL if not known. */
static void
-show_help_event (
FRAME_PTR
f, xt_or_gtk_widget widget, Lisp_Object help)
+show_help_event (
struct frame *
f, xt_or_gtk_widget widget, Lisp_Object help)
{
Lisp_Object frame;
{
Lisp_Object frame;
@@
-815,7
+812,7
@@
menubar_selection_callback (GtkWidget *widget, gpointer client_data)
static void
menubar_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
{
static void
menubar_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
{
-
FRAME_PTR
f;
+
struct frame *
f;
f = menubar_id_to_frame (id);
if (!f)
f = menubar_id_to_frame (id);
if (!f)
@@
-829,7
+826,7
@@
menubar_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
changed. */
static void
changed. */
static void
-update_frame_menubar (
FRAME_PTR
f)
+update_frame_menubar (
struct frame *
f)
{
#ifdef USE_GTK
xg_update_frame_menubar (f);
{
#ifdef USE_GTK
xg_update_frame_menubar (f);
@@
-911,7
+908,7
@@
apply_systemfont_to_menu (struct frame *f, Widget w)
it is set the first time this is called, from initialize_frame_menubar. */
void
it is set the first time this is called, from initialize_frame_menubar. */
void
-set_frame_menubar (
FRAME_PTR
f, bool first_time, bool deep_p)
+set_frame_menubar (
struct frame *
f, bool first_time, bool deep_p)
{
xt_or_gtk_widget menubar_widget;
#ifdef USE_X_TOOLKIT
{
xt_or_gtk_widget menubar_widget;
#ifdef USE_X_TOOLKIT
@@
-1263,7
+1260,7
@@
set_frame_menubar (FRAME_PTR f, bool first_time, bool deep_p)
is visible. */
void
is visible. */
void
-initialize_frame_menubar (
FRAME_PTR
f)
+initialize_frame_menubar (
struct frame *
f)
{
/* This function is called before the first chance to redisplay
the frame. It has to be, so the frame will have the right size. */
{
/* This function is called before the first chance to redisplay
the frame. It has to be, so the frame will have the right size. */
@@
-1278,7
+1275,7
@@
initialize_frame_menubar (FRAME_PTR f)
#ifndef USE_GTK
void
#ifndef USE_GTK
void
-free_frame_menubar (
FRAME_PTR
f)
+free_frame_menubar (
struct frame *
f)
{
Widget menubar_widget;
{
Widget menubar_widget;
@@
-1355,7
+1352,7
@@
static Lisp_Object *volatile menu_item_selection;
create_and_show_popup_menu below. */
struct next_popup_x_y
{
create_and_show_popup_menu below. */
struct next_popup_x_y
{
-
FRAME_PTR
f;
+
struct frame *
f;
int x;
int y;
};
int x;
int y;
};
@@
-1413,7
+1410,7
@@
pop_down_menu (void *arg)
menu pops down.
menu_item_selection will be set to the selection. */
static void
menu pops down.
menu_item_selection will be set to the selection. */
static void
-create_and_show_popup_menu (
FRAME_PTR
f, widget_value *first_wv, int x, int y,
+create_and_show_popup_menu (
struct frame *
f, widget_value *first_wv, int x, int y,
bool for_click, Time timestamp)
{
int i;
bool for_click, Time timestamp)
{
int i;
@@
-1522,7
+1519,7
@@
pop_down_menu (Lisp_Object arg)
menu pops down.
menu_item_selection will be set to the selection. */
static void
menu pops down.
menu_item_selection will be set to the selection. */
static void
-create_and_show_popup_menu (
FRAME_PTR
f, widget_value *first_wv,
+create_and_show_popup_menu (
struct frame *
f, widget_value *first_wv,
int x, int y, bool for_click, Time timestamp)
{
int i;
int x, int y, bool for_click, Time timestamp)
{
int i;
@@
-1601,7
+1598,7
@@
cleanup_widget_value_tree (void *arg)
}
Lisp_Object
}
Lisp_Object
-xmenu_show (
FRAME_PTR
f, int x, int y, bool for_click, bool keymaps,
+xmenu_show (
struct frame *
f, int x, int y, bool for_click, bool keymaps,
Lisp_Object title, const char **error_name, Time timestamp)
{
int i;
Lisp_Object title, const char **error_name, Time timestamp)
{
int i;
@@
-1894,7
+1891,7
@@
dialog_selection_callback (GtkWidget *widget, gpointer client_data)
dialog pops down.
menu_item_selection will be set to the selection. */
static void
dialog pops down.
menu_item_selection will be set to the selection. */
static void
-create_and_show_dialog (
FRAME_PTR
f, widget_value *first_wv)
+create_and_show_dialog (
struct frame *
f, widget_value *first_wv)
{
GtkWidget *menu;
{
GtkWidget *menu;
@@
-1940,7
+1937,7
@@
dialog_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
dialog pops down.
menu_item_selection will be set to the selection. */
static void
dialog pops down.
menu_item_selection will be set to the selection. */
static void
-create_and_show_dialog (
FRAME_PTR
f, widget_value *first_wv)
+create_and_show_dialog (
struct frame *
f, widget_value *first_wv)
{
LWLIB_ID dialog_id;
{
LWLIB_ID dialog_id;
@@
-1984,7
+1981,7
@@
static const char * button_names [] = {
"button6", "button7", "button8", "button9", "button10" };
static Lisp_Object
"button6", "button7", "button8", "button9", "button10" };
static Lisp_Object
-xdialog_show (
FRAME_PTR
f,
+xdialog_show (
struct frame *
f,
bool keymaps,
Lisp_Object title,
Lisp_Object header,
bool keymaps,
Lisp_Object title,
Lisp_Object header,
@@
-2214,7
+2211,7
@@
menu_help_callback (char const *help_string, int pane, int item)
static void
pop_down_menu (Lisp_Object arg)
{
static void
pop_down_menu (Lisp_Object arg)
{
-
FRAME_PTR
f = XSAVE_POINTER (arg, 0);
+
struct frame *
f = XSAVE_POINTER (arg, 0);
XMenu *menu = XSAVE_POINTER (arg, 1);
block_input ();
XMenu *menu = XSAVE_POINTER (arg, 1);
block_input ();
@@
-2242,7
+2239,7
@@
pop_down_menu (Lisp_Object arg)
Lisp_Object
Lisp_Object
-xmenu_show (
FRAME_PTR
f, int x, int y, bool for_click, bool keymaps,
+xmenu_show (
struct frame *
f, int x, int y, bool for_click, bool keymaps,
Lisp_Object title, const char **error_name, Time timestamp)
{
Window root;
Lisp_Object title, const char **error_name, Time timestamp)
{
Window root;