comparison src/menubar-gtk.c @ 5474:4dee0387b9de

Merged with trunk.
author Mats Lidell <matsl@xemacs.org>
date Tue, 29 Mar 2011 00:02:47 +0200
parents 308d34e9f07d 3889ef128488
children 68f8d295be49
comparison
equal deleted inserted replaced
5473:ac37a5f7e5be 5474:4dee0387b9de
1295 FRAME_GTK_MENUBAR_DATA (f) = Fcons (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer, Qt); 1295 FRAME_GTK_MENUBAR_DATA (f) = Fcons (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer, Qt);
1296 1296
1297 return (menubar_visible); 1297 return (menubar_visible);
1298 } 1298 }
1299 1299
1300 /* Called from gtk_create_widgets() to create the inital menubar of a frame 1300 /* Called from gtk_create_widgets() to create the initial menubar of a frame
1301 before it is mapped, so that the window is mapped with the menubar already 1301 before it is mapped, so that the window is mapped with the menubar already
1302 there instead of us tacking it on later and thrashing the window after it 1302 there instead of us tacking it on later and thrashing the window after it
1303 is visible. */ 1303 is visible. */
1304 int 1304 int
1305 gtk_initialize_frame_menubar (struct frame *f) 1305 gtk_initialize_frame_menubar (struct frame *f)