AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

See merge request GNOME/gtk!2160
This commit is contained in:
Matthias Clasen 2020-06-27 22:19:27 +00:00
commit ace4eac25a
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docs/reference/gtk/migrating-3to4.md
View File

@ -457,6 +457,11 @@ as property. GtkNotebook and GtkAssistant are similar.
gtk4-builder-tool can help with this conversion, with the --3to4 option gtk4-builder-tool can help with this conversion, with the --3to4 option
of the simplify command. of the simplify command.
### Adapt to GtkScrolledWindow API changes
The constructor for GtkScrolledWindow no longer takes the adjustments
as arguments - these were almost always %NULL.
### Adapt to GtkBin removal ### Adapt to GtkBin removal
The abstract base class GtkBin for single-child containers has been The abstract base class GtkBin for single-child containers has been
@ -940,3 +945,18 @@ You can replace calls to <function>gtk_dialog_run()</function>
by specifying that the #GtkDialog must be modal using by specifying that the #GtkDialog must be modal using
gtk_window_set_modal() or the %GTK_DIALOG_MODAL flag, and gtk_window_set_modal() or the %GTK_DIALOG_MODAL flag, and
connecting to the #GtkDialog::response signal. connecting to the #GtkDialog::response signal.
## Changes to consider after the switch
GTK 4 has a number of new features that you may want to take
advantage of once the dust has settled over the initial migration.
### Consider porting to the new list widgets
In GTK 2 and 3, GtkTreeModel and GtkCellRenderer and widgets using
these were the primary way of displaying data and lists. GTK 4 brings
a new family of widgets for this purpose that uses list models instead
of tree models, and widgets instead of cell renderers.
To learn more about the new list widgets, you can read the [List Widget
Overview](#ListWidget).

4
gtk/gtkbuilder.c
View File

@ -108,7 +108,7 @@
* as %TRUE, strings like “FALSE”, “f”, “no”, “n”, “0” are interpreted * as %TRUE, strings like “FALSE”, “f”, “no”, “n”, “0” are interpreted
* as %FALSE), enumerations (can be specified by their name, nick or * as %FALSE), enumerations (can be specified by their name, nick or
* integer value), flags (can be specified by their name, nick, integer * integer value), flags (can be specified by their name, nick, integer
* value, optionally combined with “|”, e.g. “GTK_VISIBLE|GTK_REALIZED”) * value, optionally combined with “|”, e.g. “GTK_INPUT_HINT_EMOJI|GTK_INPUT_HINT_LOWERCASE”)
* and colors (in a format understood by gdk_rgba_parse()). * and colors (in a format understood by gdk_rgba_parse()).
* *
* GVariants can be specified in the format understood by g_variant_parse(), * GVariants can be specified in the format understood by g_variant_parse(),
@ -131,7 +131,7 @@
* For more information see g_object_bind_property() * For more information see g_object_bind_property()
* *
* Sometimes it is necessary to refer to widgets which have implicitly * Sometimes it is necessary to refer to widgets which have implicitly
* been constructed by GTK+ as part of a composite widget, to set * been constructed by GTK as part of a composite widget, to set
* properties on them or to add further children (e.g. the content area * properties on them or to add further children (e.g. the content area
* of a #GtkDialog). This can be achieved by setting the “internal-child” * of a #GtkDialog). This can be achieved by setting the “internal-child”
* property of the `<child>` element to a true value. Note that #GtkBuilder * property of the `<child>` element to a true value. Note that #GtkBuilder