From 92c6485adfd413aa716985c3a2cea7a5d2439067 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 19 Jun 2021 08:01:57 -0700 Subject: [PATCH] docs: Tweak wording Instead of drag'n'drop, say drag-and-drop. That is easier to read, and less unclear on the markdown syntax implications. --- demos/gtk-demo/peg_solitaire.c | 4 ++-- gdk/gdkdrop.c | 4 ++-- gtk/gtkdragicon.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demos/gtk-demo/peg_solitaire.c b/demos/gtk-demo/peg_solitaire.c index 4fe4f11d44..0f5761408c 100644 --- a/demos/gtk-demo/peg_solitaire.c +++ b/demos/gtk-demo/peg_solitaire.c @@ -1,7 +1,7 @@ /* Peg Solitaire * #Keywords: GtkGridView, game * - * This demo demonstrates how to use drag'n'drop to implement peg solitaire. + * This demo demonstrates how to use drag-and-drop to implement peg solitaire. * */ @@ -98,7 +98,7 @@ solitaire_peg_init (SolitairePeg *peg) /* Add a little setter for the peg's position. * We want to track those so that we can check for legal moves - * during drag'n'drop operations. + * during drag-and-drop operations. */ static void solitaire_peg_set_position (SolitairePeg *peg, diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c index 37a63c5a7b..fc70822cb0 100644 --- a/gdk/gdkdrop.c +++ b/gdk/gdkdrop.c @@ -574,7 +574,7 @@ gdk_drop_get_drag (GdkDrop *self) * the ones provided by [method@Gdk.Drop.get_actions]. Those actions may * change in the future, even depending on the actions you provide here. * - * The @preferred action is a hint to the drag'n'drop mechanism about which + * The @preferred action is a hint to the drag-and-drop mechanism about which * action to use when multiple actions are possible. * * This function should be called by drag destinations in response to @@ -865,7 +865,7 @@ gdk_drop_read_value_internal (GdkDrop *self, * then call [method@Gdk.Drop.read_value_finish] to get the resulting * `GValue`. * - * For local drag'n'drop operations that are available in the given + * For local drag-and-drop operations that are available in the given * `GType`, the value will be copied directly. Otherwise, GDK will * try to use [func@Gdk.content_deserialize_async] to convert the data. */ diff --git a/gtk/gtkdragicon.c b/gtk/gtkdragicon.c index 0b37d59119..b8b31671f9 100644 --- a/gtk/gtkdragicon.c +++ b/gtk/gtkdragicon.c @@ -512,7 +512,7 @@ gtk_drag_icon_get_child (GtkDragIcon *self) * If GTK does not know how to create a widget for a given value, * it will return %NULL. * - * This method is used to set the default drag icon on drag'n'drop + * This method is used to set the default drag icon on drag-and-drop * operations started by `GtkDragSource`, so you don't need to set * a drag icon using this function there. *