diff options
Diffstat (limited to 'gtk')
87 files changed, 152 insertions, 152 deletions
diff --git a/gtk/css/gtkcssparser.c b/gtk/css/gtkcssparser.c index a323260629..99e4944784 100644 --- a/gtk/css/gtkcssparser.c +++ b/gtk/css/gtkcssparser.c @@ -968,7 +968,7 @@ gtk_css_parser_parse_url_arg (GtkCssParser *parser, * * If the parser matches the <url> token from the [CSS * specification](https://drafts.csswg.org/css-values-4/#url-value), - * consumes it, resolves the URL and resturns the resulting #GFile. + * consumes it, resolves the URL and returns the resulting #GFile. * On failure, an error is emitted and %NULL is returned. * * Returns: (nullable) (transfer full): the resulting URL or %NULL on error diff --git a/gtk/emoji/emoji1.json b/gtk/emoji/emoji1.json index bdeceda8ae..2ecb36cecc 100644 --- a/gtk/emoji/emoji1.json +++ b/gtk/emoji/emoji1.json @@ -13068,7 +13068,7 @@ "aliases_ascii" : [ ], "keywords" : [ - "accomodation", + "accommodation", "building", "checkin", "motel", @@ -21958,7 +21958,7 @@ "clock1" : { "unicode" : "1f550", "unicode_alternates" : "", - "name" : "clock face one oclock", + "name" : "clock face one o'clock", "shortname" : ":clock1:", "category" : "symbols", "emoji_order" : "1013", @@ -21978,7 +21978,7 @@ "clock2" : { "unicode" : "1f551", "unicode_alternates" : "", - "name" : "clock face two oclock", + "name" : "clock face two o'clock", "shortname" : ":clock2:", "category" : "symbols", "emoji_order" : "1014", @@ -21998,7 +21998,7 @@ "clock3" : { "unicode" : "1f552", "unicode_alternates" : "", - "name" : "clock face three oclock", + "name" : "clock face three o'clock", "shortname" : ":clock3:", "category" : "symbols", "emoji_order" : "1015", @@ -22018,7 +22018,7 @@ "clock4" : { "unicode" : "1f553", "unicode_alternates" : "", - "name" : "clock face four oclock", + "name" : "clock face four o'clock", "shortname" : ":clock4:", "category" : "symbols", "emoji_order" : "1016", @@ -22038,7 +22038,7 @@ "clock5" : { "unicode" : "1f554", "unicode_alternates" : "", - "name" : "clock face five oclock", + "name" : "clock face five o'clock", "shortname" : ":clock5:", "category" : "symbols", "emoji_order" : "1017", @@ -22058,7 +22058,7 @@ "clock6" : { "unicode" : "1f555", "unicode_alternates" : "", - "name" : "clock face six oclock", + "name" : "clock face six o'clock", "shortname" : ":clock6:", "category" : "symbols", "emoji_order" : "1018", @@ -22078,7 +22078,7 @@ "clock7" : { "unicode" : "1f556", "unicode_alternates" : "", - "name" : "clock face seven oclock", + "name" : "clock face seven o'clock", "shortname" : ":clock7:", "category" : "symbols", "emoji_order" : "1019", @@ -22098,7 +22098,7 @@ "clock8" : { "unicode" : "1f557", "unicode_alternates" : "", - "name" : "clock face eight oclock", + "name" : "clock face eight o'clock", "shortname" : ":clock8:", "category" : "symbols", "emoji_order" : "1020", @@ -22118,7 +22118,7 @@ "clock9" : { "unicode" : "1f558", "unicode_alternates" : "", - "name" : "clock face nine oclock", + "name" : "clock face nine o'clock", "shortname" : ":clock9:", "category" : "symbols", "emoji_order" : "1021", @@ -22138,7 +22138,7 @@ "clock10" : { "unicode" : "1f559", "unicode_alternates" : "", - "name" : "clock face ten oclock", + "name" : "clock face ten o'clock", "shortname" : ":clock10:", "category" : "symbols", "emoji_order" : "1022", @@ -22158,7 +22158,7 @@ "clock11" : { "unicode" : "1f55a", "unicode_alternates" : "", - "name" : "clock face eleven oclock", + "name" : "clock face eleven o'clock", "shortname" : ":clock11:", "category" : "symbols", "emoji_order" : "1023", @@ -22178,7 +22178,7 @@ "clock12" : { "unicode" : "1f55b", "unicode_alternates" : "", - "name" : "clock face twelve oclock", + "name" : "clock face twelve o'clock", "shortname" : ":clock12:", "category" : "symbols", "emoji_order" : "1024", diff --git a/gtk/gtkaccessibleattributeset.c b/gtk/gtkaccessibleattributeset.c index 0a24a7f16d..abdc0950ed 100644 --- a/gtk/gtkaccessibleattributeset.c +++ b/gtk/gtkaccessibleattributeset.c @@ -1,4 +1,4 @@ -/* gtkaccessibleattributeset.c: Accessible attribute containt +/* gtkaccessibleattributeset.c: Accessible attribute content * * Copyright 2020 GNOME Foundation * diff --git a/gtk/gtkapplication-wayland.c b/gtk/gtkapplication-wayland.c index a5731769d2..865d60f674 100644 --- a/gtk/gtkapplication-wayland.c +++ b/gtk/gtkapplication-wayland.c @@ -32,7 +32,7 @@ typedef struct { GtkApplicationImplDBusClass parent_class; - /* stores the dbus version of the overriden methods */ + /* stores the dbus version of the overridden methods */ guint (*dbus_inhibit) (GtkApplicationImpl *impl, GtkWindow *window, GtkApplicationInhibitFlags flags, diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index 54e393edd3..f8ab3d406a 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -791,7 +791,7 @@ show_help_overlay (GSimpleAction *action, * sets up an action with the name win.show-help-overlay to present * it. * - * @window takes resposibility for destroying @help_overlay. + * @window takes responsibility for destroying @help_overlay. */ void gtk_application_window_set_help_overlay (GtkApplicationWindow *window, diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index b7c2cef769..ad6049ffe9 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -446,7 +446,7 @@ gtk_aspect_frame_get_ratio (GtkAspectFrame *self) * @obey_child: If %TRUE, @ratio is ignored, and the aspect * ratio is taken from the requistion of the child. * - * Sets whether the aspect ratio of the childs size + * Sets whether the aspect ratio of the child's size * request should override the set aspect ratio of * the #GtkAspectFrame. */ @@ -470,10 +470,10 @@ gtk_aspect_frame_set_obey_child (GtkAspectFrame *self, * gtk_aspect_frame_get_obey_child: * @self: a #GtkAspectFrame * - * Returns whether the childs size request should override + * Returns whether the child's size request should override * the set aspect ratio of the #GtkAspectFrame. * - * Returns: whether to obey the childs size request + * Returns: whether to obey the child's size request */ gboolean gtk_aspect_frame_get_obey_child (GtkAspectFrame *self) diff --git a/gtk/gtkbitset.c b/gtk/gtkbitset.c index 80d494f066..a248235e58 100644 --- a/gtk/gtkbitset.c +++ b/gtk/gtkbitset.c @@ -436,7 +436,7 @@ gtk_bitset_remove_range (GtkBitset *self, * @last: last value to add * * Adds the closed range [@first, @last], so @first, @last and all - * values inbetween. @first must be smaller than @last. + * values in between. @first must be smaller than @last. **/ void gtk_bitset_add_range_closed (GtkBitset *self, @@ -456,7 +456,7 @@ gtk_bitset_add_range_closed (GtkBitset *self, * @last: last value to remove * * Removes the closed range [@first, @last], so @first, @last and all - * values inbetween. @first must be smaller than @last. + * values in between. @first must be smaller than @last. **/ void gtk_bitset_remove_range_closed (GtkBitset *self, diff --git a/gtk/gtkbookmarklist.c b/gtk/gtkbookmarklist.c index f900a94246..58b11145b4 100644 --- a/gtk/gtkbookmarklist.c +++ b/gtk/gtkbookmarklist.c @@ -564,7 +564,7 @@ gtk_bookmark_list_get_io_priority (GtkBookmarkList *self) * * Files will be added to @self from time to time while loading is * going on. The order in which are added is undefined and may change - * inbetween runs. + * in between runs. * * Returns: %TRUE if @self is loading */ diff --git a/gtk/gtkboolfilter.c b/gtk/gtkboolfilter.c index 9a5ac17e1b..de37ac0bd2 100644 --- a/gtk/gtkboolfilter.c +++ b/gtk/gtkboolfilter.c @@ -158,7 +158,7 @@ gtk_bool_filter_class_init (GtkBoolFilterClass *class) /** * GtkBoolFilter:expression: (type GtkExpression) * - * The boolean expression to evalute on item + * The boolean expression to evaluate on item */ properties[PROP_EXPRESSION] = gtk_param_spec_expression ("expression", diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index 6c5f5469f0..02541a4b84 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -1766,7 +1766,7 @@ gtk_builder_get_current_object (GtkBuilder *builder) * %NULL for none * * Sets the current object for the @builder. The current object can be - * tought of as the `this` object that the builder is working for and + * thought of as the `this` object that the builder is working for and * will often be used as the default object when an object is optional. * * gtk_widget_init_template() for example will set the current object to diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c index e222813e68..f86aa869b1 100644 --- a/gtk/gtkbuilderparser.c +++ b/gtk/gtkbuilderparser.c @@ -2010,9 +2010,9 @@ end_element (GtkBuildableParseContext *context, { RequiresInfo *req_info = state_pop_info (data, RequiresInfo); - /* TODO: Allow third party widget developers to check thier + /* TODO: Allow third party widget developers to check their * required versions, possibly throw a signal allowing them - * to check thier library versions here. + * to check their library versions here. */ if (!strcmp (req_info->library, "gtk+")) { diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c index e0ce9e48e6..2cbf5c31aa 100644 --- a/gtk/gtkcellarea.c +++ b/gtk/gtkcellarea.c @@ -186,7 +186,7 @@ * * # Rendering Areas * - * Once area sizes have been aquired at least for the rows in the + * Once area sizes have been acquired at least for the rows in the * visible area of the layouting widget they can be rendered at * #GtkWidgetClass.snapshot() time. * @@ -1330,7 +1330,7 @@ gtk_cell_area_real_get_preferred_height_for_width (GtkCellArea *area, int *minimum_height, int *natural_height) { - /* If the area doesnt do height-for-width, fallback on base preferred height */ + /* If the area doesn't do height-for-width, fallback on base preferred height */ GTK_CELL_AREA_GET_CLASS (area)->get_preferred_height (area, context, widget, minimum_height, natural_height); } @@ -1342,7 +1342,7 @@ gtk_cell_area_real_get_preferred_width_for_height (GtkCellArea *area, int *minimum_width, int *natural_width) { - /* If the area doesnt do width-for-height, fallback on base preferred width */ + /* If the area doesn't do width-for-height, fallback on base preferred width */ GTK_CELL_AREA_GET_CLASS (area)->get_preferred_width (area, context, widget, minimum_width, natural_width); } diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c index 5d82fd95ea..1d5a5fa138 100644 --- a/gtk/gtkcellareabox.c +++ b/gtk/gtkcellareabox.c @@ -1228,7 +1228,7 @@ gtk_cell_area_box_foreach_alloc (GtkCellArea *area, } else { - /* If the cell we are rendering doesnt fit into the remaining space, + /* If the cell we are rendering doesn't fit into the remaining space, * clip it so that the underlying renderer has a chance to deal with * it (for instance text renderers get a chance to ellipsize). */ diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index 0f48cfeb32..090aede60f 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -1378,7 +1378,7 @@ gtk_cell_renderer_get_request_mode (GtkCellRenderer *cell) * @minimum_size: (out) (allow-none): location to store the minimum size, or %NULL * @natural_size: (out) (allow-none): location to store the natural size, or %NULL * - * Retreives a renderer’s natural size when rendered to @widget. + * Retrieves a renderer’s natural size when rendered to @widget. */ void gtk_cell_renderer_get_preferred_width (GtkCellRenderer *cell, @@ -1424,7 +1424,7 @@ gtk_cell_renderer_get_preferred_width (GtkCellRenderer *cell, * @minimum_size: (out) (allow-none): location to store the minimum size, or %NULL * @natural_size: (out) (allow-none): location to store the natural size, or %NULL * - * Retreives a renderer’s natural size when rendered to @widget. + * Retrieves a renderer’s natural size when rendered to @widget. */ void gtk_cell_renderer_get_preferred_height (GtkCellRenderer *cell, @@ -1471,7 +1471,7 @@ gtk_cell_renderer_get_preferred_height (GtkCellRenderer *cell, * @minimum_width: (out) (allow-none): location for storing the minimum size, or %NULL * @natural_width: (out) (allow-none): location for storing the preferred size, or %NULL * - * Retreives a cell renderers’s minimum and natural width if it were rendered to + * Retrieves a cell renderers’s minimum and natural width if it were rendered to * @widget with the specified @height. */ void @@ -1519,7 +1519,7 @@ gtk_cell_renderer_get_preferred_width_for_height (GtkCellRenderer *cell, * @minimum_height: (out) (allow-none): location for storing the minimum size, or %NULL * @natural_height: (out) (allow-none): location for storing the preferred size, or %NULL * - * Retreives a cell renderers’s minimum and natural height if it were rendered to + * Retrieves a cell renderers’s minimum and natural height if it were rendered to * @widget with the specified @width. */ void diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 2168129d3d..f30a89dcc5 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1853,7 +1853,7 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer *cell, * Sets the height of a renderer to explicitly be determined by the “font” and * “y_pad” property set on it. Further changes in these properties do not * affect the height, so they must be accompanied by a subsequent call to this - * function. Using this function is unflexible, and should really only be used + * function. Using this function is inflexible, and should really only be used * if calculating the size of a cell is too slow (ie, a massive number of cells * displayed). If @number_of_rows is -1, then the fixed height is unset, and * the height is determined by the properties again. @@ -2003,7 +2003,7 @@ gtk_cell_renderer_text_get_preferred_height (GtkCellRenderer *cell, * height-for-width and not the opposite. Here we have only to return * the height for the base minimum width of the renderer. * - * Note this code path wont be followed by GtkTreeView which is + * Note this code path won't be followed by GtkTreeView which is * height-for-width specifically. */ gtk_cell_renderer_get_preferred_width (cell, widget, &min_width, NULL); diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 1188c7bfc9..c92bd997a6 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -42,7 +42,7 @@ * and #GtkCellAreaContext. A #GtkCellAreaContext can be provided to the * #GtkCellView at construction time in order to keep the cellview in context * of a group of cell views, this ensures that the renderers displayed will - * be properly aligned with eachother (like the aligned cells in the menus + * be properly aligned with each other (like the aligned cells in the menus * of #GtkComboBox). * * #GtkCellView is #GtkOrientable in order to decide in which orientation @@ -268,7 +268,7 @@ gtk_cell_view_class_init (GtkCellViewClass *klass) * * Whether the view should request enough space to always fit * the size of every row in the model (used by the combo box to - * ensure the combo box size doesnt change when different items + * ensure the combo box size doesn't change when different items * are selected). * * since 3.0 @@ -840,7 +840,7 @@ gtk_cell_view_new (void) * Creates a new #GtkCellView widget with a specific #GtkCellArea * to layout cells and a specific #GtkCellAreaContext. * - * Specifying the same context for a handfull of cells lets + * Specifying the same context for a handful of cells lets * the underlying area synchronize the geometry for those cells, * in this way alignments with cellviews for other rows are * possible. diff --git a/gtk/gtkcolumnviewcell.c b/gtk/gtkcolumnviewcell.c index e0f0885803..ace8037188 100644 --- a/gtk/gtkcolumnviewcell.c +++ b/gtk/gtkcolumnviewcell.c @@ -175,7 +175,7 @@ gtk_column_view_cell_init (GtkColumnViewCell *self) GtkWidget *widget = GTK_WIDGET (self); gtk_widget_set_focusable (widget, FALSE); - /* FIXME: Figure out if settting the manager class to INVALID should work */ + /* FIXME: Figure out if setting the manager class to INVALID should work */ gtk_widget_set_layout_manager (widget, NULL); widget->priv->resize_func = gtk_column_view_cell_resize_func; } diff --git a/gtk/gtkcolumnviewcolumn.c b/gtk/gtkcolumnviewcolumn.c index f9d0d64246..4c738fd6fc 100644 --- a/gtk/gtkcolumnviewcolumn.c +++ b/gtk/gtkcolumnviewcolumn.c @@ -697,7 +697,7 @@ gtk_column_view_column_set_factory (GtkColumnViewColumn *self, * @title: (nullable): Title to use for this column * * Sets the title of this column. The title is displayed in the header of a - * #GtkColumnView for this column and is therefor user-facing text that should + * #GtkColumnView for this column and is therefore user-facing text that should * be translated. */ void diff --git a/gtk/gtkconstraintexpression.c b/gtk/gtkconstraintexpression.c index f3a0a37f79..42dffdc7d8 100644 --- a/gtk/gtkconstraintexpression.c +++ b/gtk/gtkconstraintexpression.c @@ -586,7 +586,7 @@ gtk_constraint_variable_set_iter_next (GtkConstraintVariableSetIter *iter, * @first: a #GtkConstraintVariable * @second: a #GtkConstraintVariable * - * Creates a new #GtkConstraintVariablePair, containint @first and @second. + * Creates a new #GtkConstraintVariablePair, containing @first and @second. * * The #GtkConstraintVariablePair acquires a reference over the two * given #GtkConstraintVariables. diff --git a/gtk/gtkcssimage.c b/gtk/gtkcssimage.c index fe3bae9335..62839d2cf5 100644 --- a/gtk/gtkcssimage.c +++ b/gtk/gtkcssimage.c @@ -547,7 +547,7 @@ gtk_css_image_get_parser_type (GtkCssParser *parser) * implementing shorthand properties. A successful parse of an image * can not be guaranteed. * - * Returns: %TURE if it looks like an image. + * Returns: %TRUE if it looks like an image. **/ gboolean _gtk_css_image_can_parse (GtkCssParser *parser) diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c index b8522a1e37..a6cb39020f 100644 --- a/gtk/gtkcssnode.c +++ b/gtk/gtkcssnode.c @@ -73,7 +73,7 @@ * - The sibling ordering in the CSS node tree is supposed to correspond * to the visible order of content: top-to-bottom and left-to-right. * Reorder your nodes to maintain this correlation. In particular for - * horizontally layed out widgets, this will require listening to + * horizontally laid out widgets, this will require listening to * ::direction-changed. * - The draw function should just use gtk_style_context_save_to_node() to * 'switch' to the right node, not make any other changes to the style diff --git a/gtk/gtkcssvalue.c b/gtk/gtkcssvalue.c index b5bcb91369..dddfce8c40 100644 --- a/gtk/gtkcssvalue.c +++ b/gtk/gtkcssvalue.c @@ -244,7 +244,7 @@ gboolean _gtk_css_value_equal0 (const GtkCssValue *value1, const GtkCssValue *value2) { - /* Inclues both values being NULL */ + /* Includes both values being NULL */ if (value1 == value2) return TRUE; diff --git a/gtk/gtkdirectorylist.c b/gtk/gtkdirectorylist.c index 5ec5c94b0d..d65c0e9229 100644 --- a/gtk/gtkdirectorylist.c +++ b/gtk/gtkdirectorylist.c @@ -779,7 +779,7 @@ gtk_directory_list_get_attributes (GtkDirectoryList *self) * * The default IO priority is %G_PRIORITY_DEFAULT, which is higher than * the GTK redraw priority. If you are loading a lot of directories in - * parrallel, lowering it to something like %G_PRIORITY_DEFAULT_IDLE + * parallel, lowering it to something like %G_PRIORITY_DEFAULT_IDLE * may increase responsiveness. */ void @@ -821,7 +821,7 @@ gtk_directory_list_get_io_priority (GtkDirectoryList *self) * * Files will be added to @self from time to time while loading is * going on. The order in which are added is undefined and may change - * inbetween runs. + * in between runs. * * Returns: %TRUE if @self is loading */ diff --git a/gtk/gtkexpression.c b/gtk/gtkexpression.c index 81e1207b40..ddf2b560ef 100644 --- a/gtk/gtkexpression.c +++ b/gtk/gtkexpression.c @@ -81,7 +81,7 @@ * have changed. gtk_expression_watch() starts watching an expression, and * gtk_expression_watch_unwatch() stops. * - * Watches can be created for automatically updating the propery of an object, + * Watches can be created for automatically updating the property of an object, * similar to GObject's #GBinding mechanism, by using gtk_expression_bind(). * * # GtkExpression in GObject properties diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index bd31cf90ae..6999f1926d 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -244,7 +244,7 @@ gtk_file_chooser_get_select_multiple (GtkFileChooser *chooser) * @chooser: a #GtkFileChooser * @create_folders: %TRUE if the Create Folder button should be displayed * - * Sets whether file choser will offer to create new folders. + * Sets whether file chooser will offer to create new folders. * This is only relevant if the action is not set to be * %GTK_FILE_CHOOSER_ACTION_OPEN. **/ @@ -261,7 +261,7 @@ gtk_file_chooser_set_create_folders (GtkFileChooser *chooser, * gtk_file_chooser_get_create_folders: * @chooser: a #GtkFileChooser * - * Gets whether file choser will offer to create new folders. + * Gets whether file chooser will offer to create new folders. * See gtk_file_chooser_set_create_folders(). * * Returns: %TRUE if the Create Folder button should be displayed. diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 2eae39493c..ec30098d72 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -1336,7 +1336,7 @@ rename_file_rename_clicked (GtkButton *button, error_dialog (impl, _("The file could not be renamed"), error); else { - /* Rename succeded, save renamed file so it will + /* Rename succeeded, save renamed file so it will * be revealed by our "row-changed" handler */ impl->renamed_file = g_object_ref (child); } diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c index 93359aa77f..e41e6e121f 100644 --- a/gtk/gtkflowbox.c +++ b/gtk/gtkflowbox.c @@ -1581,7 +1581,7 @@ gtk_flow_box_size_allocate (GtkWidget *widget, /* By default flow at the natural item width */ line_length = avail_size / (nat_item_size + item_spacing); - /* After the above aproximation, check if we cant fit one more on the line */ + /* After the above approximation, check if we can't fit one more on the line */ if (line_length * item_spacing + (line_length + 1) * nat_item_size <= avail_size) line_length++; @@ -1621,7 +1621,7 @@ gtk_flow_box_size_allocate (GtkWidget *widget, if (line_align != GTK_ALIGN_FILL) line_size = MIN (line_size, nat_fixed_line_size); - /* Get the real extra pixels incase of GTK_ALIGN_START lines */ + /* Get the real extra pixels in case of GTK_ALIGN_START lines */ extra_pixels = avail_size - (line_length - 1) * item_spacing - item_size * line_length; extra_line_pixels = avail_other_size - (n_lines - 1) * line_spacing - line_size * n_lines; } @@ -2012,7 +2012,7 @@ gtk_flow_box_measure (GtkWidget *widget, nat_width += nat_line_length; } } - else /* In homogeneous mode; horizontally oriented boxs + else /* In homogeneous mode; horizontally oriented boxes * give the same width to all children */ { get_max_item_size (box, GTK_ORIENTATION_HORIZONTAL, @@ -2096,7 +2096,7 @@ gtk_flow_box_measure (GtkWidget *widget, /* By default flow at the natural item width */ line_length = avail_size / (nat_item_height + priv->row_spacing); - /* After the above aproximation, check if we cant fit one more on the line */ + /* After the above approximation, check if we can't fit one more on the line */ if (line_length * priv->row_spacing + (line_length + 1) * nat_item_height <= avail_size) line_length++; @@ -2336,7 +2336,7 @@ gtk_flow_box_measure (GtkWidget *widget, /* By default flow at the natural item width */ line_length = avail_size / (nat_item_width + priv->column_spacing); - /* After the above aproximation, check if we cant fit one more on the line */ + /* After the above approximation, check if we can't fit one more on the line */ if (line_length * priv->column_spacing + (line_length + 1) * nat_item_width <= avail_size) line_length++; @@ -3690,7 +3690,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class) /** * GtkFlowBox::selected-children-changed: - * @box: the #GtkFlowBox on wich the signal is emitted + * @box: the #GtkFlowBox on which the signal is emitted * * The ::selected-children-changed signal is emitted when the * set of selected children changes. @@ -3976,7 +3976,7 @@ gtk_flow_box_bound_model_changed (GListModel *list, } } -/* Buildable implemenation {{{3 */ +/* Buildable implementation {{{3 */ static GtkBuildableIface *parent_buildable_iface; diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index c1542001dd..748a25fad2 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -350,7 +350,7 @@ gtk_frame_set_label (GtkFrame *frame, * to gtk_frame_new().) * * Returns: (nullable): the text in the label, or %NULL if there - * was no label widget or the lable widget was not + * was no label widget or the label widget was not * a #GtkLabel. This string is owned by GTK+ and * must not be modified or freed. **/ diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c index 544ef87bd3..7f983d8586 100644 --- a/gtk/gtkgesture.c +++ b/gtk/gtkgesture.c @@ -31,7 +31,7 @@ * * The number of touches that a #GtkGesture need to be recognized is controlled * by the #GtkGesture:n-points property, if a gesture is keeping track of less - * or more than that number of sequences, it won't check wether the gesture + * or more than that number of sequences, it won't check whether the gesture * is recognized. * * As soon as the gesture has the expected number of touches, it will check diff --git a/gtk/gtkgesturedrag.c b/gtk/gtkgesturedrag.c index f0939136bb..cf797df194 100644 --- a/gtk/gtkgesturedrag.c +++ b/gtk/gtkgesturedrag.c @@ -24,7 +24,7 @@ * @See_also: #GtkGestureSwipe * * #GtkGestureDrag is a #GtkGesture implementation that recognizes drag - * operations. The drag operation itself can be tracked throught the + * operations. The drag operation itself can be tracked throughout the * #GtkGestureDrag::drag-begin, #GtkGestureDrag::drag-update and * #GtkGestureDrag::drag-end signals, or the relevant coordinates be * extracted through gtk_gesture_drag_get_offset() and diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c index 09b4d35fff..4cb815e1d9 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -521,7 +521,7 @@ gtk_gl_area_allocate_texture (GtkGLArea *area) * * Ensures that the @area framebuffer object is made the current draw * and read target, and that all the required buffers for the @area - * are created and bound to the frambuffer. + * are created and bound to the framebuffer. * * This function is automatically called before emitting the * #GtkGLArea::render signal, and doesn't normally need to be called @@ -811,7 +811,7 @@ gtk_gl_area_class_init (GtkGLAreaClass *klass) * If set to %FALSE the data from previous rendering is kept around and will * be used for drawing the widget the next time, unless the window is resized. * In order to force a rendering gtk_gl_area_queue_render() must be called. - * This mode is useful when the scene changes seldomly, but takes a long time + * This mode is useful when the scene changes seldom, but takes a long time * to redraw. */ obj_props[PROP_AUTO_RENDER] = @@ -1271,7 +1271,7 @@ gtk_gl_area_get_auto_render (GtkGLArea *area) * around and will be used for drawing the widget the next time, * unless the window is resized. In order to force a rendering * gtk_gl_area_queue_render() must be called. This mode is useful when - * the scene changes seldomly, but takes a long time to redraw. + * the scene changes seldom, but takes a long time to redraw. */ void gtk_gl_area_set_auto_render (GtkGLArea *area, diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c index a945683b03..00b40976a7 100644 --- a/gtk/gtkgridview.c +++ b/gtk/gtkgridview.c @@ -207,7 +207,7 @@ cell_augment (GtkRbTree *tree, * @y into the primary direction. * * If y is larger than the height of all cells, %NULL will be returned. - * In particular that means that for an emtpy grid, %NULL is returned + * In particular that means that for an empty grid, %NULL is returned * for any value. * * Returns: (nullable): The first cell at offset y or %NULL if none diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c index 61c1b7bb0f..061b66f1cc 100644 --- a/gtk/gtkiconcache.c +++ b/gtk/gtkiconcache.c @@ -95,7 +95,7 @@ gtk_icon_cache_new_for_path (const char *path) if (g_stat (cache_filename, &st) < 0 || st.st_size < 4) goto done; - /* Verify cache is uptodate */ + /* Verify cache is up-to-date */ if (st.st_mtime < path_st.st_mtime) { GTK_NOTE (ICONTHEME, g_message ("icon cache outdated")); diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index cd1010376d..c7822ad129 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -231,7 +231,7 @@ gtk_string_set_add (GtkStringSet *set, * All private functions that take a GtkIconTheme (or one of its * private data types (like IconThemeDir, UnthemedIcon, etc) arg are * expected to be called with the icon theme lock held, unless the - * funcion has a _unlocked suffix. Any similar function that must be + * function has a _unlocked suffix. Any similar function that must be * called on the main thread, will have a _mainthread suffix. * * So the rules for such functions are: @@ -1395,7 +1395,7 @@ gtk_icon_theme_dispose (GObject *object) * we finalize on a thread and on the main thread some display or * setting signal is emitted. * - * It is possible that before we aquire the lock this happens + * It is possible that before we acquire the lock this happens * and the other thread refs the icon theme for some reason, but * this is ok as it is allowed to resurrect objects in dispose * (but not in finalize). diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index f1cc209ffd..507875a075 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -3131,7 +3131,7 @@ gtk_icon_view_row_changed (GtkTreeModel *model, * and only invalidate a single item and queue a relayout * instead of invalidating the whole thing. * - * For now GtkIconView still cant deal with huge models + * For now GtkIconView still can't deal with huge models * so just invalidate the whole thing when the model * changes. */ diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h index 5b559035db..022b455188 100644 --- a/gtk/gtkiconview.h +++ b/gtk/gtkiconview.h @@ -53,7 +53,7 @@ typedef void (* GtkIconViewForeachFunc) (GtkIconView *icon_view, * GtkIconViewDropPosition: * @GTK_ICON_VIEW_NO_DROP: no drop possible * @GTK_ICON_VIEW_DROP_INTO: dropped item replaces the item - * @GTK_ICON_VIEW_DROP_LEFT: droppped item is inserted to the left + * @GTK_ICON_VIEW_DROP_LEFT: dropped item is inserted to the left * @GTK_ICON_VIEW_DROP_RIGHT: dropped item is inserted to the right * @GTK_ICON_VIEW_DROP_ABOVE: dropped item is inserted above * @GTK_ICON_VIEW_DROP_BELOW: dropped item is inserted below diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 4e0b5930f5..730660ff06 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -113,7 +113,7 @@ static void gtk_image_measure (GtkWidget *widget, static void gtk_image_css_changed (GtkWidget *widget, GtkCssStyleChange *change); static void gtk_image_system_setting_changed (GtkWidget *widget, - GtkSystemSetting seting); + GtkSystemSetting setting); static void gtk_image_finalize (GObject *object); static void gtk_image_set_property (GObject *object, diff --git a/gtk/gtkimcontextime.c b/gtk/gtkimcontextime.c index c7de8d66f6..1880332978 100644 --- a/gtk/gtkimcontextime.c +++ b/gtk/gtkimcontextime.c @@ -671,7 +671,7 @@ gtk_im_context_ime_focus_in (GtkIMContext *context) if (!GDK_IS_SURFACE (context_ime->client_surface)) return; - /* swtich current context */ + /* switch current context */ context_ime->focus = TRUE; hwnd = gdk_win32_surface_get_impl_hwnd (context_ime->client_surface); @@ -727,7 +727,7 @@ gtk_im_context_ime_focus_out (GtkIMContext *context) if (!GDK_IS_SURFACE (context_ime->client_surface)) return; - /* swtich current context */ + /* switch current context */ context_ime->focus = FALSE; hwnd = gdk_win32_surface_get_impl_hwnd (context_ime->client_surface); @@ -776,7 +776,7 @@ gtk_im_context_ime_focus_out (GtkIMContext *context) context_ime->preediting = FALSE; } - /* remove event fileter */ + /* remove event filter */ toplevel = context_ime->client_surface; if (GDK_IS_SURFACE (toplevel)) { diff --git a/gtk/gtkkineticscrolling.c b/gtk/gtkkineticscrolling.c index 830fbe7dae..a03f683876 100644 --- a/gtk/gtkkineticscrolling.c +++ b/gtk/gtkkineticscrolling.c @@ -31,7 +31,7 @@ * * y'' = -my' * - * With m the resistence factor. For this we use the following 2 + * With m the resistance factor. For this we use the following 2 * base solutions: * * f1(x) = 1 diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 378069d8a5..d9149198c6 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -82,7 +82,7 @@ * * GtkLabel has a single CSS node with the name label. A wide variety * of style classes may be applied to labels, such as .title, .subtitle, - * .dim-label, etc. In the #GtkShortcutsWindow, labels are used wth the + * .dim-label, etc. In the #GtkShortcutsWindow, labels are used with the * .keycap style class. * * If the label has a selection, it gets a subnode with name selection. @@ -778,7 +778,7 @@ gtk_label_class_init (GtkLabelClass *class) /** * GtkLabel:xalign: * - * The xalign property determines the horizontal aligment of the label text + * The xalign property determines the horizontal alignment of the label text * inside the labels size allocation. Compare this to #GtkWidget:halign, * which determines how the labels size allocation is positioned in the * space available for the label. @@ -794,7 +794,7 @@ gtk_label_class_init (GtkLabelClass *class) /** * GtkLabel:yalign: * - * The yalign property determines the vertical aligment of the label text + * The yalign property determines the vertical alignment of the label text * inside the labels size allocation. Compare this to #GtkWidget:valign, * which determines how the labels size allocation is positioned in the * space available for the label. diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c index d6e1a129d0..efc2ced6db 100644 --- a/gtk/gtklistbase.c +++ b/gtk/gtklistbase.c @@ -1600,7 +1600,7 @@ gtk_list_base_stop_rubberband (GtkListBase *self, selected = gtk_bitset_new_empty (); mask = gtk_bitset_ref (rubberband_selection); } - else /* no modifer */ + else /* no modifier */ { /* select the rubberband, clear the rest */ selected = gtk_bitset_ref (rubberband_selection); diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c index 98af2f58fa..6235e44768 100644 --- a/gtk/gtklistbox.c +++ b/gtk/gtklistbox.c @@ -540,7 +540,7 @@ gtk_list_box_class_init (GtkListBoxClass *klass) /** * GtkListBox::selected-rows-changed: - * @box: the #GtkListBox on wich the signal is emitted + * @box: the #GtkListBox on which the signal is emitted * * The ::selected-rows-changed signal is emitted when the * set of selected rows changes. diff --git a/gtk/gtkmediastream.c b/gtk/gtkmediastream.c index 120d4a656f..c7c0a6fb0c 100644 --- a/gtk/gtkmediastream.c +++ b/gtk/gtkmediastream.c @@ -752,7 +752,7 @@ gtk_media_stream_get_error (GtkMediaStream *self) * in process, the GtkMediaStream:seeking property will be set. * * When calling gtk_media_stream_seek() during an ongoing seek operation, - * the new seek wil override any pending seek. + * the new seek will override any pending seek. **/ void gtk_media_stream_seek (GtkMediaStream *self, diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index b1bf809a3c..395f3eeea4 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -83,7 +83,7 @@ * gtk_show_uri_on_window() is a convenient way to launch applications for URIs. * * Another object that is worth mentioning in this context is - * #GdkAppLaunchContext, which provides visual feedback when lauching + * #GdkAppLaunchContext, which provides visual feedback when launching * applications. */ diff --git a/gtk/gtknumericsorter.c b/gtk/gtknumericsorter.c index ef5fb92198..895570bc73 100644 --- a/gtk/gtknumericsorter.c +++ b/gtk/gtknumericsorter.c @@ -543,7 +543,7 @@ gtk_numeric_sorter_class_init (GtkNumericSorterClass *class) /** * GtkNumericSorter:expression: (type GtkExpression) * - * The expression to evalute on items to get a number to compare with + * The expression to evaluate on items to get a number to compare with */ properties[PROP_EXPRESSION] = gtk_param_spec_expression ("expression", diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index 9e8e6adc58..40dcae72aa 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -217,7 +217,7 @@ gtk_path_bar_init (GtkPathBar *path_bar) gtk_widget_add_css_class (path_bar->down_slider_button, "slider-button"); gtk_widget_set_parent (path_bar->down_slider_button, GTK_WIDGET (path_bar)); - /* GtkBuilder wont let us connect 'swapped' without specifying the signal's + /* GtkBuilder won't let us connect 'swapped' without specifying the signal's * user data in the .ui file */ g_signal_connect_swapped (path_bar->up_slider_button, "clicked", diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index d7ac99a788..3995368478 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -1915,7 +1915,7 @@ dnd_cancel_cb (GdkDrag *drag, * is also not true, since when the drag comes from a different widget than the * sidebar, when the drag stops the last drag signal we receive is drag-leave. * So here what we will do is restore the state of the sidebar as if no drag - * is being done (and if the application didnt request for permanent hints with + * is being done (and if the application didn't request for permanent hints with * gtk_places_sidebar_show_drop_hints) and we will free the drag data next time * we build new drag data in drag_data_received. */ diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index 554036bbcc..741c0877d5 100644 --- a/gtk/gtkprintjob.c +++ b/gtk/gtkprintjob.c @@ -567,7 +567,7 @@ gtk_print_job_set_track_print_status (GtkPrintJob *job, * gtk_print_job_get_track_print_status: * @job: a #GtkPrintJob * - * Returns wheter jobs will be tracked after printing. + * Returns whether jobs will be tracked after printing. * For details, see gtk_print_job_set_track_print_status(). * * Returns: %TRUE if print job status will be reported after printing diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c index 6760aafcf9..c75641f887 100644 --- a/gtk/gtkprintoperation-unix.c +++ b/gtk/gtkprintoperation-unix.c @@ -251,7 +251,7 @@ gtk_print_operation_unix_launch_preview (GtkPrintOperation *op, gtk_print_settings_set_number_up (print_settings, 1); gtk_print_settings_set_number_up_layout (print_settings, GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM); - /* These removals are neccessary because cups-* settings have higher priority + /* These removals are necessary because cups-* settings have higher priority * than normal settings. */ gtk_print_settings_unset (print_settings, "cups-reverse"); diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 3ffcfa45d2..bf9a00b659 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -1119,7 +1119,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) * * This must be set to a positive number * before the rendering starts. It may be set in a - * #GtkPrintOperation::begin-print signal hander. + * #GtkPrintOperation::begin-print signal handler. * * Note that the page numbers passed to the * #GtkPrintOperation::request-page-setup and @@ -1545,7 +1545,7 @@ gtk_print_operation_set_job_name (GtkPrintOperation *op, * * This must be set to a positive number * before the rendering starts. It may be set in a - * #GtkPrintOperation::begin-print signal hander. + * #GtkPrintOperation::begin-print signal handler. * * Note that the page numbers passed to the * #GtkPrintOperation::request-page-setup @@ -1874,7 +1874,7 @@ gtk_print_operation_set_custom_tab_label (GtkPrintOperation *op, * @filename: (type filename): the filename for the exported file * * Sets up the #GtkPrintOperation to generate a file instead - * of showing the print dialog. The indended use of this function + * of showing the print dialog. The intended use of this function * is for implementing “Export to PDF” actions. Currently, PDF * is the only supported format. * diff --git a/gtk/gtkpropertylookuplistmodel.c b/gtk/gtkpropertylookuplistmodel.c index 0c0dc4ea91..caf19b93d9 100644 --- a/gtk/gtkpropertylookuplistmodel.c +++ b/gtk/gtkpropertylookuplistmodel.c @@ -156,7 +156,7 @@ gtk_property_lookup_list_model_ensure (GtkPropertyLookupListModel *self, if (gtk_property_lookup_list_model_append (self, n_items) == n_items) { - /* readd NULL sentinel */ + /* re-add NULL sentinel */ g_ptr_array_add (self->items, NULL); } } diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c index dc32364879..698dc3d832 100644 --- a/gtk/gtkquartz.c +++ b/gtk/gtkquartz.c @@ -65,7 +65,7 @@ _data_provider_release_cairo_surface (void* info, const void* data, size_t size) } /* Returns a new NSImage or %NULL in case of an error. - * The device scale factor will be transfered to the NSImage (hidpi) + * The device scale factor will be transferred to the NSImage (hidpi) */ NSImage * _gtk_quartz_create_image_from_surface (cairo_surface_t *surface) diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index a986f3cc89..a610e361da 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -382,7 +382,7 @@ gtk_radio_button_set_group (GtkRadioButton *radio_button, /** * gtk_radio_button_join_group: * @radio_button: the #GtkRadioButton object - * @group_source: (allow-none): a radio button object whos group we are + * @group_source: (allow-none): a radio button object whose group we are * joining, or %NULL to remove the radio button from its group * * Joins a #GtkRadioButton object to the group of another #GtkRadioButton object diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c index 31596a68d5..67c933939c 100644 --- a/gtk/gtkrecentmanager.c +++ b/gtk/gtkrecentmanager.c @@ -1152,7 +1152,7 @@ build_recent_info (GBookmarkFile *bookmarks, * @error: (allow-none): a return location for a #GError, or %NULL * * Searches for a URI inside the recently used resources list, and - * returns a #GtkRecentInfo containing informations about the resource + * returns a #GtkRecentInfo containing information about the resource * like its MIME type, or its display name. * * Returns: (nullable): a #GtkRecentInfo containing information diff --git a/gtk/gtkrenderborder.c b/gtk/gtkrenderborder.c index 41c063d503..9ee5a62a9f 100644 --- a/gtk/gtkrenderborder.c +++ b/gtk/gtkrenderborder.c @@ -536,7 +536,7 @@ snapshot_border (GtkSnapshot *snapshot, continue; /* NB: code below divides by this value */ - /* a border smaller than this will not noticably modify + /* a border smaller than this will not noticeably modify * pixels on screen, and since we don't compare with 0, * we'll use this value */ if (border_width[i] < 1.0 / 1024) diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c index 2571d82427..ccaaef4143 100644 --- a/gtk/gtkrevealer.c +++ b/gtk/gtkrevealer.c @@ -469,7 +469,7 @@ gtk_revealer_size_allocate (GtkWidget *widget, } /* We request a different size than the child requested scaled by - * this scale as it will render smaller from the transision. + * this scale as it will render smaller from the transition. * However, we still want to allocate the child widget with its * unscaled size so it renders right instead of e.g. ellipsizing or * some other form of clipping. We do this by reverse-applying diff --git a/gtk/gtkscrollable.c b/gtk/gtkscrollable.c index 2e581ee6ac..7c11d9edfe 100644 --- a/gtk/gtkscrollable.c +++ b/gtk/gtkscrollable.c @@ -297,7 +297,7 @@ gtk_scrollable_set_vscroll_policy (GtkScrollable *scrollable, * Returns the size of a non-scrolling border around the * outside of the scrollable. An example for this would * be treeview headers. GTK+ can use this information to - * display overlayed graphics, like the overshoot indication, + * display overlaid graphics, like the overshoot indication, * at the right position. * * Returns: %TRUE if @border has been set diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 779ff18591..fbc03039e4 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -118,7 +118,7 @@ * the content is pulled beyond the end, and this situation can be * captured with the #GtkScrolledWindow::edge-overshot signal. * - * If no mouse device is present, the scrollbars will overlayed as + * If no mouse device is present, the scrollbars will overlaid as * narrow, auto-hiding indicators over the content. If traditional * scrollbars are desired although no mouse is present, this behaviour * can be turned off with the #GtkScrolledWindow:overlay-scrolling @@ -682,7 +682,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class) * * Whether overlay scrolling is enabled or not. If it is, the * scrollbars are only added as traditional widgets when a mouse - * is present. Otherwise, they are overlayed on top of the content, + * is present. Otherwise, they are overlaid on top of the content, * as narrow indicators. * * Note that overlay scrolling can also be globally disabled, with diff --git a/gtk/gtkselectionmodel.c b/gtk/gtkselectionmodel.c index f14676b912..1a70694fc5 100644 --- a/gtk/gtkselectionmodel.c +++ b/gtk/gtkselectionmodel.c @@ -495,7 +495,7 @@ gtk_selection_model_unselect_all (GtkSelectionModel *model) * are more likely to implement support for those. * * Requests that the selection state of all positions set in @mask be - * updated to the respecitve value in the @selected bitmask. + * updated to the respective value in the @selected bitmask. * * In pseudocode, it would look something like this: * diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 332f46fe2a..5802d80718 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -954,7 +954,7 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-overlay-scrolling: * - * Whether scrolled windows may use overlayed scrolling indicators. + * Whether scrolled windows may use overlaid scrolling indicators. * If this is set to %FALSE, scrolled windows will have permanent * scrollbars. */ diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c index c1bf962c2b..0907ae2823 100644 --- a/gtk/gtksidebarrow.c +++ b/gtk/gtksidebarrow.c @@ -381,12 +381,12 @@ gtk_sidebar_row_reveal (GtkSidebarRow *self) void gtk_sidebar_row_hide (GtkSidebarRow *self, - gboolean inmediate) + gboolean immediate) { guint transition_duration; transition_duration = gtk_revealer_get_transition_duration (GTK_REVEALER (self->revealer)); - if (inmediate) + if (immediate) gtk_revealer_set_transition_duration (GTK_REVEALER (self->revealer), 0); gtk_revealer_set_reveal_child (GTK_REVEALER (self->revealer), FALSE); diff --git a/gtk/gtksidebarrowprivate.h b/gtk/gtksidebarrowprivate.h index 7ac9294e4f..bdec5cc01d 100644 --- a/gtk/gtksidebarrowprivate.h +++ b/gtk/gtksidebarrowprivate.h @@ -45,7 +45,7 @@ GtkSidebarRow *gtk_sidebar_row_clone (GtkSidebarRow *self); /* Use these methods instead of gtk_widget_hide/show to use an animation */ void gtk_sidebar_row_hide (GtkSidebarRow *self, - gboolean inmediate); + gboolean immediate); void gtk_sidebar_row_reveal (GtkSidebarRow *self); GtkWidget *gtk_sidebar_row_get_eject_button (GtkSidebarRow *self); diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 0927efba90..6cbea694de 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -86,7 +86,7 @@ * properties. * * Note that GtkSpinButton will by default make its entry large enough to - * accomodate the lower and upper bounds of the adjustment. If this is + * accommodate the lower and upper bounds of the adjustment. If this is * not desired, the automatic sizing can be turned off by explicitly * setting #GtkEditable::width-chars to a value != -1. * @@ -1447,7 +1447,7 @@ gtk_spin_button_insert_text (GtkEditable *editable, * I don't know if the positive sign always gets bogusly set to * a digit when the above Registry value is corrupted as * described. (In my test case, it got set to "8", and in the - * bug report above it presumably was set ot "0".) Probably it + * bug report above it presumably was set to "0".) Probably it * might get set to almost anything? So how to distinguish a * bogus value from some correct one for some locale? That is * probably hard, but at least we should filter out the diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index 5517c62220..75a2fa9e30 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -1761,7 +1761,7 @@ gtk_stack_set_interpolate_size (GtkStack *stack, * gtk_stack_get_interpolate_size: * @stack: A #GtkStack * - * Returns wether the #GtkStack is set up to interpolate between + * Returns whether the #GtkStack is set up to interpolate between * the sizes of children on page switch. * * Returns: %TRUE if child sizes are interpolated diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index 3a656b9c87..b599964137 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -265,7 +265,7 @@ gtk_statusbar_get_context_id (GtkStatusbar *statusbar, g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0); g_return_val_if_fail (context_description != NULL, 0); - /* we need to preserve namespaces on object datas */ + /* we need to preserve namespaces on object data */ string = g_strconcat ("gtk-status-bar-context:", context_description, NULL); id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (statusbar), string)); diff --git a/gtk/gtkstringfilter.c b/gtk/gtkstringfilter.c index ed76d258c6..a3213ad649 100644 --- a/gtk/gtkstringfilter.c +++ b/gtk/gtkstringfilter.c @@ -245,7 +245,7 @@ gtk_string_filter_class_init (GtkStringFilterClass *class) /** * GtkStringFilter:expression: (type GtkExpression) * - * The expression to evalute on item to get a string to compare with + * The expression to evaluate on item to get a string to compare with */ properties[PROP_EXPRESSION] = gtk_param_spec_expression ("expression", diff --git a/gtk/gtkstringsorter.c b/gtk/gtkstringsorter.c index 24244162a9..135fc542e3 100644 --- a/gtk/gtkstringsorter.c +++ b/gtk/gtkstringsorter.c @@ -289,7 +289,7 @@ gtk_string_sorter_class_init (GtkStringSorterClass *class) /** * GtkStringSorter:expression: (type GtkExpression) * - * The expression to evalute on item to get a string to compare with + * The expression to evaluate on item to get a string to compare with */ properties[PROP_EXPRESSION] = gtk_param_spec_expression ("expression", diff --git a/gtk/gtktexthistory.c b/gtk/gtktexthistory.c index c6a787654b..fc80b892a5 100644 --- a/gtk/gtktexthistory.c +++ b/gtk/gtktexthistory.c @@ -35,7 +35,7 @@ * Calling gtk_text_history_begin_irreversible_action() and * gtk_text_history_end_irreversible_action() can be used to denote a * section of operations that cannot be undone. This will cause all previous - * changes tracked by the GtkTextHistory to be discared. + * changes tracked by the GtkTextHistory to be discarded. */ typedef struct _Action Action; diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index abb316fd9c..232634f18d 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -2491,7 +2491,7 @@ gtk_text_iter_backward_text_chars (GtkTextIter *iter, * Moves @iter to the start of the next line. If the iter is already on the * last line of the buffer, moves the iter to the end of the current line. * If after the operation, the iter is at the end of the buffer and not - * dereferencable, returns %FALSE. Otherwise, returns %TRUE. + * dereferenceable, returns %FALSE. Otherwise, returns %TRUE. * * Returns: whether @iter can be dereferenced **/ diff --git a/gtk/gtktextlayoutprivate.h b/gtk/gtktextlayoutprivate.h index 2d563ae6ae..2f0c7122f1 100644 --- a/gtk/gtktextlayoutprivate.h +++ b/gtk/gtktextlayoutprivate.h @@ -109,7 +109,7 @@ struct _GtkTextLayout * i.e. pixels we should wrap to fit inside. */ int screen_width; - /* width/height of the total logical area being layed out */ + /* width/height of the total logical area being laid out */ int width; int height; diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 9a970e6dc3..727ed359da 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -496,7 +496,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) * GtkTextTag:underline-rgba: * * This property modifies the color of underlines. If not set, underlines - * will use the forground color. + * will use the foreground color. * * If #GtkTextTag:underline is set to %PANGO_UNDERLINE_ERROR, an alternate * color may be applied instead of the foreground. Setting this property @@ -531,7 +531,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) * GtkTextTag:strikethrough-rgba: * * This property modifies the color of strikeouts. If not set, strikeouts - * will use the forground color. + * will use the foreground color. */ g_object_class_install_property (object_class, PROP_STRIKETHROUGH_RGBA, diff --git a/gtk/gtktexttagprivate.h b/gtk/gtktexttagprivate.h index 28e4e1cce7..13a8338f7f 100644 --- a/gtk/gtktexttagprivate.h +++ b/gtk/gtktexttagprivate.h @@ -43,7 +43,7 @@ struct _GtkTextTagPrivate * Information for displaying text with this tag. The information * belows acts as an override on information specified by lower-priority * tags. If no value is specified, then the next-lower-priority tag - * on the text determins the value. The text widget itself provides + * on the text determines the value. The text widget itself provides * defaults if no tag specifies an override. */ diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 53fe1dfd1a..13938c4cb6 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -2510,7 +2510,7 @@ _gtk_text_view_scroll_to_iter (GtkTextView *text_view, * we're doing center alignment we align the center of the * character. * - * The differents cases handle on each direction: + * The different cases handle on each direction: * 1. cursor outside of the inner area define by within_margin * 2. if use_align == TRUE, alignment with xalign and yalign * 3. scrolling on the edges dependent of with_border @@ -7425,7 +7425,7 @@ gtk_text_view_start_selection_drag (GtkTextView *text_view, gtk_text_iter_order (&old_start, &old_end); /* move the front cursor, if the mouse is in front of the selection. Should the - * cursor however be inside the selection (this happens on tripple click) then we + * cursor however be inside the selection (this happens on triple click) then we * move the side which was last moved (current insert mark) */ if (gtk_text_iter_compare (&cursor, &old_start) <= 0 || (gtk_text_iter_compare (&cursor, &old_end) < 0 && @@ -9241,7 +9241,7 @@ ensure_child (GtkTextView *text_view, * * Adds @child at a fixed coordinate in the #GtkTextView's text window. The * @xpos and @ypos must be in buffer coordinates (see - * gtk_text_view_get_iter_location() to conver to buffer coordinates). + * gtk_text_view_get_iter_location() to convert to buffer coordinates). * * @child will scroll with the text view. * diff --git a/gtk/gtktrashmonitor.c b/gtk/gtktrashmonitor.c index 46b69f529e..a0788083a6 100644 --- a/gtk/gtktrashmonitor.c +++ b/gtk/gtktrashmonitor.c @@ -169,7 +169,7 @@ recompute_trash_state (GtkTrashMonitor *monitor) GFile *file; /* Rate limit the updates to not flood the gvfsd-trash when too many changes - * happenned in a short time. + * happened in a short time. */ if (monitor->timeout_id > 0) { diff --git a/gtk/gtktreeexpander.c b/gtk/gtktreeexpander.c index 5f53daed04..14992685f7 100644 --- a/gtk/gtktreeexpander.c +++ b/gtk/gtktreeexpander.c @@ -558,7 +558,7 @@ gtk_tree_expander_class_init (GtkTreeExpanderClass *klass) "listitem.toggle-expand", NULL); #if 0 - /* These can't be implementes yet. */ + /* These can't be implements yet. */ gtk_widget_class_add_binding (widget_class, GDK_KEY_BackSpace, 0, go_to_parent_row, NULL, NULL); gtk_widget_class_add_binding (widget_class, GDK_KEY_BackSpace, GDK_CONTROL_MASK, go_to_parent_row, NULL, NULL); #endif diff --git a/gtk/gtktreelistrowsorter.c b/gtk/gtktreelistrowsorter.c index 39cb1c6e55..c4f63c1280 100644 --- a/gtk/gtktreelistrowsorter.c +++ b/gtk/gtktreelistrowsorter.c @@ -184,7 +184,7 @@ gtk_tree_list_row_sort_keys_compare (gconstpointer a, if (result == GTK_ORDERING_EQUAL) { /* We must break ties here because if a ever gets a child, - * it would need to go right inbetween a and b. */ + * it would need to go right in between a and b. */ GtkTreeListRowCacheKey *cachea = cache_key_from_key (self, keysa[i]); GtkTreeListRowCacheKey *cacheb = cache_key_from_key (self, keysb[i]); if (gtk_tree_list_row_get_position (cachea->row) < gtk_tree_list_row_get_position (cacheb->row)) @@ -422,7 +422,7 @@ gtk_tree_list_row_sorter_compare (GtkSorter *sorter, result = gtk_sorter_compare (self->sorter, obj1, obj2); /* We must break ties here because if r1 ever gets a child, - * it would need to go right inbetween r1 and r2. */ + * it would need to go right in between r1 and r2. */ if (result == GTK_ORDERING_EQUAL) { if (gtk_tree_list_row_get_position (r1) < gtk_tree_list_row_get_position (r2)) diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index 09c574c3b9..a72c6ea476 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -69,7 +69,7 @@ * or its parents. Usually, having a dependency on the state of any child * node is not possible, unless references are taken on these explicitly. * When no such reference exists, no signals may be received for these child - * nodes (see reference couting rule number 3 in the #GtkTreeModel section). + * nodes (see reference counting rule number 3 in the #GtkTreeModel section). * * Determining the visibility state of a given node based on the state * of its child nodes is a frequently occurring use case. Therefore, diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 347fd68346..aac3ae5ad3 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -35,7 +35,7 @@ * @See_also: #GtkTreeModel * * The #GtkTreeStore object is a list model for use with a #GtkTreeView - * widget. It implements the #GtkTreeModel interface, and consequentially, + * widget. It implements the #GtkTreeModel interface, and consequently, * can use all of the methods available there. It also implements the * #GtkTreeSortable interface so it can be sorted by the view. Finally, * it also implements the tree @@ -2393,7 +2393,7 @@ gtk_tree_store_swap (GtkTreeStore *tree_store, b_prev = node_b->prev; b_next = node_b->next; - /* fix up links if the nodes are next to eachother */ + /* fix up links if the nodes are next to each other */ if (a_prev == node_b) a_prev = node_a; if (a_next == node_b) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 6e7de301cd..e9f6c12327 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -5442,8 +5442,8 @@ gtk_tree_view_forward_controller_key_pressed (GtkEventControllerKey *key, /* Initially, before the search window is visible, we pass the event to the * IM context of the search entry box. If it triggers a commit or a preedit, - * we then show the search window without loosing tree view focus. - * If the seach window is already visible, we forward the events to it, + * we then show the search window without losing tree view focus. + * If the search window is already visible, we forward the events to it, * keeping the focus on the tree view. */ if (gtk_widget_has_focus (GTK_WIDGET (tree_view)) @@ -8328,7 +8328,7 @@ gtk_tree_view_row_deleted (GtkTreeModel *model, /* Ensure we don't have a dangling pointer to a dead node */ ensure_unprelighted (tree_view); - /* Cancel editting if we've started */ + /* Cancel editing if we've started */ gtk_tree_view_stop_editing (tree_view, TRUE); /* If the cursor row got deleted, move the cursor to the next row */ diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h index 6cbe42dbe1..6c83cdbc66 100644 --- a/gtk/gtktreeviewcolumn.h +++ b/gtk/gtktreeviewcolumn.h @@ -40,7 +40,7 @@ typedef struct _GtkTreeViewColumn GtkTreeViewColumn; /** * GtkTreeViewColumnSizing: * @GTK_TREE_VIEW_COLUMN_GROW_ONLY: Columns only get bigger in reaction to changes in the model - * @GTK_TREE_VIEW_COLUMN_AUTOSIZE: Columns resize to be the optimal size everytime the model changes. + * @GTK_TREE_VIEW_COLUMN_AUTOSIZE: Columns resize to be the optimal size every time the model changes. * @GTK_TREE_VIEW_COLUMN_FIXED: Columns are a fixed numbers of pixels wide. * * The sizing method the column uses to determine its width. Please note diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 771bae0841..2f474bd4bf 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -9393,7 +9393,7 @@ gtk_widget_do_pick (GtkWidget *widget, * Widgets are however free to customize their picking algorithm. * * This function is used on the toplevel to determine the widget below - * the mouse cursor for purposes of hover hilighting and delivering events. + * the mouse cursor for purposes of hover highlighting and delivering events. * * Returns: (nullable) (transfer none): The widget descendant at the given * coordinate or %NULL if none. diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 5807205741..2f4d4ddab1 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -3548,7 +3548,7 @@ gtk_window_resize (GtkWindow *window, * excluding the widgets used in client side decorations; there is, * however, no guarantee that the result will be completely accurate * because client side decoration may include widgets that depend on - * the user preferences and that may not be visibile at the time you + * the user preferences and that may not be visible at the time you * call this function. * * The dimensions returned by this function are suitable for being diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c index e4006c36c3..1f91f67c2b 100644 --- a/gtk/inspector/inspect-button.c +++ b/gtk/inspector/inspect-button.c @@ -151,7 +151,7 @@ handle_event (GtkInspectorWindow *iw, GdkEvent *event) if (gtk_widget_get_root (widget) == GTK_ROOT (iw)) { - /* Don't hilight things in the inspector window */ + /* Don't highlight things in the inspector window */ break; } diff --git a/gtk/roaring/roaring.c b/gtk/roaring/roaring.c index d71ba88378..84a89e3fea 100644 --- a/gtk/roaring/roaring.c +++ b/gtk/roaring/roaring.c @@ -548,7 +548,7 @@ int32_t difference_vector16(const uint16_t *__restrict__ A, size_t s_a, return (int32_t)s_a; } // handle the leading zeroes, it is messy but it allows us to use the fast - // _mm_cmpistrm instrinsic safely + // _mm_cmpistrm intrinsic safely int32_t count = 0; if ((A[0] == 0) || (B[0] == 0)) { if ((A[0] == 0) && (B[0] == 0)) { @@ -4255,7 +4255,7 @@ void *container_clone(const void *container, uint8_t typecode) { case RUN_CONTAINER_TYPE_CODE: return run_container_clone((const run_container_t *)container); case SHARED_CONTAINER_TYPE_CODE: - printf("shared containers are not cloneable\n"); + printf("shared containers are not clonable\n"); assert(false); return NULL; default: @@ -5212,10 +5212,10 @@ void array_bitset_container_intersection(const array_container_t *src_1, * if (bitset_container_contains(src_2, key)) { * dst->array[newcard++] = key; * } - * but if the result is unpredictible, the processor generates + * but if the result is unpredictable, the processor generates * many mispredicted branches. - * Difference can be huge (from 3 cycles when predictible all the way - * to 16 cycles when unpredictible. + * Difference can be huge (from 3 cycles when predictable all the way + * to 16 cycles when unpredictable. * See * https://github.com/lemire/Code-used-on-Daniel-Lemire-s-blog/blob/master/extra/bitset/c/arraybitsetintersection.c */ @@ -10121,7 +10121,7 @@ bool roaring_bitmap_is_strict_subset(const roaring_bitmap_t *ra1, * all containers of respective type. * * <*_data> and <keys> are kept close together because they are not accessed - * during deserilization. This may reduce IO in case of large mmaped bitmaps. + * during deserilization. This may reduce IO in case of large mapped bitmaps. * All members have their native alignments during deserilization except <header>, * which is not guaranteed to be aligned by 4 bytes. */ diff --git a/gtk/roaring/roaring.h b/gtk/roaring/roaring.h index db04db5ae6..b3dc60de90 100644 --- a/gtk/roaring/roaring.h +++ b/gtk/roaring/roaring.h @@ -2706,8 +2706,8 @@ void run_container_smart_append_exclusive(run_container_t *src, /** * The new container consists of a single run [start,stop). -* It is required that stop>start, the caller is responsability for this check. -* It is required that stop <= (1<<16), the caller is responsability for this check. +* It is required that stop>start, the caller is responsibility for this check. +* It is required that stop <= (1<<16), the caller is responsibility for this check. * The cardinality of the created container is stop - start. * Returns NULL on failure */ @@ -2921,7 +2921,7 @@ void *convert_run_optimize(void *c, uint8_t typecode_original, */ /* If a conversion occurs, the caller is responsible to free the original * container and - * he becomes reponsible to free the new one. */ + * he becomes responsible to free the new one. */ void *convert_run_to_efficient_container(run_container_t *c, uint8_t *typecode_after); // like convert_run_to_efficient_container but frees the old result if needed @@ -3732,7 +3732,7 @@ static inline uint8_t get_container_type(const void *container, uint8_t type) { /** * Copies a container, requires a typecode. This allocates new memory, caller * is responsible for deallocation. If the container is not shared, then it is - * physically cloned. Sharable containers are not cloneable. + * physically cloned. Shareable containers are not clonable. */ void *container_clone(const void *container, uint8_t typecode); diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 5b3f58d013..0264c0bbbb 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -42,7 +42,7 @@ dnd { These wildcard seems unavoidable, need to investigate. Wildcards are bad and troublesome, use them with care, or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. + Every time a wildcard is used a kitten dies, painfully. */ spinner:disabled, @@ -489,7 +489,7 @@ button { @at-root %button_basic_flat, &.flat { @include button(undecorated); - // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set + // to avoid adjacent buttons borders clashing when transitioning, the transition on the normal state is set // to none, while it's added back in the hover state, so the button decoration will fade in on hover, but // it won't fade out when the pointer leave the button allocation area. To make the transition more evident // in this case the duration is increased. @@ -777,7 +777,7 @@ button { } %needs_attention { - // the dot is drawn by using two radial gradient, the first one is the actuall dot, the other + // the dot is drawn by using two radial gradient, the first one is the actual dot, the other // simulates the shadow labels and icons normally have in buttons. animation: needs_attention 150ms ease-in; @@ -2712,7 +2712,7 @@ scale { } > trough > slider { - &:dir(ltr), &:dir(rtl) { // specificity bumb + &:dir(ltr), &:dir(rtl) { // specificity bump &:hover, &:backdrop, &:disabled, &:backdrop:disabled, & { margin-bottom: -15px; margin-top: 6px; @@ -3528,7 +3528,7 @@ paned { -gtk-icon-source: none; // defeats the ugly default handle decoration border-style: none; // just to be sure background-color: transparent; - // workaround, using background istead of a border since the border will get rendered twice (?) + // workaround, using background instead of a border since the border will get rendered twice (?) background-image: image($borders_color); background-size: 1px 1px; @@ -3630,7 +3630,7 @@ tooltip { // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details. background-color: transparentize(black, 0.2); background-clip: padding-box; - border: 1px solid $tooltip_borders_color; // this suble border is meant to + border: 1px solid $tooltip_borders_color; // this subtle border is meant to // not make the tooltip melt with // very dark backgrounds color: white; diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss index ef4ea6abd5..c4603efde7 100644 --- a/gtk/theme/Adwaita/_drawing.scss +++ b/gtk/theme/Adwaita/_drawing.scss @@ -134,7 +134,7 @@ @function _button_hilight_color($c) { // -// calculate the right top hilight color for buttons +// calculate the right top highlight color for buttons // // $c: base color; // @@ -163,7 +163,7 @@ // backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active, // osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated // -// This mixin sets the $button_fill global variable which containts the button background-image +// This mixin sets the $button_fill global variable which contains the button background-image // $_hilight_color: _button_hilight_color($c); $_button_edge: if($edge == none, none, _widget_edge($edge)); |