aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsgui.h
diff options
context:
space:
mode:
authorDmitry Antipov2014-06-02 22:01:21 +0400
committerDmitry Antipov2014-06-02 22:01:21 +0400
commit5668fb88bf3731d39c4e958c8e79a549f789ce1e (patch)
treeb0d3fd3555fca3b34c47b803a633da2f36d31165 /src/nsgui.h
parentda11196a248b530c3b3a8329497d71332f8c71a3 (diff)
downloademacs-5668fb88bf3731d39c4e958c8e79a549f789ce1e.tar.gz
emacs-5668fb88bf3731d39c4e958c8e79a549f789ce1e.zip
Use common memory management functions for lwlib and refactor users.
* lwlib/lwlib.h (widget_value): Do not maintain a free list any more. (malloc_widget_value, free_widget_value): Remove prototypes. * lwlib/lwlib.c (malloc_widget_value, free_widget_value): (widget_value_free_list, malloc_cpt): Remove. (free_widget_value_tree, copy_widget_value_tree): Adjust users. * src/menu.h (xmalloc_widget_value): Replaced by ... (make_widget_value): ... new prototype. * src/menu.c (xmalloc_widget_value): Replaced by ... (make_widget_value): ... new function. (free_menubar_widget_value_tree, digest_single_submenu): Adjust users. * src/gtkutil.c (malloc_widget_value, free_widget_value): (widget_value_free_list, malloc_cpt): Remove old lwlib-compatible code. * src/keyboard.h (enum button_type, struct _widget_value): * src/gtkutil.h, src/nsgui.h, src/w32gui.h (malloc_widget_value): (free_widget_value): Likewise. * src/nsmenu.m (ns_update_menubar, ns_menu_show): * src/w32menu.c (set_frame_menubar, w32_menu_show, w32_dialog_show): * src/xmenu.c (set_frame_menubar, xmenu_show, x_dialog_show): Adjust users. * src/xterm.h (XtParent) [USE_GTK]: Remove unused macro.
Diffstat (limited to 'src/nsgui.h')
-rw-r--r--src/nsgui.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/nsgui.h b/src/nsgui.h
index 5935531fa48..0e1e9bb73e9 100644
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -48,11 +48,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
48#undef _GL_VERIFY_H 48#undef _GL_VERIFY_H
49#include <verify.h> 49#include <verify.h>
50 50
51/* menu-related */
52#define free_widget_value(wv) xfree (wv)
53#define malloc_widget_value() ((widget_value *) memset (xmalloc \
54 (sizeof (widget_value)), 0, sizeof (widget_value)))
55
56/* Emulate XCharStruct. */ 51/* Emulate XCharStruct. */
57typedef struct _XCharStruct 52typedef struct _XCharStruct
58{ 53{