diff options
| author | Po Lu | 2022-05-23 13:30:33 +0800 |
|---|---|---|
| committer | Po Lu | 2022-05-23 13:30:33 +0800 |
| commit | b629cb3f547b5acd6d4ee3574d31b3530f93ff1f (patch) | |
| tree | 4e79b0c67a52d3da1f6f8c4607495c39c62e5a0f /src/pgtkmenu.c | |
| parent | 5346b67fc27f50abeec3c4f72252a8d9a36f2e6b (diff) | |
| download | emacs-b629cb3f547b5acd6d4ee3574d31b3530f93ff1f.tar.gz emacs-b629cb3f547b5acd6d4ee3574d31b3530f93ff1f.zip | |
Minor fixes to PGTK child frames
* src/gtkutil.c (xg_check_special_colors): Handle child frames
correctly.
* src/pgtkfns.c (pgtk_set_child_frame_border_width): Synchronize
code from X. (bug#55588)
* src/pgtkmenu.c (pgtk_menu_show, pgtk_dialog_show): Allow in
child frames. There are no problems here.
* src/pgtkterm.c (pgtk_mouse_position): Clean up coding style.
Diffstat (limited to 'src/pgtkmenu.c')
| -rw-r--r-- | src/pgtkmenu.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/pgtkmenu.c b/src/pgtkmenu.c index eec9f419d07..2eabf6ac1bc 100644 --- a/src/pgtkmenu.c +++ b/src/pgtkmenu.c | |||
| @@ -610,11 +610,6 @@ pgtk_menu_show (struct frame *f, int x, int y, int menuflags, | |||
| 610 | 610 | ||
| 611 | *error_name = NULL; | 611 | *error_name = NULL; |
| 612 | 612 | ||
| 613 | if (!FRAME_GTK_OUTER_WIDGET (f)) { | ||
| 614 | *error_name = "Can't popup from child frames."; | ||
| 615 | return Qnil; | ||
| 616 | } | ||
| 617 | |||
| 618 | if (menu_items_used <= MENU_ITEMS_PANE_LENGTH) | 613 | if (menu_items_used <= MENU_ITEMS_PANE_LENGTH) |
| 619 | { | 614 | { |
| 620 | *error_name = "Empty menu"; | 615 | *error_name = "Empty menu"; |
| @@ -919,11 +914,6 @@ pgtk_dialog_show (struct frame *f, Lisp_Object title, | |||
| 919 | 914 | ||
| 920 | *error_name = NULL; | 915 | *error_name = NULL; |
| 921 | 916 | ||
| 922 | if (!FRAME_GTK_OUTER_WIDGET (f)) { | ||
| 923 | *error_name = "Can't popup from child frames."; | ||
| 924 | return Qnil; | ||
| 925 | } | ||
| 926 | |||
| 927 | if (menu_items_n_panes > 1) | 917 | if (menu_items_n_panes > 1) |
| 928 | { | 918 | { |
| 929 | *error_name = "Multiple panes in dialog box"; | 919 | *error_name = "Multiple panes in dialog box"; |