AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 13:11:13 +00:00
Code Issues Projects Releases Wiki Activity

Small fixups

Browse Source 
Trying to get the ci style test to pass.
This commit is contained in:
Matthias Clasen 2020-02-25 20:57:20 -05:00
parent b5bacb3be6
commit 37a2cae10e
7 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/inspector/prop-editor.c
View File

@ -1022,7 +1022,7 @@ property_editor (GObject *object,
"vexpand", TRUE,
"hscrollbar-policy", GTK_POLICY_NEVER,
"vscrollbar-policy", GTK_POLICY_NEVER,
NULL);
NULL);
g_object_get (object, spec->name, &model, NULL);

1
gtk/inspector/recorder.c
View File

@ -1138,7 +1138,6 @@ gtk_inspector_recorder_recordings_list_create_widget (gpointer item,
gtk_widget_set_margin_top (widget, 6);
gtk_widget_set_margin_bottom (widget, 6);
return widget;
}

8
gtk/tools/gtk-builder-tool-simplify.c
View File

@ -727,8 +727,8 @@ maybe_rename_property (Element *element, MyParserData *data)
const char *alt_names[3];
} props[] = {
{ "GtkPopover", "modal", GTK_TYPE_POPOVER, PROP_KIND_OBJECT, "autohide", { NULL, NULL, NULL } },
{ "GtkWidget", "expand", GTK_TYPE_WIDGET, PROP_KIND_OBJECT, "hexpand", { "vexpand", NULL, NULL } },
{ "GtkWidget", "margin", GTK_TYPE_WIDGET, PROP_KIND_OBJECT, "margin-left", { "margin-top", "margin-right", "margin-bottom" } },
{ "GtkWidget", "expand", GTK_TYPE_WIDGET, PROP_KIND_OBJECT, "hexpand", { "vexpand", NULL, NULL } },
{ "GtkWidget", "margin", GTK_TYPE_WIDGET, PROP_KIND_OBJECT, "margin-left", { "margin-top", "margin-right", "margin-bottom" } },
};
int i, k, l;
PropKind kind;
@ -772,8 +772,8 @@ maybe_rename_property (Element *element, MyParserData *data)
elt = g_new0 (Element, 1);
elt->parent = element->parent;
elt->element_name = g_strdup (element->element_name);
elt->attribute_names = g_strdupv ((char **)element->attribute_names);
elt->attribute_values = g_strdupv ((char **)element->attribute_values);
elt->attribute_names = g_strdupv ((char **) element->attribute_names);
elt->attribute_values = g_strdupv ((char **) element->attribute_values);
elt->data = g_strdup (element->data);
g_free (elt->attribute_values[prop_name_index]);

2
tests/testadjustsize.c
View File

@ -292,7 +292,7 @@ open_margin_window (void)
{
GtkWidget *box;
int i;
const char * margins[] = {
const char *margins[] = {
"margin-start",
"margin-end",
"margin-top",

8
tests/testframe.c
View File

@ -153,10 +153,10 @@ int main (int argc, char **argv)
g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
gtk_widget_set_margin_start (vbox, 12);
gtk_widget_set_margin_end (vbox, 12);
gtk_widget_set_margin_top (vbox, 12);
gtk_widget_set_margin_bottom (vbox, 12);
gtk_widget_set_margin_start (GTK_WIDGET (vbox), 12);
gtk_widget_set_margin_end (GTK_WIDGET (vbox), 12);
gtk_widget_set_margin_top (GTK_WIDGET (vbox), 12);
gtk_widget_set_margin_bottom (GTK_WIDGET (vbox), 12);
gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (vbox));
frame = GTK_FRAME (gtk_frame_new ("Test GtkFrame"));

1
tests/testoverlay.c
View File

@ -84,7 +84,6 @@ test_nonzerox (void)
gtk_widget_set_margin_top (child, 3);
gtk_widget_set_margin_bottom (child, 3);
return win;
}

6
testsuite/gtk/notify.c
View File

@ -492,12 +492,12 @@ test_type (gconstpointer data)
/* These are special */
if (g_type_is_a (pspec->owner_type, GTK_TYPE_WIDGET) &&
(g_str_equal (pspec->name, "has-focus") ||
g_str_equal (pspec->name, "has-default") ||
(g_str_equal (pspec->name, "has-focus") ||
g_str_equal (pspec->name, "has-default") ||
g_str_equal (pspec->name, "is-focus") ||
g_str_equal (pspec->name, "hexpand") ||
g_str_equal (pspec->name, "vexpand")))
continue;
continue;
if (pspec->owner_type == GTK_TYPE_ENTRY &&
g_str_equal (pspec->name, "im-module"))