Mercurial > hg > xemacs-beta
comparison src/menubar-gtk.c @ 1416:b0c1d9dc4b08
[xemacs-hg @ 2003-04-15 17:21:34 by stephent]
pedantic style <87el43bruu.fsf@tleepslib.sk.tsukuba.ac.jp>
author | stephent |
---|---|
date | Tue, 15 Apr 2003 17:21:36 +0000 |
parents | 01c57eb70ae9 |
children | 91d4c8c65a0f |
comparison
equal
deleted
inserted
replaced
1415:d47e87058e8f | 1416:b0c1d9dc4b08 |
---|---|
113 return xemacs_menubar_type; | 113 return xemacs_menubar_type; |
114 } | 114 } |
115 | 115 |
116 static GtkWidgetClass *parent_class; | 116 static GtkWidgetClass *parent_class; |
117 | 117 |
118 static void gtk_xemacs_menubar_class_init (GtkXEmacsMenubarClass *klass) | 118 static void |
119 gtk_xemacs_menubar_class_init (GtkXEmacsMenubarClass *klass) | |
119 { | 120 { |
120 GtkWidgetClass *widget_class; | 121 GtkWidgetClass *widget_class; |
121 | 122 |
122 widget_class = (GtkWidgetClass*) klass; | 123 widget_class = (GtkWidgetClass*) klass; |
123 parent_class = (GtkWidgetClass *) gtk_type_class (gtk_menu_bar_get_type ()); | 124 parent_class = (GtkWidgetClass *) gtk_type_class (gtk_menu_bar_get_type ()); |
124 | 125 |
125 widget_class->size_request = gtk_xemacs_menubar_size_request; | 126 widget_class->size_request = gtk_xemacs_menubar_size_request; |
126 } | 127 } |
127 | 128 |
128 static void gtk_xemacs_menubar_init (GtkXEmacsMenubar *xemacs) | 129 static void |
129 { | 130 gtk_xemacs_menubar_init (GtkXEmacsMenubar *xemacs) |
130 } | 131 { |
131 | 132 } |
132 static void gtk_xemacs_menubar_size_request (GtkWidget *widget, GtkRequisition *requisition) | 133 |
134 static void | |
135 gtk_xemacs_menubar_size_request (GtkWidget *widget, GtkRequisition *requisition) | |
133 { | 136 { |
134 GtkXEmacsMenubar *x = GTK_XEMACS_MENUBAR (widget); | 137 GtkXEmacsMenubar *x = GTK_XEMACS_MENUBAR (widget); |
135 GtkRequisition frame_size; | 138 GtkRequisition frame_size; |
136 | 139 |
137 parent_class->size_request (widget, requisition); | 140 parent_class->size_request (widget, requisition); |
577 | 580 |
578 /* Convert a single menu item descriptor to a suitable GtkMenuItem */ | 581 /* Convert a single menu item descriptor to a suitable GtkMenuItem */ |
579 /* This function cannot GC. | 582 /* This function cannot GC. |
580 It is only called from menu_item_descriptor_to_widget_value, which | 583 It is only called from menu_item_descriptor_to_widget_value, which |
581 prohibits GC. */ | 584 prohibits GC. */ |
582 static GtkWidget *menu_descriptor_to_widget_1 (Lisp_Object descr) | 585 static GtkWidget * |
586 menu_descriptor_to_widget_1 (Lisp_Object descr) | |
583 { | 587 { |
584 if (STRINGP (descr)) | 588 if (STRINGP (descr)) |
585 { | 589 { |
586 /* It is a separator. Unfortunately GTK does not allow us to | 590 /* It is a separator. Unfortunately GTK does not allow us to |
587 specify what our separators look like, so we can't do all the | 591 specify what our separators look like, so we can't do all the |
878 return (NULL); | 882 return (NULL); |
879 /* abort (); ???? */ | 883 /* abort (); ???? */ |
880 } | 884 } |
881 } | 885 } |
882 | 886 |
883 static GtkWidget *menu_descriptor_to_widget (Lisp_Object descr) | 887 static GtkWidget * |
888 menu_descriptor_to_widget (Lisp_Object descr) | |
884 { | 889 { |
885 GtkWidget *rval = NULL; | 890 GtkWidget *rval = NULL; |
886 int count = begin_gc_forbidden (); | 891 int count = begin_gc_forbidden (); |
887 | 892 |
888 /* Cannot GC from here on out... */ | 893 /* Cannot GC from here on out... */ |
1218 { | 1223 { |
1219 gtk_widget_destroy (menubar_widget); | 1224 gtk_widget_destroy (menubar_widget); |
1220 } | 1225 } |
1221 } | 1226 } |
1222 | 1227 |
1223 static void popdown_menu_cb (GtkMenuShell *menu, gpointer user_data) | 1228 static void |
1229 popdown_menu_cb (GtkMenuShell *menu, gpointer user_data) | |
1224 { | 1230 { |
1225 popup_up_p--; | 1231 popup_up_p--; |
1226 } | 1232 } |
1227 | 1233 |
1228 static void | 1234 static void |
1302 CONSOLE_HAS_METHOD (gtk, update_frame_menubars); | 1308 CONSOLE_HAS_METHOD (gtk, update_frame_menubars); |
1303 CONSOLE_HAS_METHOD (gtk, free_frame_menubars); | 1309 CONSOLE_HAS_METHOD (gtk, free_frame_menubars); |
1304 CONSOLE_HAS_METHOD (gtk, popup_menu); | 1310 CONSOLE_HAS_METHOD (gtk, popup_menu); |
1305 } | 1311 } |
1306 | 1312 |
1307 void reinit_vars_of_menubar_gtk (void) | 1313 void |
1314 reinit_vars_of_menubar_gtk (void) | |
1308 { | 1315 { |
1309 dockable_menubar = 1; | 1316 dockable_menubar = 1; |
1310 #ifdef TEAR_OFF_MENUS | 1317 #ifdef TEAR_OFF_MENUS |
1311 tear_off_menus = 1; | 1318 tear_off_menus = 1; |
1312 #endif | 1319 #endif |