comparison src/console-gtk-impl.h @ 5128:7be849cb8828 ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Sun, 07 Mar 2010 02:09:59 -0600
parents a9c41067dd88 5502045ec510
children 308d34e9f07d
comparison
equal deleted inserted replaced
5127:a9c41067dd88 5128:7be849cb8828
157 GtkWidget *menubar_widget; 157 GtkWidget *menubar_widget;
158 158
159 /* The widget of the edit portion of this frame; this is a GtkDrawingArea, 159 /* The widget of the edit portion of this frame; this is a GtkDrawingArea,
160 and the window of this widget is what the redisplay code draws on. */ 160 and the window of this widget is what the redisplay code draws on. */
161 GtkWidget *edit_widget; 161 GtkWidget *edit_widget;
162 /* #### WARNING: this does not currently work. -- dvl
163 Position of the edit widget above, for absolute background placement.
164
165 int x, y;
166 */
162 167
163 /* Lists the widgets above the text area, in the proper order. */ 168 /* Lists the widgets above the text area, in the proper order. */
164 GtkWidget *top_widgets[MAX_CONCURRENT_TOP_WIDGETS]; 169 GtkWidget *top_widgets[MAX_CONCURRENT_TOP_WIDGETS];
165 int num_top_widgets; 170 int num_top_widgets;
166 171
211 #define GTK_FRAME_P(x) RECORDP (x, gtk_frame) 216 #define GTK_FRAME_P(x) RECORDP (x, gtk_frame)
212 #endif /* NEW_GC */ 217 #endif /* NEW_GC */
213 218
214 #define FRAME_GTK_DATA(f) FRAME_TYPE_DATA (f, gtk) 219 #define FRAME_GTK_DATA(f) FRAME_TYPE_DATA (f, gtk)
215 220
221 /* #### WARNING: this does not currently work. -- dvl
222 #define FRAME_GTK_X(f) (FRAME_GTK_DATA (f)->x)
223 #define FRAME_GTK_Y(f) (FRAME_GTK_DATA (f)->y)
224 */
216 #define FRAME_GTK_SHELL_WIDGET(f) (FRAME_GTK_DATA (f)->widget) 225 #define FRAME_GTK_SHELL_WIDGET(f) (FRAME_GTK_DATA (f)->widget)
217 #define FRAME_GTK_CONTAINER_WIDGET(f) (FRAME_GTK_DATA (f)->container) 226 #define FRAME_GTK_CONTAINER_WIDGET(f) (FRAME_GTK_DATA (f)->container)
218 #define FRAME_GTK_MENUBAR_WIDGET(f) (FRAME_GTK_DATA (f)->menubar_widget) 227 #define FRAME_GTK_MENUBAR_WIDGET(f) (FRAME_GTK_DATA (f)->menubar_widget)
219 #define FRAME_GTK_TEXT_WIDGET(f) (FRAME_GTK_DATA (f)->edit_widget) 228 #define FRAME_GTK_TEXT_WIDGET(f) (FRAME_GTK_DATA (f)->edit_widget)
220 #define FRAME_GTK_TOP_WIDGETS(f) (FRAME_GTK_DATA (f)->top_widgets) 229 #define FRAME_GTK_TOP_WIDGETS(f) (FRAME_GTK_DATA (f)->top_widgets)