Commit 648b777f1bf90d5c21b1ae862c610e3586916189
1 parent
51dd1c6b
Exists in
master
and in
5 other branches
Testando em macosx
Showing
2 changed files
with
9 additions
and
8 deletions
Show diff stats
src/pw3270/uiparser/parser.c
| @@ -233,12 +233,6 @@ void parser_build(struct parser *p, GtkWidget *widget) | @@ -233,12 +233,6 @@ void parser_build(struct parser *p, GtkWidget *widget) | ||
| 233 | 233 | ||
| 234 | #ifdef HAVE_GTKMAC | 234 | #ifdef HAVE_GTKMAC |
| 235 | { | 235 | { |
| 236 | - if(p->topmenu) | ||
| 237 | - { | ||
| 238 | - gtk_widget_set_visible(p->topmenu,FALSE); | ||
| 239 | - gtk_mac_menu_set_menu_bar(GTK_MENU_SHELL(p->topmenu)); | ||
| 240 | - } | ||
| 241 | - | ||
| 242 | if(p->sysmenu[SYSMENU_ITEM_QUIT]) | 236 | if(p->sysmenu[SYSMENU_ITEM_QUIT]) |
| 243 | { | 237 | { |
| 244 | gtk_mac_menu_set_quit_menu_item (GTK_MENU_ITEM(p->sysmenu[SYSMENU_ITEM_QUIT])); | 238 | gtk_mac_menu_set_quit_menu_item (GTK_MENU_ITEM(p->sysmenu[SYSMENU_ITEM_QUIT])); |
| @@ -252,10 +246,17 @@ void parser_build(struct parser *p, GtkWidget *widget) | @@ -252,10 +246,17 @@ void parser_build(struct parser *p, GtkWidget *widget) | ||
| 252 | 246 | ||
| 253 | if(p->sysmenu[SYSMENU_ITEM_PREFERENCES]) | 247 | if(p->sysmenu[SYSMENU_ITEM_PREFERENCES]) |
| 254 | { | 248 | { |
| 255 | - GtkMacMenuGroup *group = gtk_mac_menu_add_app_menu_group(); | 249 | + GtkMacMenuGroup *group = gtk_mac_menu_add_app_menu_group(); |
| 250 | + gtk_widget_show_all(p->sysmenu[SYSMENU_ITEM_PREFERENCES]); | ||
| 256 | gtk_mac_menu_add_app_menu_item(group,GTK_MENU_ITEM(p->sysmenu[SYSMENU_ITEM_PREFERENCES]),NULL); | 251 | gtk_mac_menu_add_app_menu_item(group,GTK_MENU_ITEM(p->sysmenu[SYSMENU_ITEM_PREFERENCES]),NULL); |
| 257 | } | 252 | } |
| 258 | 253 | ||
| 254 | + if(p->topmenu) | ||
| 255 | + { | ||
| 256 | + gtk_widget_set_visible(p->topmenu,FALSE); | ||
| 257 | + gtk_mac_menu_set_menu_bar(GTK_MENU_SHELL(p->topmenu)); | ||
| 258 | + } | ||
| 259 | + | ||
| 259 | } | 260 | } |
| 260 | #endif // HAVE_GTKMAC | 261 | #endif // HAVE_GTKMAC |
| 261 | 262 |
ui/00default.xml
| @@ -104,7 +104,7 @@ | @@ -104,7 +104,7 @@ | ||
| 104 | <menuitem action='disconnect' icon='disconnect' group='online' label='_Disconnect' /> | 104 | <menuitem action='disconnect' icon='disconnect' group='online' label='_Disconnect' /> |
| 105 | </menu> | 105 | </menu> |
| 106 | 106 | ||
| 107 | - <menu name='SettingsMenu' label='Settings' sysmenu='preferences' > | 107 | + <menu name='SettingsMenu' label='Settings'> |
| 108 | <menuitem action='editcolors' icon='select-color' label='Colors' /> | 108 | <menuitem action='editcolors' icon='select-color' label='Colors' /> |
| 109 | 109 | ||
| 110 | <!--- Special action - The fontselect menu will be populated with all available monospaced fonts ---> | 110 | <!--- Special action - The fontselect menu will be populated with all available monospaced fonts ---> |