Commit 6a406a71be6fb5139f494f1a69cbd18db4ac6ce0
1 parent
4c7b1d07
Exists in
master
and in
5 other branches
Ajustes no parser para usar no gtk mais antigo
Showing
3 changed files
with
26 additions
and
0 deletions
Show diff stats
src/pw3270/uiparser/parsefile.c
| @@ -225,6 +225,16 @@ | @@ -225,6 +225,16 @@ | ||
| 225 | g_object_set_data(G_OBJECT(widget),"parent",info->element); | 225 | g_object_set_data(G_OBJECT(widget),"parent",info->element); |
| 226 | info->element = G_OBJECT(widget); | 226 | info->element = G_OBJECT(widget); |
| 227 | gtk_widget_set_visible(widget,ui_get_bool_attribute("visible",names,values,TRUE)); | 227 | gtk_widget_set_visible(widget,ui_get_bool_attribute("visible",names,values,TRUE)); |
| 228 | + | ||
| 229 | +#if GTK_CHECK_VERSION(2,18,0) | ||
| 230 | + gtk_widget_set_visible(widget,ui_get_bool_attribute("visible",names,values,TRUE)); | ||
| 231 | +#else | ||
| 232 | + if(ui_get_bool_attribute("visible",names,values,TRUE)) | ||
| 233 | + gtk_widget_show(widget); | ||
| 234 | + else | ||
| 235 | + gtk_widget_hide(widget); | ||
| 236 | +#endif // GTK(2,18,0) | ||
| 237 | + | ||
| 228 | } | 238 | } |
| 229 | else | 239 | else |
| 230 | { | 240 | { |
src/pw3270/uiparser/parser.c
| @@ -73,7 +73,15 @@ static void pack_view(gpointer key, GtkWidget *widget, GtkWidget *parent) | @@ -73,7 +73,15 @@ static void pack_view(gpointer key, GtkWidget *widget, GtkWidget *parent) | ||
| 73 | GtkWidget * menu = parent; | 73 | GtkWidget * menu = parent; |
| 74 | gboolean visible = get_boolean_from_config("view",gtk_action_get_name(GTK_ACTION(obj)),TRUE); | 74 | gboolean visible = get_boolean_from_config("view",gtk_action_get_name(GTK_ACTION(obj)),TRUE); |
| 75 | 75 | ||
| 76 | +#if GTK_CHECK_VERSION(2,18,0) | ||
| 76 | gtk_widget_set_visible(widget,visible); | 77 | gtk_widget_set_visible(widget,visible); |
| 78 | +#else | ||
| 79 | + if(visible) | ||
| 80 | + gtk_widget_show(widget); | ||
| 81 | + else | ||
| 82 | + gtk_widget_hide(widget); | ||
| 83 | +#endif // GTK(2,18,0) | ||
| 84 | + | ||
| 77 | gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(obj),visible); | 85 | gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(obj),visible); |
| 78 | 86 | ||
| 79 | if(GTK_IS_MENU_ITEM(menu)) | 87 | if(GTK_IS_MENU_ITEM(menu)) |
src/pw3270/uiparser/toolbar.c
| @@ -37,7 +37,15 @@ | @@ -37,7 +37,15 @@ | ||
| 37 | { | 37 | { |
| 38 | gboolean active = gtk_toggle_action_get_active(action); | 38 | gboolean active = gtk_toggle_action_get_active(action); |
| 39 | set_boolean_to_config("view",gtk_action_get_name(GTK_ACTION(action)),active); | 39 | set_boolean_to_config("view",gtk_action_get_name(GTK_ACTION(action)),active); |
| 40 | +#if GTK_CHECK_VERSION(2,18,0) | ||
| 40 | gtk_widget_set_visible(widget,active); | 41 | gtk_widget_set_visible(widget,active); |
| 42 | +#else | ||
| 43 | + if(active) | ||
| 44 | + gtk_widget_show(widget); | ||
| 45 | + else | ||
| 46 | + gtk_widget_hide(widget); | ||
| 47 | +#endif // GTK(2,18,0) | ||
| 48 | + | ||
| 41 | } | 49 | } |
| 42 | 50 | ||
| 43 | GObject * ui_create_toolbar(GtkAction *action,struct parser *info,const gchar **names, const gchar **values, GError **error) | 51 | GObject * ui_create_toolbar(GtkAction *action,struct parser *info,const gchar **names, const gchar **values, GError **error) |