AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-17 23:50:16 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
doc: Syntax fixes

See merge request GNOME/gtk!3583
This commit is contained in:
Matthias Clasen 2021-05-25 11:57:48 +00:00
commit c3c16bd2be
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,7 +279,7 @@ holds a reference on them, and GTK holds a reference on toplevel windows.
and cause the whole widget hierarchy to be finalized unless there are other and cause the whole widget hierarchy to be finalized unless there are other
references that keep widgets alive. references that keep widgets alive.
The [signals@Gtk.Widget::destroy] signal is emitted when a widget is The [signal@Gtk.Widget::destroy] signal is emitted when a widget is
disposed, and therefore can no longer be used to break reference cycles. disposed, and therefore can no longer be used to break reference cycles.
A typical sign of a reference cycle involving a toplevel window is when A typical sign of a reference cycle involving a toplevel window is when
closing the window does not make the application quit. closing the window does not make the application quit.
@ -571,7 +571,7 @@ for you, so templates work like before.
A few changes to the event controller and [class@Gtk.Gesture] APIs A few changes to the event controller and [class@Gtk.Gesture] APIs
did not make it back to GTK 3, and have to be taken into account did not make it back to GTK 3, and have to be taken into account
when moving to GTK 4. One is that the [signal@Gtk.EventControllerMotion::enter] when moving to GTK 4. One is that the [signal@Gtk.EventControllerMotion::enter]
and [signals@Gtk.EventControllerMotion::leave] signals have gained new arguments. and [signal@Gtk.EventControllerMotion::leave] signals have gained new arguments.
Another is that `GtkGestureMultiPress` has been renamed to [class@Gtk.GestureClick], Another is that `GtkGestureMultiPress` has been renamed to [class@Gtk.GestureClick],
and has lost its area property. A [class@Gtk.EventControllerFocus] has been and has lost its area property. A [class@Gtk.EventControllerFocus] has been
split off from [class@Gtk.EventControllerKey]. split off from [class@Gtk.EventControllerKey].

2
docs/reference/gtk/question_index.md
View File

@ -544,7 +544,7 @@ the question you have, this list is a good place to start.
No. Most drawing in GTK is not done via cairo anymore (but instead No. Most drawing in GTK is not done via cairo anymore (but instead
by the GL or Vulkan renderers of GSK). by the GL or Vulkan renderers of GSK).
If you use cairo for drawing your own widgets, [mehtod@Gtk.Snapshot.append_cairo] If you use cairo for drawing your own widgets, [method@Gtk.Snapshot.append_cairo]
will choose the most appropriate surface type for you. will choose the most appropriate surface type for you.
If you are interested in using GL for your own drawing, see [class@Gtk.GLArea]. If you are interested in using GL for your own drawing, see [class@Gtk.GLArea].

2
gdk/gdkclipboard.c
View File

@ -905,7 +905,7 @@ gdk_clipboard_read_value_finish (GdkClipboard *clipboard,
* call [method@Gdk.Clipboard.read_texture_finish] to get the result. * call [method@Gdk.Clipboard.read_texture_finish] to get the result.
* *
* This is a simple wrapper around [method@Gdk.Clipboard.read_value_async]. * This is a simple wrapper around [method@Gdk.Clipboard.read_value_async].
* Use that function or [methos@Gdk.Clipboard.read_async] directly if you * Use that function or [method@Gdk.Clipboard.read_async] directly if you
* need more control over the operation. * need more control over the operation.
*/ */
void void

2
gdk/gdkframeclock.c
View File

@ -51,7 +51,7 @@
* `GdkFrameClock` class for documentation of the phases. * `GdkFrameClock` class for documentation of the phases.
* %GDK_FRAME_CLOCK_PHASE_UPDATE and the [signal@GdkFrameClock::update] signal * %GDK_FRAME_CLOCK_PHASE_UPDATE and the [signal@GdkFrameClock::update] signal
* are most interesting for application writers, and are used to update the * are most interesting for application writers, and are used to update the
* animations, using the frame time given by [metohd@Gdk.FrameClock.get_frame_time]. * animations, using the frame time given by [method@Gdk.FrameClock.get_frame_time].
* *
* The frame time is reported in microseconds and generally in the same * The frame time is reported in microseconds and generally in the same
* timescale as g_get_monotonic_time(), however, it is not the same * timescale as g_get_monotonic_time(), however, it is not the same

4
gtk/gtkwidget.c
View File

@ -4848,7 +4848,7 @@ gtk_widget_class_set_activate_signal_from_name (GtkWidgetClass *widget_class,
* *
* If you wish to handle the activation keybinding yourself, it is * If you wish to handle the activation keybinding yourself, it is
* recommended to use [method@Gtk.WidgetClass.add_shortcut] with an action * recommended to use [method@Gtk.WidgetClass.add_shortcut] with an action
* created with [constructor@Gtk.SignalAction.new]. * created with [ctor@Gtk.SignalAction.new].
* *
* If @widget isn't activatable, the function returns %FALSE. * If @widget isn't activatable, the function returns %FALSE.
* *
@ -11184,7 +11184,7 @@ gtk_widget_class_bind_template_callback_full (GtkWidgetClass *widget_class,
* this class’s template data. * this class’s template data.
* *
* Note that this must be called from a composite widget classes class * Note that this must be called from a composite widget classes class
* initializer after calling [methoc@GtkWidgetClass.set_template]. * initializer after calling [method@GtkWidgetClass.set_template].
*/ */
void void
gtk_widget_class_set_template_scope (GtkWidgetClass *widget_class, gtk_widget_class_set_template_scope (GtkWidgetClass *widget_class,