diff options
| author | raveit65 <[email protected]> | 2016-05-30 12:22:36 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-05-30 17:33:02 +0200 |
| commit | 49821e9824babbd8719898db610a4fbf7a396b2e (patch) | |
| tree | d1d7b23e6da5bc0b2bbd9802ee3a7dcd6332d1cf /mate-dictionary/src | |
| parent | 2347a5e66d2b986932631e862ea3fc8b987d5b0b (diff) | |
| download | mate-utils-49821e9824babbd8719898db610a4fbf7a396b2e.tar.bz2 mate-utils-49821e9824babbd8719898db610a4fbf7a396b2e.tar.xz | |
GTK+3 mdict window: Do not use deprecate composite-child API
It's useless anyway.
https://bugzilla.gnome.org/show_bug.cgi?id=745022
taken from:
https://git.gnome.org/browse/gnome-dictionary/commit/?id=f353608
Diffstat (limited to 'mate-dictionary/src')
| -rw-r--r-- | mate-dictionary/src/gdict-source-dialog.c | 10 | ||||
| -rw-r--r-- | mate-dictionary/src/gdict-window.c | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/mate-dictionary/src/gdict-source-dialog.c b/mate-dictionary/src/gdict-source-dialog.c index 792677dd..223f54a1 100644 --- a/mate-dictionary/src/gdict-source-dialog.c +++ b/mate-dictionary/src/gdict-source-dialog.c @@ -581,8 +581,10 @@ gdict_source_dialog_constructor (GType type, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2); - + +#if !GTK_CHECK_VERSION(3,0,0) gtk_widget_push_composite_child (); +#endif /* get the UI from the GtkBuilder file */ dialog->builder = gtk_builder_new (); @@ -670,9 +672,11 @@ gdict_source_dialog_constructor (GType type, * based on the action */ update_dialog_ui (dialog); - + +#if !GTK_CHECK_VERSION(3,0,0) gtk_widget_pop_composite_child (); - +#endif + return object; } diff --git a/mate-dictionary/src/gdict-window.c b/mate-dictionary/src/gdict-window.c index 90356d46..cec563f6 100644 --- a/mate-dictionary/src/gdict-window.c +++ b/mate-dictionary/src/gdict-window.c @@ -1737,7 +1737,9 @@ gdict_window_constructor (GType type, /* recover the state */ gdict_window_load_state (window); +#if !GTK_CHECK_VERSION(3,0,0) gtk_widget_push_composite_child (); +#endif window->main_box = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), window->main_box); @@ -2011,7 +2013,9 @@ gdict_window_constructor (GType type, gtk_widget_grab_focus (window->entry); +#if !GTK_CHECK_VERSION(3,0,0) gtk_widget_pop_composite_child (); +#endif window->in_construction = FALSE; |