Mercurial > hg > xemacs-beta
comparison src/toolbar-x.c @ 5125:b5df3737028a ben-lisp-object
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 24 Feb 2010 01:58:04 -0600 |
parents | fce43cb76a1c |
children | 8b2f75cecb89 |
comparison
equal
deleted
inserted
replaced
5124:623d57b7fbe8 | 5125:b5df3737028a |
---|---|
31 #include "faces.h" | 31 #include "faces.h" |
32 #include "frame-impl.h" | 32 #include "frame-impl.h" |
33 #include "toolbar.h" | 33 #include "toolbar.h" |
34 #include "window.h" | 34 #include "window.h" |
35 | 35 |
36 #include "toolbar-common.h" | 36 #include "toolbar-xlike.h" |
37 | 37 |
38 #include "console-x-impl.h" | 38 #include "console-x-impl.h" |
39 #include "glyphs-x.h" | 39 #include "glyphs-x.h" |
40 #include "objects-x.h" | 40 #include "objects-x.h" |
41 | 41 |
42 #include "EmacsFrame.h" | 42 #include "EmacsFrame.h" |
43 #include "EmacsFrameP.h" | 43 #include "EmacsFrameP.h" |
44 | 44 |
45 /* We should really create a 'common' console type and fill it with | 45 /* We should really create a 'xlike' console type and fill it with |
46 ** all the shared code. We would then just use | 46 ** all the shared code. We would then just use |
47 ** CONSOLE_INHERITS_METHOD(x,common,blah) | 47 ** CONSOLE_INHERITS_METHOD(x,xlike,blah) |
48 */ | 48 */ |
49 #define x_output_frame_toolbars common_output_frame_toolbars | 49 #define x_output_frame_toolbars xlike_output_frame_toolbars |
50 #define x_output_toolbar_button common_output_toolbar_button | 50 #define x_output_toolbar_button xlike_output_toolbar_button |
51 #define x_redraw_exposed_toolbars common_redraw_exposed_toolbars | 51 #define x_redraw_exposed_toolbars xlike_redraw_exposed_toolbars |
52 #define x_redraw_frame_toolbars common_redraw_frame_toolbars | 52 #define x_redraw_frame_toolbars xlike_redraw_frame_toolbars |
53 #define x_clear_frame_toolbars common_clear_frame_toolbars | 53 #define x_clear_frame_toolbars xlike_clear_frame_toolbars |
54 | 54 |
55 static void | 55 static void |
56 x_initialize_frame_toolbars (struct frame *f) | 56 x_initialize_frame_toolbars (struct frame *f) |
57 { | 57 { |
58 EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); | 58 EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); |