diff --git a/demos/constraint-editor/constraint-editor-window.c b/demos/constraint-editor/constraint-editor-window.c index 823deb3c96a42cb3d7c58dd7beea83147f63e05c..9798ac065d04eb4b4e3e0b7547cd32673bb59c64 100644 --- a/demos/constraint-editor/constraint-editor-window.c +++ b/demos/constraint-editor/constraint-editor-window.c @@ -568,7 +568,8 @@ create_widget_func (gpointer item, ConstraintEditorWindow *win = user_data; const char *name; char *freeme = NULL; - GtkWidget *row, *box, *label, *button; + GtkWidget *row, *box, *button; + GtkLabel *label; if (GTK_IS_WIDGET (item)) name = gtk_widget_get_name (GTK_WIDGET (item)); @@ -588,10 +589,10 @@ create_widget_func (gpointer item, label, "label", G_BINDING_DEFAULT); g_object_set (label, "margin", 10, NULL); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_widget_set_hexpand (label, TRUE); + gtk_label_set_xalign (label, 0.0); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); gtk_container_add (GTK_CONTAINER (row), box); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); if (GTK_IS_CONSTRAINT (item) || GTK_IS_CONSTRAINT_GUIDE (item)) { diff --git a/demos/constraint-editor/constraint-editor.c b/demos/constraint-editor/constraint-editor.c index 62af6e356fccd873be47c27ef47ef490ee1a97c6..88ff3135ec803199b887a56c0722f879968b8372 100644 --- a/demos/constraint-editor/constraint-editor.c +++ b/demos/constraint-editor/constraint-editor.c @@ -34,7 +34,7 @@ struct _ConstraintEditor GtkWidget *multiplier; GtkWidget *constant; GtkWidget *strength; - GtkWidget *preview; + GtkLabel *preview; GtkWidget *button; GtkConstraint *constraint; @@ -433,7 +433,7 @@ update_preview (ConstraintEditor *editor) else g_string_append_printf (str, "%g", c); - gtk_label_set_label (GTK_LABEL (editor->preview), str->str); + gtk_label_set_label (editor->preview, str->str); g_string_free (str, TRUE); } diff --git a/demos/constraint-editor/constraint-view.c b/demos/constraint-editor/constraint-view.c index 982338c93d2f20757bd885a4b796206f4680c5b2..c38834098cf3372bb18a193abaeb5030cfb808c8 100644 --- a/demos/constraint-editor/constraint-view.c +++ b/demos/constraint-editor/constraint-view.c @@ -210,13 +210,13 @@ constraint_view_add_child (ConstraintView *view, const char *name) { GtkWidget *frame; - GtkWidget *label; + GtkLabel *label; label = gtk_label_new (name); frame = gtk_frame_new (NULL); gtk_style_context_add_class (gtk_widget_get_style_context (frame), "child"); gtk_widget_set_name (frame, name); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_widget_set_parent (frame, GTK_WIDGET (view)); update_weak_position (view, frame, 100, 100); @@ -236,7 +236,7 @@ constraint_view_add_guide (ConstraintView *view, { GtkConstraintLayout *layout; GtkWidget *frame; - GtkWidget *label; + GtkLabel *label; const char *name; GtkConstraint *constraint; struct { @@ -259,7 +259,7 @@ constraint_view_add_guide (ConstraintView *view, frame = gtk_frame_new (NULL); gtk_style_context_add_class (gtk_widget_get_style_context (frame), "guide"); g_object_set_data (G_OBJECT (frame), "internal", "yes"); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_widget_insert_after (frame, GTK_WIDGET (view), NULL); g_object_set_data (G_OBJECT (guide), "frame", frame); diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c index 92034b5e43cf621c13bdd3d603e92ca335efb64d..f26b1a9703f9aee2ed2998fde1e48d23b052672e 100644 --- a/demos/gtk-demo/application.c +++ b/demos/gtk-demo/application.c @@ -11,7 +11,7 @@ G_DEFINE_TYPE (DemoApplication, demo_application, GTK_TYPE_APPLICATION) typedef struct { GtkApplicationWindow parent_instance; - GtkWidget *message; + GtkLabel *message; GtkWidget *infobar; GtkWidget *status; GtkWidget *menutool; @@ -65,7 +65,7 @@ show_action_infobar (GSimpleAction *action, text = g_strdup_printf ("You activated radio action: \"%s\".\n" "Current value: %s", name, value); - gtk_label_set_text (GTK_LABEL (window->message), text); + gtk_label_set_text (window->message, text); gtk_widget_show (window->infobar); g_free (text); } diff --git a/demos/gtk-demo/application_demo.c b/demos/gtk-demo/application_demo.c index 8f365684644c719e91ea1c143a0aaff1d19685e0..8dbd13c543608343c5d62ff9528a625a8a3a13b8 100644 --- a/demos/gtk-demo/application_demo.c +++ b/demos/gtk-demo/application_demo.c @@ -12,7 +12,7 @@ #include static gboolean name_seen; -static GtkWidget *placeholder; +static GtkLabel *placeholder; static void on_name_appeared (GDBusConnection *connection, @@ -33,7 +33,7 @@ on_name_vanished (GDBusConnection *connection, if (placeholder) { - gtk_widget_destroy (placeholder); + gtk_widget_destroy (GTK_WIDGET (placeholder)); g_object_unref (placeholder); placeholder = NULL; } @@ -91,5 +91,5 @@ do_application_demo (GtkWidget *toplevel) NULL, NULL); } - return placeholder; + return GTK_WIDGET (placeholder); } diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c index 3b1405932caba4e7d4058a10be7bf8582d861e73..2a02570c7a4218c4ec913f16c87abfd3fe4db86f 100644 --- a/demos/gtk-demo/assistant.c +++ b/demos/gtk-demo/assistant.c @@ -91,18 +91,20 @@ on_entry_changed (GtkWidget *widget, gpointer data) static void create_page1 (GtkWidget *assistant) { - GtkWidget *box, *label, *entry; + GtkWidget *box; + GtkEntry *entry; + GtkLabel *label; box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); g_object_set (box, "margin", 12, NULL); label = gtk_label_new ("You must fill out this entry to continue:"); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); entry = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); - gtk_widget_set_valign (entry, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (box), entry); + gtk_entry_set_activates_default (entry, TRUE); + gtk_widget_set_valign (GTK_WIDGET (entry), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (entry)); g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (on_entry_changed), assistant); @@ -114,15 +116,16 @@ create_page1 (GtkWidget *assistant) static void create_page2 (GtkWidget *assistant) { - GtkWidget *box, *checkbutton; + GtkWidget *box; + GtkCheckButton *checkbutton; box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); g_object_set (box, "margin", 12, NULL); checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue " "even if you do not check this"); - gtk_widget_set_valign (checkbutton, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (box), checkbutton); + gtk_widget_set_valign (GTK_WIDGET (checkbutton), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (checkbutton)); gtk_assistant_append_page (GTK_ASSISTANT (assistant), box); gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE); @@ -132,15 +135,15 @@ create_page2 (GtkWidget *assistant) static void create_page3 (GtkWidget *assistant) { - GtkWidget *label; + GtkLabel *label; label = gtk_label_new ("This is a confirmation page, press 'Apply' to apply changes"); - gtk_widget_show (label); - gtk_assistant_append_page (GTK_ASSISTANT (assistant), label); - gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), label, GTK_ASSISTANT_PAGE_CONFIRM); - gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE); - gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, "Confirmation"); + gtk_widget_show (GTK_WIDGET (label)); + gtk_assistant_append_page (GTK_ASSISTANT (assistant), GTK_WIDGET (label)); + gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), GTK_WIDGET (label), GTK_ASSISTANT_PAGE_CONFIRM); + gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), GTK_WIDGET (label), TRUE); + gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), GTK_WIDGET (label), "Confirmation"); } static void diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c index c8e5323bab43c167ef030d4bb81177fcb3f5f647..dfd825524ed34e59a54f9d45a78bf5561e8ce79d 100644 --- a/demos/gtk-demo/clipboard.c +++ b/demos/gtk-demo/clipboard.c @@ -262,9 +262,10 @@ do_clipboard (GtkWidget *do_widget) if (!window) { GtkWidget *vbox, *hbox; - GtkWidget *label; - GtkWidget *entry, *button; - GtkWidget *image; + GtkLabel *label; + GtkEntry *entry; + GtkWidget *button; + GtkImage *image; GtkGesture *gesture; GActionEntry entries[] = { { "copy", copy_image, NULL, NULL, NULL }, @@ -290,7 +291,7 @@ do_clipboard (GtkWidget *do_widget) label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (hbox, "margin", 8, NULL); @@ -298,7 +299,7 @@ do_clipboard (GtkWidget *do_widget) /* Create the first entry */ entry = gtk_entry_new (); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); /* Create the button */ button = gtk_button_new_with_mnemonic (_("_Copy")); @@ -307,7 +308,7 @@ do_clipboard (GtkWidget *do_widget) G_CALLBACK (copy_button_clicked), entry); label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (hbox, "margin", 8, NULL); @@ -315,7 +316,7 @@ do_clipboard (GtkWidget *do_widget) /* Create the second entry */ entry = gtk_entry_new (); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); /* Create the button */ button = gtk_button_new_with_mnemonic (_("_Paste")); @@ -324,7 +325,7 @@ do_clipboard (GtkWidget *do_widget) G_CALLBACK (paste_button_clicked), entry); label = gtk_label_new ("Images can be transferred via the clipboard, too"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (hbox, "margin", 8, NULL); @@ -332,63 +333,63 @@ do_clipboard (GtkWidget *do_widget) /* Create the first image */ image = gtk_image_new_from_icon_name ("dialog-warning"); - gtk_image_set_pixel_size (GTK_IMAGE (image), 48); - gtk_container_add (GTK_CONTAINER (hbox), image); + gtk_image_set_pixel_size (image, 48); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (image)); /* make image a drag source */ source = gtk_drag_source_new (); g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL); g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image); - gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source)); + gtk_widget_add_controller (GTK_WIDGET (image), GTK_EVENT_CONTROLLER (source)); /* accept drops on image */ formats = gdk_content_formats_new_for_gtype (GDK_TYPE_TEXTURE); dest = gtk_drop_target_new (formats, GDK_ACTION_COPY); gdk_content_formats_unref (formats); g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), image); - gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest)); + gtk_widget_add_controller (GTK_WIDGET (image), GTK_EVENT_CONTROLLER (dest)); /* context menu on image */ gesture = gtk_gesture_click_new (); gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY); g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image); - gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture)); + gtk_widget_add_controller (GTK_WIDGET (image), GTK_EVENT_CONTROLLER (gesture)); actions = G_ACTION_GROUP (g_simple_action_group_new ()); g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS (entries), image); - gtk_widget_insert_action_group (image, "clipboard", actions); + gtk_widget_insert_action_group (GTK_WIDGET (image), "clipboard", actions); g_object_unref (actions); /* Create the second image */ image = gtk_image_new_from_icon_name ("process-stop"); - gtk_image_set_pixel_size (GTK_IMAGE (image), 48); - gtk_container_add (GTK_CONTAINER (hbox), image); + gtk_image_set_pixel_size (image, 48); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (image)); /* make image a drag source */ source = gtk_drag_source_new (); g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL); g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image); - gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source)); + gtk_widget_add_controller (GTK_WIDGET (image), GTK_EVENT_CONTROLLER (source)); /* accept drops on image */ formats = gdk_content_formats_new_for_gtype (GDK_TYPE_TEXTURE); dest = gtk_drop_target_new (formats, GDK_ACTION_COPY); gdk_content_formats_unref (formats); g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), image); - gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest)); + gtk_widget_add_controller (GTK_WIDGET (image), GTK_EVENT_CONTROLLER (dest)); /* context menu on image */ gesture = gtk_gesture_click_new (); gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY); g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image); - gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture)); + gtk_widget_add_controller (GTK_WIDGET (image), GTK_EVENT_CONTROLLER (gesture)); actions = G_ACTION_GROUP (g_simple_action_group_new ()); g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS (entries), image); - gtk_widget_insert_action_group (image, "clipboard", actions); + gtk_widget_insert_action_group (GTK_WIDGET (image), "clipboard", actions); g_object_unref (actions); } diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c index 5ebdfd6a127737d2833222c8db2b5b4600aa2a50..b7eb7a5f698f1c5c230fc3553b6236e06428bfec 100644 --- a/demos/gtk-demo/colorsel.c +++ b/demos/gtk-demo/colorsel.c @@ -44,7 +44,7 @@ static void change_color_callback (GtkWidget *button, gpointer data) { - GtkWidget *dialog; + GtkColorChooserDialog *dialog; dialog = gtk_color_chooser_dialog_new ("Changing color", GTK_WINDOW (window)); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); @@ -53,7 +53,7 @@ change_color_callback (GtkWidget *button, g_signal_connect (dialog, "response", G_CALLBACK (response_cb), NULL); - gtk_widget_show (dialog); + gtk_widget_show (GTK_WIDGET (dialog)); } GtkWidget * diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c index bfbda6079188a391c551b7536014eb1c714f2b24..ea89dd193a14864921ca4b1daa2ad8f2843b68fb 100644 --- a/demos/gtk-demo/combobox.c +++ b/demos/gtk-demo/combobox.c @@ -211,12 +211,12 @@ is_capital_sensitive (GtkCellLayout *cell_layout, } static void -fill_combo_entry (GtkWidget *combo) +fill_combo_entry (GtkComboBoxText *combo) { - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "One"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Two"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "2\302\275"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Three"); + gtk_combo_box_text_append_text (combo, "One"); + gtk_combo_box_text_append_text (combo, "Two"); + gtk_combo_box_text_append_text (combo, "2\302\275"); + gtk_combo_box_text_append_text (combo, "Three"); } @@ -302,7 +302,10 @@ GtkWidget * do_combobox (GtkWidget *do_widget) { static GtkWidget *window = NULL; - GtkWidget *vbox, *frame, *box, *combo, *entry; + GtkWidget *vbox, *frame, *box; + GtkComboBox *combo; + GtkComboBoxText *combo_text; + GtkEntry *entry; GtkTreeModel *model; GtkCellRenderer *renderer; GtkTreePath *path; @@ -335,7 +338,7 @@ do_combobox (GtkWidget *do_widget) model = create_icon_store (); combo = gtk_combo_box_new_with_model (model); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (box), combo); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo)); renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE); @@ -359,10 +362,10 @@ do_combobox (GtkWidget *do_widget) set_sensitive, NULL, NULL); - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), + gtk_combo_box_set_row_separator_func (combo, is_separator, NULL, NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + gtk_combo_box_set_active (combo, 0); /* A combobox demonstrating trees. */ @@ -376,7 +379,7 @@ do_combobox (GtkWidget *do_widget) model = create_capital_store (); combo = gtk_combo_box_new_with_model (model); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (box), combo); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo)); renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE); @@ -391,7 +394,7 @@ do_combobox (GtkWidget *do_widget) path = gtk_tree_path_new_from_indices (0, 8, -1); gtk_tree_model_get_iter (model, &iter, path); gtk_tree_path_free (path); - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter); + gtk_combo_box_set_active_iter (combo, &iter); /* A GtkComboBoxEntry with validation */ frame = gtk_frame_new ("Editable"); @@ -401,15 +404,15 @@ do_combobox (GtkWidget *do_widget) g_object_set (box, "margin", 5, NULL); gtk_container_add (GTK_CONTAINER (frame), box); - combo = gtk_combo_box_text_new_with_entry (); - fill_combo_entry (combo); - gtk_container_add (GTK_CONTAINER (box), combo); + combo_text = gtk_combo_box_text_new_with_entry (); + fill_combo_entry (combo_text); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo_text)); entry = g_object_new (TYPE_MASK_ENTRY, NULL); MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$"; - gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo))); - gtk_container_add (GTK_CONTAINER (combo), entry); + gtk_container_remove (GTK_CONTAINER (combo_text), gtk_bin_get_child (GTK_BIN (combo))); + gtk_container_add (GTK_CONTAINER (combo_text), GTK_WIDGET (entry)); /* A combobox with string IDs */ frame = gtk_frame_new ("String IDs"); @@ -419,17 +422,17 @@ do_combobox (GtkWidget *do_widget) g_object_set (box, "margin", 5, NULL); gtk_container_add (GTK_CONTAINER (frame), box); - combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "when-active", "Visible when active"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "always", "Always visible"); - gtk_container_add (GTK_CONTAINER (box), combo); + combo_text = gtk_combo_box_text_new (); + gtk_combo_box_text_append (combo_text, "never", "Not visible"); + gtk_combo_box_text_append (combo_text, "when-active", "Visible when active"); + gtk_combo_box_text_append (combo_text, "always", "Always visible"); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo_text)); entry = gtk_entry_new (); - g_object_bind_property (combo, "active-id", + g_object_bind_property (combo_text, "active-id", entry, "text", G_BINDING_BIDIRECTIONAL); - gtk_container_add (GTK_CONTAINER (box), entry); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (entry)); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/css_shadows.c b/demos/gtk-demo/css_shadows.c index 318141c896ccabd0aef6446a2359d23f6b6218a3..8741d056b43bc5e6b2a4dd781501b5a5523e2b2d 100644 --- a/demos/gtk-demo/css_shadows.c +++ b/demos/gtk-demo/css_shadows.c @@ -58,26 +58,26 @@ apply_css (GtkWidget *widget, GtkStyleProvider *provider) gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider); } -GtkWidget * +GtkToolbar * create_toolbar (void) { - GtkWidget *toolbar; + GtkToolbar *toolbar; GtkToolItem *item; toolbar = gtk_toolbar_new (); - gtk_widget_set_valign (toolbar, GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (toolbar), GTK_ALIGN_CENTER); item = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "go-next"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); item = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "go-previous"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); item = gtk_tool_button_new (NULL, "Hello World"); gtk_tool_item_set_is_important (item, TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); return toolbar; } @@ -90,6 +90,7 @@ do_css_shadows (GtkWidget *do_widget) if (!window) { GtkWidget *paned, *container, *child; + GtkToolbar *toolbar; GtkStyleProvider *provider; GtkTextBuffer *text; GBytes *bytes; @@ -104,8 +105,8 @@ do_css_shadows (GtkWidget *do_widget) paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL); gtk_container_add (GTK_CONTAINER (window), paned); - child = create_toolbar (); - gtk_container_add (GTK_CONTAINER (paned), child); + toolbar = create_toolbar (); + gtk_container_add (GTK_CONTAINER (paned), GTK_WIDGET (toolbar)); text = gtk_text_buffer_new (NULL); gtk_text_buffer_create_tag (text, diff --git a/demos/gtk-demo/demotaggedentry.c b/demos/gtk-demo/demotaggedentry.c index dcba5a435d146328ac98c390eecd9098f5fbe135..0cc7eaa53ac1edac722ec72be6a36b566e150e0d 100644 --- a/demos/gtk-demo/demotaggedentry.c +++ b/demos/gtk-demo/demotaggedentry.c @@ -27,7 +27,7 @@ typedef struct { GtkWidget *box; - GtkWidget *entry; + GtkText *entry; } DemoTaggedEntryPrivate; static void demo_tagged_entry_editable_init (GtkEditableInterface *iface); @@ -45,11 +45,11 @@ demo_tagged_entry_init (DemoTaggedEntry *entry) gtk_widget_set_parent (priv->box, GTK_WIDGET (entry)); priv->entry = gtk_text_new (); - gtk_widget_set_hexpand (priv->entry, TRUE); - gtk_widget_set_vexpand (priv->entry, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (priv->entry), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (priv->entry), TRUE); gtk_widget_set_hexpand (priv->box, FALSE); gtk_widget_set_vexpand (priv->box, FALSE); - gtk_container_add (GTK_CONTAINER (priv->box), priv->entry); + gtk_container_add (GTK_CONTAINER (priv->box), GTK_WIDGET (priv->entry)); gtk_editable_init_delegate (GTK_EDITABLE (entry)); } @@ -62,7 +62,7 @@ demo_tagged_entry_dispose (GObject *object) if (priv->entry) gtk_editable_finish_delegate (GTK_EDITABLE (entry)); - g_clear_pointer (&priv->entry, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->entry, gtk_widget_unparent); g_clear_pointer (&priv->box, gtk_widget_unparent); G_OBJECT_CLASS (demo_tagged_entry_parent_class)->dispose (object); @@ -135,7 +135,7 @@ demo_tagged_entry_grab_focus (GtkWidget *widget) DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget); DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry); - return gtk_widget_grab_focus (priv->entry); + return gtk_widget_grab_focus (GTK_WIDGET (priv->entry)); } static void @@ -221,7 +221,7 @@ struct _DemoTaggedEntryTag { GtkWidget parent; GtkWidget *box; - GtkWidget *label; + GtkLabel *label; GtkWidget *button; gboolean has_close_button; @@ -268,7 +268,7 @@ demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag) tag->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_parent (tag->box, GTK_WIDGET (tag)); tag->label = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (tag->box), tag->label); + gtk_container_add (GTK_CONTAINER (tag->box), GTK_WIDGET (tag->label)); gesture = gtk_gesture_click_new (); g_signal_connect (gesture, "released", G_CALLBACK (on_released), tag); @@ -430,7 +430,7 @@ demo_tagged_entry_tag_get_label (DemoTaggedEntryTag *tag) { g_return_val_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag), NULL); - return gtk_label_get_label (GTK_LABEL (tag->label)); + return gtk_label_get_label (tag->label); } void @@ -439,7 +439,7 @@ demo_tagged_entry_tag_set_label (DemoTaggedEntryTag *tag, { g_return_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag)); - gtk_label_set_label (GTK_LABEL (tag->label), label); + gtk_label_set_label (tag->label, label); } static void @@ -465,11 +465,11 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag, } else if (has_close_button && tag->button == NULL) { - GtkWidget *image; + GtkImage *image; image = gtk_image_new_from_icon_name ("window-close-symbolic"); tag->button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (tag->button), image); + gtk_container_add (GTK_CONTAINER (tag->button), GTK_WIDGET (image)); gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER); gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER); gtk_button_set_relief (GTK_BUTTON (tag->button), GTK_RELIEF_NONE); diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c index 70294af82fd92afdc3754f7a133c7a112fd60085..babe8eb8b641ae10b0460601102c4952726d0428 100644 --- a/demos/gtk-demo/dialog.c +++ b/demos/gtk-demo/dialog.c @@ -7,8 +7,8 @@ #include static GtkWidget *window = NULL; -static GtkWidget *entry1 = NULL; -static GtkWidget *entry2 = NULL; +static GtkEntry *entry1 = NULL; +static GtkEntry *entry2 = NULL; static void message_dialog_clicked (GtkButton *button, @@ -37,11 +37,11 @@ interactive_dialog_clicked (GtkButton *button, GtkWidget *content_area; GtkWidget *dialog; GtkWidget *hbox; - GtkWidget *image; + GtkImage *image; GtkWidget *table; - GtkWidget *local_entry1; - GtkWidget *local_entry2; - GtkWidget *label; + GtkEntry *local_entry1; + GtkEntry *local_entry2; + GtkLabel *label; gint response; dialog = gtk_dialog_new_with_buttons ("Interactive Dialog", @@ -59,27 +59,27 @@ interactive_dialog_clicked (GtkButton *button, gtk_container_add (GTK_CONTAINER (content_area), hbox); image = gtk_image_new_from_icon_name ("dialog-question"); - gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE); - gtk_container_add (GTK_CONTAINER (hbox), image); + gtk_image_set_icon_size (image, GTK_ICON_SIZE_LARGE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (image)); table = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (table), 4); gtk_grid_set_column_spacing (GTK_GRID (table), 4); gtk_container_add (GTK_CONTAINER (hbox), table); label = gtk_label_new_with_mnemonic ("_Entry 1"); - gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 0, 0, 1, 1); local_entry1 = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (local_entry1), gtk_editable_get_text (GTK_EDITABLE (entry1))); - gtk_grid_attach (GTK_GRID (table), local_entry1, 1, 0, 1, 1); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (local_entry1), 1, 0, 1, 1); + gtk_label_set_mnemonic_widget (label, GTK_WIDGET (local_entry1)); label = gtk_label_new_with_mnemonic ("E_ntry 2"); - gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 0, 1, 1, 1); local_entry2 = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (local_entry2), gtk_editable_get_text (GTK_EDITABLE (entry2))); - gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (local_entry2), 1, 1, 1, 1); + gtk_label_set_mnemonic_widget (label, GTK_WIDGET (local_entry2)); response = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -101,7 +101,7 @@ do_dialog (GtkWidget *do_widget) GtkWidget *hbox; GtkWidget *button; GtkWidget *table; - GtkWidget *label; + GtkLabel *label; if (!window) { @@ -129,7 +129,7 @@ do_dialog (GtkWidget *do_widget) G_CALLBACK (message_dialog_clicked), NULL); gtk_container_add (GTK_CONTAINER (hbox), button); - gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); /* Interactive dialog*/ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); @@ -148,17 +148,17 @@ do_dialog (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (hbox), table); label = gtk_label_new_with_mnemonic ("_Entry 1"); - gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 0, 0, 1, 1); entry1 = gtk_entry_new (); - gtk_grid_attach (GTK_GRID (table), entry1, 1, 0, 1, 1); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (entry1), 1, 0, 1, 1); + gtk_label_set_mnemonic_widget (label, GTK_WIDGET (entry1)); label = gtk_label_new_with_mnemonic ("E_ntry 2"); - gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 0, 1, 1, 1); entry2 = gtk_entry_new (); - gtk_grid_attach (GTK_GRID (table), entry2, 1, 1, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (entry2), 1, 1, 1, 1); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/dnd.c b/demos/gtk-demo/dnd.c index c768398be5e1860452e9a568632c9a5de30d0284..5615ad25cd813eaf58ee02f7b81878b8e2534ba7 100644 --- a/demos/gtk-demo/dnd.c +++ b/demos/gtk-demo/dnd.c @@ -76,7 +76,7 @@ deserialize_widget (GtkDemoWidget *demo) if (demo->type == GTK_TYPE_LABEL) { - widget = gtk_label_new (demo->text); + widget = GTK_WIDGET (gtk_label_new (demo->text)); } else if (demo->type == GTK_TYPE_SPINNER) { @@ -98,10 +98,10 @@ new_label_cb (GtkWidget *button, gpointer data) { GtkFixed *fixed = data; - GtkWidget *widget; + GtkLabel *widget; widget = gtk_label_new ("Label"); - gtk_fixed_put (fixed, widget, pos_x, pos_y); + gtk_fixed_put (fixed, GTK_WIDGET (widget), pos_x, pos_y); gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER))); } @@ -205,13 +205,13 @@ static void edit_label_done (GtkWidget *entry, gpointer data) { GtkWidget *fixed = gtk_widget_get_parent (entry); - GtkWidget *label; + GtkLabel *label; int x, y; gtk_fixed_get_child_position (GTK_FIXED (fixed), entry, &x, &y); - label = GTK_WIDGET (g_object_get_data (G_OBJECT (entry), "label")); - gtk_label_set_text (GTK_LABEL (label), gtk_editable_get_text (GTK_EDITABLE (entry))); + label = GTK_LABEL (g_object_get_data (G_OBJECT (entry), "label")); + gtk_label_set_text (label, gtk_editable_get_text (GTK_EDITABLE (entry))); gtk_widget_destroy (entry); } @@ -226,15 +226,15 @@ edit_cb (GtkWidget *button, GtkWidget *child) if (GTK_IS_LABEL (child)) { - GtkWidget *entry = gtk_entry_new (); + GtkEntry *entry = gtk_entry_new (); g_object_set_data (G_OBJECT (entry), "label", child); gtk_editable_set_text (GTK_EDITABLE (entry), gtk_label_get_text (GTK_LABEL (child))); gtk_editable_set_width_chars (GTK_EDITABLE (entry), 12); g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL); - gtk_fixed_put (GTK_FIXED (fixed), entry, x, y); - gtk_widget_grab_focus (entry); + gtk_fixed_put (GTK_FIXED (fixed), GTK_WIDGET (entry), x, y); + gtk_widget_grab_focus (GTK_WIDGET (entry)); } else if (GTK_IS_SPINNER (child)) { @@ -266,6 +266,7 @@ pressed_cb (GtkGesture *gesture, GtkWidget *menu; GtkWidget *box; GtkWidget *item; + GtkSeparator *separator; GdkClipboard *clipboard; pos_x = x; @@ -286,8 +287,8 @@ pressed_cb (GtkGesture *gesture, g_signal_connect (item, "clicked", G_CALLBACK (new_spinner_cb), widget); gtk_container_add (GTK_CONTAINER (box), item); - item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box), item); + separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (separator)); item = gtk_button_new_with_label ("Edit"); gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE); @@ -295,8 +296,8 @@ pressed_cb (GtkGesture *gesture, g_signal_connect (item, "clicked", G_CALLBACK (edit_cb), child); gtk_container_add (GTK_CONTAINER (box), item); - item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box), item); + separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (separator)); item = gtk_button_new_with_label ("Cut"); gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE); diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c index 7c0967757743c07af8cb184294dc371bbaf5f170..7c6963c86a978aab263c19f21ffe62e24fd22565 100644 --- a/demos/gtk-demo/drawingarea.c +++ b/demos/gtk-demo/drawingarea.c @@ -184,7 +184,7 @@ do_drawingarea (GtkWidget *do_widget) GtkWidget *frame; GtkWidget *vbox; GtkWidget *da; - GtkWidget *label; + GtkLabel *label; GtkGesture *drag; if (!window) @@ -206,9 +206,9 @@ do_drawingarea (GtkWidget *do_widget) */ label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), + gtk_label_set_markup (label, "Checkerboard pattern"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); @@ -226,9 +226,9 @@ do_drawingarea (GtkWidget *do_widget) */ label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), + gtk_label_set_markup (label, "Scribble area"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); frame = gtk_frame_new (NULL); gtk_widget_set_vexpand (frame, TRUE); diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c index f3fe0a6e2c1c75c8b53acf0a3dc3969c9adf09e5..56ecc7decad9bdbf06109a5d8cf18d4629a7ea64 100644 --- a/demos/gtk-demo/editable_cells.c +++ b/demos/gtk-demo/editable_cells.c @@ -357,7 +357,7 @@ do_editable_cells (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); gtk_container_add (GTK_CONTAINER (vbox), - gtk_label_new ("Shopping list (you can edit the cells!)")); + GTK_WIDGET (gtk_label_new ("Shopping list (you can edit the cells!)"))); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c index 2f6315566d3458e4c7af7691f562fedd3268d797..f22f0b6f6d6662b481be82280db349d11180939e 100644 --- a/demos/gtk-demo/entry_completion.c +++ b/demos/gtk-demo/entry_completion.c @@ -38,8 +38,8 @@ do_entry_completion (GtkWidget *do_widget) { static GtkWidget *window = NULL; GtkWidget *vbox; - GtkWidget *label; - GtkWidget *entry; + GtkLabel *label; + GtkEntry *entry; GtkEntryCompletion *completion; GtkTreeModel *completion_model; @@ -59,12 +59,12 @@ do_entry_completion (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing total or gnome for example."); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_label_set_markup (label, "Completion demo, try writing total or gnome for example."); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); /* Create our entry */ entry = gtk_entry_new (); - gtk_container_add (GTK_CONTAINER (vbox), entry); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (entry)); /* Create the completion object */ completion = gtk_entry_completion_new (); diff --git a/demos/gtk-demo/entry_undo.c b/demos/gtk-demo/entry_undo.c index e94aefd529f4f43a586f43da3f97a7ce45e30f65..d8bbdf5e3600d9fd3e3043ff5cac1f5915a930eb 100644 --- a/demos/gtk-demo/entry_undo.c +++ b/demos/gtk-demo/entry_undo.c @@ -15,8 +15,8 @@ do_entry_undo (GtkWidget *do_widget) { static GtkWidget *window = NULL; GtkWidget *vbox; - GtkWidget *label; - GtkWidget *entry; + GtkLabel *label; + GtkEntry *entry; if (!window) { @@ -33,14 +33,14 @@ do_entry_undo (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), + gtk_label_set_markup (label, "Use Primary+z or Primary+Shift+z to undo or redo changes"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); /* Create our entry */ entry = gtk_entry_new (); gtk_editable_set_enable_undo (GTK_EDITABLE (entry), TRUE); - gtk_container_add (GTK_CONTAINER (vbox), entry); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (entry)); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/expander.c b/demos/gtk-demo/expander.c index fc3e7c60f98b72394ffdc3464dcc9b566ca424a1..b241afb861172bf9d55848acdbb6cfcbe970f665 100644 --- a/demos/gtk-demo/expander.c +++ b/demos/gtk-demo/expander.c @@ -30,8 +30,8 @@ do_expander (GtkWidget *do_widget) { GtkWidget *toplevel; GtkWidget *area; - GtkWidget *expander; - GtkWidget *label; + GtkExpander *expander; + GtkLabel *label; GtkWidget *sw; GtkWidget *tv; GtkTextBuffer *buffer; @@ -51,12 +51,12 @@ do_expander (GtkWidget *do_widget) area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window)); - label = gtk_widget_get_last_child (area); - gtk_label_set_wrap (GTK_LABEL (label), FALSE); - gtk_widget_set_vexpand (label, FALSE); + label = GTK_LABEL (gtk_widget_get_last_child (area)); + gtk_label_set_wrap (label, FALSE); + gtk_widget_set_vexpand (GTK_WIDGET (label), FALSE); expander = gtk_expander_new ("Details:"); - gtk_widget_set_vexpand (expander, TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (expander), TRUE); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN); @@ -80,7 +80,7 @@ do_expander (GtkWidget *do_widget) "resize the window. Do it already !", -1); gtk_container_add (GTK_CONTAINER (sw), tv); gtk_container_add (GTK_CONTAINER (expander), sw); - gtk_container_add (GTK_CONTAINER (area), expander); + gtk_container_add (GTK_CONTAINER (area), GTK_WIDGET (expander)); g_signal_connect (expander, "notify::expanded", G_CALLBACK (expander_cb), window); diff --git a/demos/gtk-demo/fishbowl.c b/demos/gtk-demo/fishbowl.c index 77c63d561ef27622beb196ff6d96d907b0bc3ba1..6de7997671bbf9b006dc5742f3e49bef7ecafb48 100644 --- a/demos/gtk-demo/fishbowl.c +++ b/demos/gtk-demo/fishbowl.c @@ -58,12 +58,12 @@ get_random_icon_name (GtkIconTheme *theme) GtkWidget * create_icon (void) { - GtkWidget *image; + GtkImage *image; image = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ())); - gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE); + gtk_image_set_icon_size (image, GTK_ICON_SIZE_LARGE); - return image; + return GTK_WIDGET (image); } static GtkWidget * @@ -122,26 +122,26 @@ create_spinbutton (void) static GtkWidget * create_label (void) { - GtkWidget *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua."); + GtkLabel *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua."); - gtk_label_set_wrap (GTK_LABEL (w), TRUE); - gtk_label_set_max_width_chars (GTK_LABEL (w), 100); + gtk_label_set_wrap (w, TRUE); + gtk_label_set_max_width_chars (w, 100); - return w; + return GTK_WIDGET (w); } static GtkWidget * create_video (void) { GtkMediaStream *stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm"); - GtkWidget *w = gtk_picture_new_for_paintable (GDK_PAINTABLE (stream)); + GtkPicture *w = gtk_picture_new_for_paintable (GDK_PAINTABLE (stream)); - gtk_widget_set_size_request (w, 64, 64); + gtk_widget_set_size_request (GTK_WIDGET (w), 64, 64); gtk_media_stream_set_loop (stream, TRUE); gtk_media_stream_play (stream); g_object_unref (stream); - return w; + return GTK_WIDGET (w); } static GtkWidget * @@ -157,11 +157,11 @@ create_gears (void) static GtkWidget * create_switch (void) { - GtkWidget *w = gtk_switch_new (); + GtkSwitch *w = gtk_switch_new (); - gtk_switch_set_state (GTK_SWITCH (w), TRUE); + gtk_switch_set_state (w, TRUE); - return w; + return GTK_WIDGET (w); } static void diff --git a/demos/gtk-demo/font_features.c b/demos/gtk-demo/font_features.c index ad0e30e95c96496f6a00ca8a53a661fd0e1cf7cc..3a2f8e7dc6cb63b87e71adf95aa067b2c641158a 100644 --- a/demos/gtk-demo/font_features.c +++ b/demos/gtk-demo/font_features.c @@ -25,17 +25,17 @@ #define MAKE_TAG(a,b,c,d) (unsigned int)(((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) -static GtkWidget *label; -static GtkWidget *settings; -static GtkWidget *description; +static GtkLabel *label; +static GtkLabel *settings; +static GtkLabel *description; static GtkWidget *font; static GtkWidget *script_lang; static GtkWidget *resetbutton; static GtkWidget *stack; -static GtkWidget *entry; +static GtkEntry *entry; static GtkWidget *variations_heading; static GtkWidget *variations_grid; -static GtkWidget *instance_combo; +static GtkComboBoxText *instance_combo; static GtkWidget *edit_toggle; typedef struct { @@ -146,7 +146,7 @@ static void set_inconsistent (GtkCheckButton *button, gboolean inconsistent) { - gtk_check_button_set_inconsistent (GTK_CHECK_BUTTON (button), inconsistent); + gtk_check_button_set_inconsistent (button, inconsistent); gtk_widget_set_opacity (gtk_widget_get_first_child (GTK_WIDGET (button)), inconsistent ? 0.0 : 1.0); } @@ -178,7 +178,7 @@ add_check_group (GtkWidget *box, const char *title, const char **tags) { - GtkWidget *label; + GtkLabel *label; GtkWidget *group; PangoAttrList *attrs; int i; @@ -187,38 +187,38 @@ add_check_group (GtkWidget *box, gtk_widget_set_halign (group, GTK_ALIGN_START); label = gtk_label_new (title); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_label_set_xalign (label, 0.0); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); g_object_set (label, "margin-top", 10, "margin-bottom", 10, NULL); attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); + gtk_label_set_attributes (label, attrs); pango_attr_list_unref (attrs); - gtk_container_add (GTK_CONTAINER (group), label); + gtk_container_add (GTK_CONTAINER (group), GTK_WIDGET (label)); for (i = 0; tags[i]; i++) { unsigned int tag; - GtkWidget *feat; + GtkCheckButton *feat; FeatureItem *item; tag = hb_tag_from_string (tags[i], -1); feat = gtk_check_button_new_with_label (get_feature_display_name (tag)); - set_inconsistent (GTK_CHECK_BUTTON (feat), TRUE); + set_inconsistent (feat, TRUE); g_signal_connect (feat, "notify::active", G_CALLBACK (update_display), NULL); g_signal_connect (feat, "notify::inconsistent", G_CALLBACK (update_display), NULL); g_signal_connect (feat, "clicked", G_CALLBACK (feat_clicked), NULL); - gtk_container_add (GTK_CONTAINER (group), feat); + gtk_container_add (GTK_CONTAINER (group), GTK_WIDGET (feat)); item = g_new (FeatureItem, 1); item->name = tags[i]; item->tag = tag; item->icon = NULL; item->dflt = NULL; - item->feat = feat; + item->feat = GTK_WIDGET (feat); feature_items = g_list_prepend (feature_items, item); } @@ -231,7 +231,7 @@ add_radio_group (GtkWidget *box, const char *title, const char **tags) { - GtkWidget *label; + GtkLabel *label; GtkWidget *group; int i; GtkWidget *group_button = NULL; @@ -241,14 +241,14 @@ add_radio_group (GtkWidget *box, gtk_widget_set_halign (group, GTK_ALIGN_START); label = gtk_label_new (title); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_label_set_xalign (label, 0.0); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); g_object_set (label, "margin-top", 10, "margin-bottom", 10, NULL); attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); + gtk_label_set_attributes (label, attrs); pango_attr_list_unref (attrs); - gtk_container_add (GTK_CONTAINER (group), label); + gtk_container_add (GTK_CONTAINER (group), GTK_WIDGET (label)); for (i = 0; tags[i]; i++) { @@ -303,7 +303,7 @@ update_display (void) text = gtk_editable_get_text (GTK_EDITABLE (entry)); - if (gtk_label_get_selection_bounds (GTK_LABEL (label), &ins, &bound)) + if (gtk_label_get_selection_bounds (label, &ins, &bound)) { start = g_utf8_offset_to_pointer (text, ins) - text; end = g_utf8_offset_to_pointer (text, bound) - text; @@ -407,10 +407,10 @@ update_display (void) } } - gtk_label_set_text (GTK_LABEL (description), font_desc); - gtk_label_set_text (GTK_LABEL (settings), features); - gtk_label_set_text (GTK_LABEL (label), text); - gtk_label_set_attributes (GTK_LABEL (label), attrs); + gtk_label_set_text (description, font_desc); + gtk_label_set_text (settings, features); + gtk_label_set_text (label, text); + gtk_label_set_attributes (label, attrs); g_free (font_desc); pango_font_description_free (desc); @@ -791,8 +791,8 @@ add_axis (hb_face_t *hb_face, float value, int i) { - GtkWidget *axis_label; - GtkWidget *axis_entry; + GtkLabel *axis_label; + GtkEntry *axis_entry; GtkWidget *axis_scale; GtkAdjustment *adjustment; Axis *axis; @@ -802,9 +802,9 @@ add_axis (hb_face_t *hb_face, hb_ot_name_get_utf8 (hb_face, ax->name_id, HB_LANGUAGE_INVALID, &name_len, name); axis_label = gtk_label_new (name); - gtk_widget_set_halign (axis_label, GTK_ALIGN_START); - gtk_widget_set_valign (axis_label, GTK_ALIGN_BASELINE); - gtk_grid_attach (GTK_GRID (variations_grid), axis_label, 0, i, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (axis_label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (axis_label), GTK_ALIGN_BASELINE); + gtk_grid_attach (GTK_GRID (variations_grid), GTK_WIDGET (axis_label), 0, i, 1, 1); adjustment = gtk_adjustment_new (value, ax->min_value, ax->max_value, 1.0, 10.0, 0.0); axis_scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment); @@ -815,16 +815,16 @@ add_axis (hb_face_t *hb_face, gtk_scale_set_draw_value (GTK_SCALE (axis_scale), FALSE); gtk_grid_attach (GTK_GRID (variations_grid), axis_scale, 1, i, 1, 1); axis_entry = gtk_entry_new (); - gtk_widget_set_valign (axis_entry, GTK_ALIGN_BASELINE); + gtk_widget_set_valign (GTK_WIDGET (axis_entry), GTK_ALIGN_BASELINE); gtk_editable_set_width_chars (GTK_EDITABLE (axis_entry), 4); - gtk_grid_attach (GTK_GRID (variations_grid), axis_entry, 2, i, 1, 1); + gtk_grid_attach (GTK_GRID (variations_grid), GTK_WIDGET (axis_entry), 2, i, 1, 1); axis = g_new (Axis, 1); axis->tag = ax->tag; axis->adjustment = adjustment; g_hash_table_add (axes, axis); - adjustment_changed (adjustment, GTK_ENTRY (axis_entry)); + adjustment_changed (adjustment, axis_entry); g_signal_connect (adjustment, "value-changed", G_CALLBACK (adjustment_changed), axis_entry); g_signal_connect (adjustment, "value-changed", G_CALLBACK (unset_instance), NULL); @@ -867,7 +867,7 @@ static GHashTable *instances; static void add_instance (hb_face_t *face, unsigned int index, - GtkWidget *combo, + GtkComboBoxText *combo, int pos) { Instance *instance; @@ -884,7 +884,7 @@ add_instance (hb_face_t *face, instance->index = index; g_hash_table_add (instances, instance); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), instance->name); + gtk_combo_box_text_append_text (combo, instance->name); } static void @@ -1067,19 +1067,19 @@ update_font_variations (void) if (hb_ot_var_get_named_instance_count (hb_face) > 0) { - GtkWidget *label; - GtkWidget *combo; + GtkLabel *label; + GtkComboBoxText *combo; label = gtk_label_new ("Instance"); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_grid_attach (GTK_GRID (variations_grid), label, 0, -1, 2, 1); + gtk_label_set_xalign (label, 0); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_grid_attach (GTK_GRID (variations_grid), GTK_WIDGET (label), 0, -1, 2, 1); combo = gtk_combo_box_text_new (); - gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE); + gtk_widget_set_valign (GTK_WIDGET (combo), GTK_ALIGN_BASELINE); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), ""); + gtk_combo_box_text_append_text (combo, ""); for (i = 0; i < hb_ot_var_get_named_instance_count (hb_face); i++) add_instance (hb_face, i, combo, i); @@ -1093,7 +1093,7 @@ update_font_variations (void) } } - gtk_grid_attach (GTK_GRID (variations_grid), combo, 1, -1, 2, 1); + gtk_grid_attach (GTK_GRID (variations_grid), GTK_WIDGET (combo), 1, -1, 2, 1); g_signal_connect (combo, "changed", G_CALLBACK (instance_changed), NULL); instance_combo = combo; } @@ -1129,7 +1129,7 @@ font_features_reset_features (void) { GList *l; - gtk_label_select_region (GTK_LABEL (label), 0, 0); + gtk_label_select_region (label, 0, 0); g_list_free_full (ranges, free_range); ranges = NULL; @@ -1158,7 +1158,7 @@ switch_to_entry (void) { text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (entry))); gtk_stack_set_visible_child_name (GTK_STACK (stack), "entry"); - gtk_widget_grab_focus (entry); + gtk_widget_grab_focus (GTK_WIDGET (entry)); } static void @@ -1217,20 +1217,20 @@ do_font_features (GtkWidget *do_widget) window = GTK_WIDGET (gtk_builder_get_object (builder, "window")); feature_list = GTK_WIDGET (gtk_builder_get_object (builder, "feature_list")); - label = GTK_WIDGET (gtk_builder_get_object (builder, "label")); - settings = GTK_WIDGET (gtk_builder_get_object (builder, "settings")); - description = GTK_WIDGET (gtk_builder_get_object (builder, "description")); + label = GTK_LABEL (gtk_builder_get_object (builder, "label")); + settings = GTK_LABEL (gtk_builder_get_object (builder, "settings")); + description = GTK_LABEL (gtk_builder_get_object (builder, "description")); resetbutton = GTK_WIDGET (gtk_builder_get_object (builder, "reset")); font = GTK_WIDGET (gtk_builder_get_object (builder, "font")); script_lang = GTK_WIDGET (gtk_builder_get_object (builder, "script_lang")); stack = GTK_WIDGET (gtk_builder_get_object (builder, "stack")); - entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry")); + entry = GTK_ENTRY (gtk_builder_get_object (builder, "entry")); edit_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "edit_toggle")); controller = gtk_event_controller_key_new (); g_object_set_data_full (G_OBJECT (entry), "controller", g_object_ref (controller), g_object_unref); g_signal_connect (controller, "key-pressed", G_CALLBACK (entry_key_press), entry); - gtk_widget_add_controller (entry, controller); + gtk_widget_add_controller (GTK_WIDGET (entry), controller); add_check_group (feature_list, _("Kerning"), (const char *[]){ "kern", NULL }); add_check_group (feature_list, _("Ligatures"), (const char *[]){ "liga", diff --git a/demos/gtk-demo/fontrendering.c b/demos/gtk-demo/fontrendering.c index 463fac3c72c5346ebb94ec9b34655506d3d1cd6e..b5725f887818babd7c8ef21cdf95f98b46a27852 100644 --- a/demos/gtk-demo/fontrendering.c +++ b/demos/gtk-demo/fontrendering.c @@ -8,7 +8,7 @@ static GtkWidget *window = NULL; static GtkWidget *font_button = NULL; static GtkWidget *entry = NULL; -static GtkWidget *image = NULL; +static GtkPicture *image = NULL; static GtkWidget *hinting = NULL; static GtkWidget *hint_metrics = NULL; static GtkWidget *up_button = NULL; @@ -46,7 +46,7 @@ update_image (void) int i; if (!context) - context = gtk_widget_create_pango_context (image); + context = gtk_widget_create_pango_context (GTK_WIDGET (image)); text = gtk_editable_get_text (GTK_EDITABLE (entry)); desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (font_button)); @@ -210,7 +210,7 @@ update_image (void) } - gtk_picture_set_pixbuf (GTK_PICTURE (image), pixbuf2); + gtk_picture_set_pixbuf (image, pixbuf2); g_object_unref (pixbuf2); @@ -258,7 +258,7 @@ do_fontrendering (GtkWidget *do_widget) up_button = GTK_WIDGET (gtk_builder_get_object (builder, "up_button")); down_button = GTK_WIDGET (gtk_builder_get_object (builder, "down_button")); entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry")); - image = GTK_WIDGET (gtk_builder_get_object (builder, "image")); + image = GTK_PICTURE (gtk_builder_get_object (builder, "image")); hinting = GTK_WIDGET (gtk_builder_get_object (builder, "hinting")); hint_metrics = GTK_WIDGET (gtk_builder_get_object (builder, "hint_metrics")); text_radio = GTK_WIDGET (gtk_builder_get_object (builder, "text_radio")); diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c index 21e88b63aee39fcb2d88e7383ceb7d22aa9b2aa1..27ae57eb4c06b5dee21217c691203b34cc07e77f 100644 --- a/demos/gtk-demo/glarea.c +++ b/demos/gtk-demo/glarea.c @@ -329,7 +329,8 @@ on_axis_value_change (GtkAdjustment *adjustment, static GtkWidget * create_axis_slider (int axis) { - GtkWidget *box, *label, *slider; + GtkWidget *box, *slider; + GtkLabel *label; GtkAdjustment *adj; const char *text; @@ -354,8 +355,8 @@ create_axis_slider (int axis) } label = gtk_label_new (text); - gtk_container_add (GTK_CONTAINER (box), label); - gtk_widget_show (label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); adj = gtk_adjustment_new (0.0, 0.0, 360.0, 1.0, 12.0, 0.0); g_signal_connect (adj, "value-changed", diff --git a/demos/gtk-demo/headerbar.c b/demos/gtk-demo/headerbar.c index 6784ea3905d8d5a319b18c0997700704836a2fc6..1c14b89ad032b9d341d565e2fdd3f5994f56750b 100644 --- a/demos/gtk-demo/headerbar.c +++ b/demos/gtk-demo/headerbar.c @@ -18,7 +18,7 @@ do_headerbar (GtkWidget *do_widget) GtkWidget *header; GtkWidget *button; GtkWidget *box; - GtkWidget *image; + GtkImage *image; GIcon *icon; if (!window) @@ -38,16 +38,16 @@ do_headerbar (GtkWidget *do_widget) icon = g_themed_icon_new ("mail-send-receive-symbolic"); image = gtk_image_new_from_gicon (icon); g_object_unref (icon); - gtk_container_add (GTK_CONTAINER (button), image); + gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (image)); gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_style_context_add_class (gtk_widget_get_style_context (box), "linked"); button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic")); + gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (gtk_image_new_from_icon_name ("pan-start-symbolic"))); gtk_container_add (GTK_CONTAINER (box), button); button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic")); + gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (gtk_image_new_from_icon_name ("pan-end-symbolic"))); gtk_container_add (GTK_CONTAINER (box), button); gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box); diff --git a/demos/gtk-demo/iconscroll.c b/demos/gtk-demo/iconscroll.c index fafd51930eec38f9c682790f6e3e106b71349d1c..c6d0a94fd333a7b98f2eca2468d16947e8eebd52 100644 --- a/demos/gtk-demo/iconscroll.c +++ b/demos/gtk-demo/iconscroll.c @@ -107,7 +107,7 @@ populate_text (gboolean hilight) static void populate_image (void) { - GtkWidget *image; + GtkPicture *image; if (!content) { @@ -118,14 +118,14 @@ populate_image (void) } image = gtk_picture_new_for_resource ("/sliding_puzzle/portland-rose.jpg"); - gtk_picture_set_can_shrink (GTK_PICTURE (image), FALSE); + gtk_picture_set_can_shrink (image, FALSE); hincrement = 5; gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (scrolledwindow), image); + gtk_container_add (GTK_CONTAINER (scrolledwindow), GTK_WIDGET (image)); } static void diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c index d252ef36ecc45b9930d8b0048daa203494fd516a..3391c43db8f9466e3fe0e358a426b6f9c0021346 100644 --- a/demos/gtk-demo/iconview.c +++ b/demos/gtk-demo/iconview.c @@ -247,7 +247,7 @@ do_iconview (GtkWidget *do_widget) GtkWidget *icon_view; GtkListStore *store; GtkWidget *vbox; - GtkWidget *tool_bar; + GtkToolbar *tool_bar; GtkToolItem *home_button; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -266,7 +266,7 @@ do_iconview (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); tool_bar = gtk_toolbar_new (); - gtk_container_add (GTK_CONTAINER (vbox), tool_bar); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (tool_bar)); up_button = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up")); @@ -274,14 +274,14 @@ do_iconview (GtkWidget *do_widget) gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (up_button), "go-up"); gtk_tool_item_set_is_important (up_button, TRUE); gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE); - gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), up_button, -1); + gtk_toolbar_insert (tool_bar, up_button, -1); home_button = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_label (GTK_TOOL_BUTTON (home_button), _("_Home")); gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (home_button), TRUE); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (home_button), "go-home"); gtk_tool_item_set_is_important (home_button, TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1); + gtk_toolbar_insert (tool_bar, home_button, -1); sw = gtk_scrolled_window_new (NULL, NULL); diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c index c90de20f6d84361d8a7add52d6645b22a73e3fe9..74fed4440c284628d7bd1c2719b8159399110edc 100644 --- a/demos/gtk-demo/images.c +++ b/demos/gtk-demo/images.c @@ -24,12 +24,9 @@ static GInputStream * image_stream = NULL; static void progressive_prepared_callback (GdkPixbufLoader *loader, - gpointer data) + GtkPicture *picture) { GdkPixbuf *pixbuf; - GtkWidget *picture; - - picture = GTK_WIDGET (data); pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); @@ -38,7 +35,7 @@ progressive_prepared_callback (GdkPixbufLoader *loader, */ gdk_pixbuf_fill (pixbuf, 0xaaaaaaff); - gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf); + gtk_picture_set_pixbuf (picture, pixbuf); } static void @@ -47,15 +44,12 @@ progressive_updated_callback (GdkPixbufLoader *loader, gint y, gint width, gint height, - gpointer data) + GtkPicture *picture) { - GtkWidget *picture; GdkPixbuf *pixbuf; - picture = GTK_WIDGET (data); - pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); - gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf); + gtk_picture_set_pixbuf (picture, pixbuf); } static gint @@ -252,7 +246,7 @@ progressive_timeout (gpointer data) } static void -start_progressive_loading (GtkWidget *picture) +start_progressive_loading (GtkPicture *picture) { /* This is obviously totally contrived (we slow down loading * on purpose to show how incremental loading works). @@ -290,7 +284,7 @@ cleanup_callback (GObject *object, } static void -toggle_sensitivity_callback (GtkWidget *togglebutton, +toggle_sensitivity_callback (GtkToggleButton *togglebutton, gpointer user_data) { GtkContainer *container = user_data; @@ -303,9 +297,9 @@ toggle_sensitivity_callback (GtkWidget *togglebutton, while (tmp != NULL) { /* don't disable our toggle */ - if (GTK_WIDGET (tmp->data) != togglebutton) + if (GTK_WIDGET (tmp->data) != GTK_WIDGET (togglebutton)) gtk_widget_set_sensitive (GTK_WIDGET (tmp->data), - !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton))); + !gtk_toggle_button_get_active (togglebutton)); tmp = tmp->next; } @@ -317,15 +311,15 @@ toggle_sensitivity_callback (GtkWidget *togglebutton, GtkWidget * do_images (GtkWidget *do_widget) { - GtkWidget *video; + GtkVideo *video; GtkWidget *frame; GtkWidget *vbox; GtkWidget *hbox; GtkWidget *base_vbox; - GtkWidget *image; - GtkWidget *picture; - GtkWidget *label; - GtkWidget *button; + GtkImage *image; + GtkPicture *picture; + GtkLabel *label; + GtkToggleButton *button; GdkPaintable *paintable; GIcon *gicon; @@ -352,9 +346,9 @@ do_images (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (hbox), vbox); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), + gtk_label_set_markup (label, "Image loaded from a file"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); @@ -363,17 +357,17 @@ do_images (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), frame); image = gtk_image_new_from_icon_name ("gtk3-demo"); - gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE); + gtk_image_set_icon_size (image, GTK_ICON_SIZE_LARGE); - gtk_container_add (GTK_CONTAINER (frame), image); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (image)); /* Animation */ label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), + gtk_label_set_markup (label, "Animation loaded from a file"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); @@ -383,14 +377,14 @@ do_images (GtkWidget *do_widget) picture = gtk_picture_new_for_resource ("/images/floppybuddy.gif"); - gtk_container_add (GTK_CONTAINER (frame), picture); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (picture)); /* Symbolic icon */ label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), + gtk_label_set_markup (label, "Symbolic themed icon"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); @@ -400,9 +394,9 @@ do_images (GtkWidget *do_widget) gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic"); image = gtk_image_new_from_gicon (gicon); - gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE); + gtk_image_set_icon_size (image, GTK_ICON_SIZE_LARGE); - gtk_container_add (GTK_CONTAINER (frame), image); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (image)); /* Progressive */ @@ -410,9 +404,9 @@ do_images (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (hbox), vbox); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), + gtk_label_set_markup (label, "Progressive image loading"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); @@ -424,7 +418,7 @@ do_images (GtkWidget *do_widget) * will create the pixbuf and fill it in. */ picture = gtk_picture_new (); - gtk_container_add (GTK_CONTAINER (frame), picture); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (picture)); start_progressive_loading (picture); @@ -433,9 +427,9 @@ do_images (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (hbox), vbox); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), + gtk_label_set_markup (label, "Displaying video"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); @@ -444,27 +438,27 @@ do_images (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), frame); video = gtk_video_new_for_resource ("/images/gtk-logo.webm"); - gtk_media_stream_set_loop (gtk_video_get_media_stream (GTK_VIDEO (video)), TRUE); - gtk_container_add (GTK_CONTAINER (frame), video); + gtk_media_stream_set_loop (gtk_video_get_media_stream (video), TRUE); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (video)); /* Widget paintables */ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_container_add (GTK_CONTAINER (hbox), vbox); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), + gtk_label_set_markup (label, "GtkWidgetPaintable"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); paintable = gtk_widget_paintable_new (do_widget); picture = gtk_picture_new_for_paintable (paintable); - gtk_widget_set_size_request (picture, 100, 100); - gtk_widget_set_valign (picture, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (vbox), picture); + gtk_widget_set_size_request (GTK_WIDGET (picture), 100, 100); + gtk_widget_set_valign (GTK_WIDGET (picture), GTK_ALIGN_START); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (picture)); /* Sensitivity control */ button = gtk_toggle_button_new_with_mnemonic ("_Insensitive"); - gtk_container_add (GTK_CONTAINER (base_vbox), button); + gtk_container_add (GTK_CONTAINER (base_vbox), GTK_WIDGET (button)); g_signal_connect (button, "toggled", G_CALLBACK (toggle_sensitivity_callback), diff --git a/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c index e70e16233483f6f8840c53822ef7dbb91c4071bf..822ef3dd9256844a80209e646d9c5c73edce68b9 100644 --- a/demos/gtk-demo/infobar.c +++ b/demos/gtk-demo/infobar.c @@ -45,9 +45,9 @@ do_infobar (GtkWidget *do_widget) GtkWidget *bar; GtkWidget *vbox; GtkWidget *vbox2; - GtkWidget *label; + GtkLabel *label; GtkWidget *actions; - GtkWidget *button; + GtkToggleButton *button; if (!window) { @@ -68,25 +68,25 @@ do_infobar (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), bar); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO"); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_xalign (label, 0); + gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), GTK_WIDGET (label)); button = gtk_toggle_button_new_with_label ("Message"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - gtk_container_add (GTK_CONTAINER (actions), button); + gtk_container_add (GTK_CONTAINER (actions), GTK_WIDGET (button)); bar = gtk_info_bar_new (); gtk_container_add (GTK_CONTAINER (vbox), bar); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING"); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_xalign (label, 0); + gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), GTK_WIDGET (label)); button = gtk_toggle_button_new_with_label ("Warning"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - gtk_container_add (GTK_CONTAINER (actions), button); + gtk_container_add (GTK_CONTAINER (actions), GTK_WIDGET (button)); bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL); gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE); @@ -94,39 +94,39 @@ do_infobar (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), bar); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION"); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_xalign (label, 0); + gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), GTK_WIDGET (label)); gtk_info_bar_set_default_response (GTK_INFO_BAR (bar), GTK_RESPONSE_OK); button = gtk_toggle_button_new_with_label ("Question"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - gtk_container_add (GTK_CONTAINER (actions), button); + gtk_container_add (GTK_CONTAINER (actions), GTK_WIDGET (button)); bar = gtk_info_bar_new (); gtk_container_add (GTK_CONTAINER (vbox), bar); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR"); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_xalign (label, 0); + gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), GTK_WIDGET (label)); button = gtk_toggle_button_new_with_label ("Error"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - gtk_container_add (GTK_CONTAINER (actions), button); + gtk_container_add (GTK_CONTAINER (actions), GTK_WIDGET (button)); bar = gtk_info_bar_new (); gtk_container_add (GTK_CONTAINER (vbox), bar); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER"); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_xalign (label, 0); + gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), GTK_WIDGET (label)); button = gtk_toggle_button_new_with_label ("Other"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - gtk_container_add (GTK_CONTAINER (actions), button); + gtk_container_add (GTK_CONTAINER (actions), GTK_WIDGET (button)); frame = gtk_frame_new ("Info bars"); gtk_widget_set_margin_top (frame, 8); @@ -139,7 +139,7 @@ do_infobar (GtkWidget *do_widget) /* Standard message dialog */ label = gtk_label_new ("An example of different info bars"); - gtk_container_add (GTK_CONTAINER (vbox2), label); + gtk_container_add (GTK_CONTAINER (vbox2), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox2), actions); } diff --git a/demos/gtk-demo/links.c b/demos/gtk-demo/links.c index 0629ebfe8442784f582e4049af2eff729ee91fb8..b7bb0dd4671f98f873f0bd7f543b947023aec619 100644 --- a/demos/gtk-demo/links.c +++ b/demos/gtk-demo/links.c @@ -48,7 +48,7 @@ GtkWidget * do_links (GtkWidget *do_widget) { static GtkWidget *window = NULL; - GtkWidget *label; + GtkLabel *label; if (!window) { @@ -69,10 +69,10 @@ do_links (GtkWidget *do_widget) "og" "le" "."); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_use_markup (label, TRUE); g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL); - gtk_container_add (GTK_CONTAINER (window), label); - gtk_widget_show (label); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c index 4812c38efa6aa52c59ee33bda0c002f3e74beed7..5ed95cfc84bdc85212a581f3c236a29bbcd6bd2a 100644 --- a/demos/gtk-demo/list_store.c +++ b/demos/gtk-demo/list_store.c @@ -250,7 +250,7 @@ do_list_store (GtkWidget *do_widget) if (!window) { GtkWidget *vbox; - GtkWidget *label; + GtkLabel *label; GtkWidget *sw; GtkWidget *treeview; @@ -268,7 +268,7 @@ do_list_store (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though)."); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c index 4e70c2f979e9ed965c978cc5d320910d5201a308..5b3836648c93fa77ee1b6a18acc354353fca7681 100644 --- a/demos/gtk-demo/listbox.c +++ b/demos/gtk-demo/listbox.c @@ -336,7 +336,8 @@ row_activated (GtkListBox *listbox, GtkListBoxRow *row) GtkWidget * do_listbox (GtkWidget *do_widget) { - GtkWidget *scrolled, *listbox, *vbox, *label; + GtkWidget *scrolled, *listbox, *vbox; + GtkLabel *label; GtkMessage *message; GtkMessageRow *row; GBytes *data; @@ -362,7 +363,7 @@ do_listbox (GtkWidget *do_widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new ("Messages from GTK and friends"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_widget_set_vexpand (scrolled, TRUE); diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index 38288dc2b5865a6f88bbca8e2e67ace49999d880..f0307b4418904373441fe747937212f6a7dc1888 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -564,13 +564,14 @@ fontify (GtkTextBuffer *source_buffer) static GtkWidget * display_image (const char *resource) { - GtkWidget *sw, *image; + GtkWidget *sw; + GtkImage *image; image = gtk_image_new_from_resource (resource); - gtk_widget_set_halign (image, GTK_ALIGN_CENTER); - gtk_widget_set_valign (image, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (image), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (image), GTK_ALIGN_CENTER); sw = gtk_scrolled_window_new (NULL, NULL); - gtk_container_add (GTK_CONTAINER (sw), image); + gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (image)); return sw; } @@ -623,27 +624,27 @@ display_text (const char *resource) static GtkWidget * display_video (const char *resource) { - GtkWidget *video; + GtkVideo *video; video = gtk_video_new_for_resource (resource); - gtk_video_set_loop (GTK_VIDEO (video), TRUE); + gtk_video_set_loop (video, TRUE); - return video; + return GTK_WIDGET (video); } static GtkWidget * display_nothing (const char *resource) { - GtkWidget *widget; + GtkLabel *widget; char *str; str = g_strdup_printf ("The lazy GTK developers forgot to add a way to display the resource '%s'", resource); widget = gtk_label_new (str); - gtk_label_set_wrap (GTK_LABEL (widget), TRUE); + gtk_label_set_wrap (widget, TRUE); g_free (str); - return widget; + return GTK_WIDGET (widget); } static struct { @@ -667,7 +668,8 @@ add_data_tab (const gchar *demoname) { gchar *resource_dir, *resource_name; gchar **resources; - GtkWidget *widget, *label; + GtkWidget *widget; + GtkLabel *label; guint i, j; resource_dir = g_strconcat ("/", demoname, NULL); @@ -694,8 +696,8 @@ add_data_tab (const gchar *demoname) widget = display_nothing (resource_name); label = gtk_label_new (resources[i]); - gtk_widget_show (label); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label); + gtk_widget_show (GTK_WIDGET (label)); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, GTK_WIDGET (label)); g_object_set (gtk_notebook_get_page (GTK_NOTEBOOK (notebook), widget), "tab-expand", FALSE, NULL); diff --git a/demos/gtk-demo/markup.c b/demos/gtk-demo/markup.c index a57c82fb969211f33ffe84f98b48d367ab716d8b..1a7941ec6a9e3e87d268c3a2b6508651af4f2cbe 100644 --- a/demos/gtk-demo/markup.c +++ b/demos/gtk-demo/markup.c @@ -52,7 +52,7 @@ do_markup (GtkWidget *do_widget) GBytes *bytes; const gchar *markup; GtkWidget *header; - GtkWidget *show_source; + GtkCheckButton *show_source; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_display (GTK_WINDOW (window), @@ -66,12 +66,12 @@ do_markup (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), stack); show_source = gtk_check_button_new_with_label ("Source"); - gtk_widget_set_valign (show_source, GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (show_source), GTK_ALIGN_CENTER); g_signal_connect (show_source, "toggled", G_CALLBACK (source_toggled), stack); header = gtk_header_bar_new (); gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE); - gtk_header_bar_pack_start (GTK_HEADER_BAR (header), show_source); + gtk_header_bar_pack_start (GTK_HEADER_BAR (header), GTK_WIDGET (show_source)); gtk_window_set_titlebar (GTK_WINDOW (window), header); gtk_window_set_title (GTK_WINDOW (window), "Markup"); diff --git a/demos/gtk-demo/overlay.c b/demos/gtk-demo/overlay.c index 0e2f42a0e058d20ed52a380196bff61d43ddc033..a50a17bc90bb57ea0cd314be11afe0069d1d916a 100644 --- a/demos/gtk-demo/overlay.c +++ b/demos/gtk-demo/overlay.c @@ -26,8 +26,8 @@ do_overlay (GtkWidget *do_widget) GtkWidget *grid; GtkWidget *button; GtkWidget *vbox; - GtkWidget *label; - GtkWidget *entry; + GtkLabel *label; + GtkEntry *entry; int i, j; char *text; @@ -62,19 +62,19 @@ do_overlay (GtkWidget *do_widget) gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER); label = gtk_label_new ("Numbers"); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_widget_set_margin_top (label, 8); - gtk_widget_set_margin_bottom (label, 50); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_label_set_use_markup (label, TRUE); + gtk_widget_set_margin_top (GTK_WIDGET (label), 8); + gtk_widget_set_margin_bottom (GTK_WIDGET (label), 50); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox); gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER); gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER); - gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number"); - gtk_widget_set_margin_top (entry, 50); - gtk_widget_set_margin_bottom (entry, 8); - gtk_container_add (GTK_CONTAINER (vbox), entry); + gtk_entry_set_placeholder_text (entry, "Your Lucky Number"); + gtk_widget_set_margin_top (GTK_WIDGET (entry), 50); + gtk_widget_set_margin_bottom (GTK_WIDGET (entry), 8); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (entry)); gtk_container_add (GTK_CONTAINER (window), overlay); diff --git a/demos/gtk-demo/overlay2.c b/demos/gtk-demo/overlay2.c index f26a10dc5f5d0dc5052800c7d53fe4d5f4a116ee..89688556c6dbc6f489fcd31444a710031bfce7f9 100644 --- a/demos/gtk-demo/overlay2.c +++ b/demos/gtk-demo/overlay2.c @@ -29,7 +29,7 @@ do_overlay2 (GtkWidget *do_widget) GtkWidget *overlay; GtkWidget *sw; GtkWidget *text; - GtkWidget *image; + GtkPicture *image; GtkWidget *scale; GtkTextBuffer *buffer; GtkTextIter start, end; @@ -65,16 +65,16 @@ do_overlay2 (GtkWidget *do_widget) G_CALLBACK (gtk_widget_destroyed), &window); image = gtk_picture_new_for_resource ("/overlay2/decor1.png"); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), image); - gtk_widget_set_can_target (image, FALSE); - gtk_widget_set_halign (image, GTK_ALIGN_START); - gtk_widget_set_valign (image, GTK_ALIGN_START); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (image)); + gtk_widget_set_can_target (GTK_WIDGET (image), FALSE); + gtk_widget_set_halign (GTK_WIDGET (image), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (image), GTK_ALIGN_START); image = gtk_picture_new_for_resource ("/overlay2/decor2.png"); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), image); - gtk_widget_set_can_target (image, FALSE); - gtk_widget_set_halign (image, GTK_ALIGN_END); - gtk_widget_set_valign (image, GTK_ALIGN_END); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (image)); + gtk_widget_set_can_target (GTK_WIDGET (image), FALSE); + gtk_widget_set_halign (GTK_WIDGET (image), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (image), GTK_ALIGN_END); adjustment = gtk_adjustment_new (0, 0, 100, 1, 1, 0); g_signal_connect (adjustment, "value-changed", diff --git a/demos/gtk-demo/pagesetup.c b/demos/gtk-demo/pagesetup.c index f169bae5c5ec9e61c11f27036e1e3620f29e7137..c83cd9e15555af73e34f64f075763b2f922da057 100644 --- a/demos/gtk-demo/pagesetup.c +++ b/demos/gtk-demo/pagesetup.c @@ -14,10 +14,10 @@ done_cb (GtkDialog *dialog, gint response, gpointer data) gtk_widget_destroy (GTK_WIDGET (dialog)); } -GtkWidget * +GtkPageSetupUnixDialog * do_pagesetup (GtkWidget *do_widget) { - static GtkWidget *window = NULL; + static GtkPageSetupUnixDialog *window = NULL; if (!window) { @@ -26,10 +26,10 @@ do_pagesetup (GtkWidget *do_widget) g_signal_connect (window, "response", G_CALLBACK (done_cb), NULL); } - if (!gtk_widget_get_visible (window)) - gtk_widget_show (window); + if (!gtk_widget_get_visible (GTK_WIDGET (window))) + gtk_widget_show (GTK_WIDGET (window)); else - gtk_widget_destroy (window); + gtk_widget_destroy (GTK_WIDGET (window)); return window; } diff --git a/demos/gtk-demo/paint.c b/demos/gtk-demo/paint.c index c783bee90478f82024863f75fc12dfc6b554707d..4e5d5f1090d126f82bb13b7f6d13fdd05a1c1bba 100644 --- a/demos/gtk-demo/paint.c +++ b/demos/gtk-demo/paint.c @@ -382,7 +382,8 @@ do_paint (GtkWidget *toplevel) if (!window) { - GtkWidget *draw_area, *headerbar, *colorbutton; + GtkWidget *draw_area, *headerbar; + GtkColorButton *colorbutton; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -401,7 +402,7 @@ do_paint (GtkWidget *toplevel) gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (colorbutton), &(GdkRGBA) { 0, 0, 0, 1 }); - gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), colorbutton); + gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), GTK_WIDGET (colorbutton)); gtk_window_set_titlebar (GTK_WINDOW (window), headerbar); g_signal_connect (window, "destroy", diff --git a/demos/gtk-demo/paintable.c b/demos/gtk-demo/paintable.c index 3d20e99984690fb0fd842716cdc50e0beff78921..fea7923a47337145233c67ef3096b34d2ccfa77d 100644 --- a/demos/gtk-demo/paintable.c +++ b/demos/gtk-demo/paintable.c @@ -152,7 +152,7 @@ GtkWidget * do_paintable (GtkWidget *do_widget) { GdkPaintable *nuclear; - GtkWidget *image; + GtkImage *image; if (!window) { @@ -164,7 +164,7 @@ do_paintable (GtkWidget *do_widget) nuclear = gtk_nuclear_icon_new (0.0); image = gtk_image_new_from_paintable (nuclear); - gtk_container_add (GTK_CONTAINER (window), image); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (image)); g_object_unref (nuclear); } diff --git a/demos/gtk-demo/paintable_animated.c b/demos/gtk-demo/paintable_animated.c index b606764ca5830cf0805918618885f0ba5708fa2d..d36694cdac2dbf57c7cee49db8605a582b47e48f 100644 --- a/demos/gtk-demo/paintable_animated.c +++ b/demos/gtk-demo/paintable_animated.c @@ -184,7 +184,7 @@ GtkWidget * do_paintable_animated (GtkWidget *do_widget) { GdkPaintable *nuclear; - GtkWidget *image; + GtkImage *image; if (!window) { @@ -196,7 +196,7 @@ do_paintable_animated (GtkWidget *do_widget) nuclear = gtk_nuclear_animation_new (); image = gtk_image_new_from_paintable (nuclear); - gtk_container_add (GTK_CONTAINER (window), image); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (image)); g_object_unref (nuclear); } diff --git a/demos/gtk-demo/paintable_mediastream.c b/demos/gtk-demo/paintable_mediastream.c index 797ccfadf590b2293c87ee475bcc338c97f0420e..5f5f0003713640340b34637edc474fcff6e6241b 100644 --- a/demos/gtk-demo/paintable_mediastream.c +++ b/demos/gtk-demo/paintable_mediastream.c @@ -284,7 +284,7 @@ GtkWidget * do_paintable_mediastream (GtkWidget *do_widget) { GtkMediaStream *nuclear; - GtkWidget *video; + GtkVideo *video; if (!window) { @@ -298,7 +298,7 @@ do_paintable_mediastream (GtkWidget *do_widget) gtk_media_stream_set_loop (GTK_MEDIA_STREAM (nuclear), TRUE); video = gtk_video_new_for_media_stream (nuclear); - gtk_container_add (GTK_CONTAINER (window), video); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (video)); g_object_unref (nuclear); } diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c index e023cd22ba8dc2036badd6a897cd07b6ffff1396..cd01401e78e5f51a0eba53db871ae5281374fd90 100644 --- a/demos/gtk-demo/panes.c +++ b/demos/gtk-demo/panes.c @@ -90,8 +90,8 @@ create_pane_options (GtkPaned *paned, GtkWidget *child1, *child2; GtkWidget *frame; GtkWidget *table; - GtkWidget *label; - GtkWidget *check_button; + GtkLabel *label; + GtkCheckButton *check_button; child1 = gtk_paned_get_child1 (paned); child2 = gtk_paned_get_child2 (paned); @@ -103,30 +103,30 @@ create_pane_options (GtkPaned *paned, gtk_container_add (GTK_CONTAINER (frame), table); label = gtk_label_new (label1); - gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 0, 0, 1, 1); check_button = gtk_check_button_new_with_mnemonic ("_Resize"); - gtk_grid_attach (GTK_GRID (table), check_button, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (check_button), 0, 1, 1, 1); g_signal_connect (check_button, "toggled", G_CALLBACK (toggle_resize), child1); check_button = gtk_check_button_new_with_mnemonic ("_Shrink"); - gtk_grid_attach (GTK_GRID (table), check_button, 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (check_button), 0, 2, 1, 1); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); g_signal_connect (check_button, "toggled", G_CALLBACK (toggle_shrink), child1); label = gtk_label_new (label2); - gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 1, 0, 1, 1); check_button = gtk_check_button_new_with_mnemonic ("_Resize"); - gtk_grid_attach (GTK_GRID (table), check_button, 1, 1, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (check_button), 1, 1, 1, 1); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); g_signal_connect (check_button, "toggled", G_CALLBACK (toggle_resize), child2); check_button = gtk_check_button_new_with_mnemonic ("_Shrink"); - gtk_grid_attach (GTK_GRID (table), check_button, 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (check_button), 1, 2, 1, 1); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); g_signal_connect (check_button, "toggled", G_CALLBACK (toggle_shrink), child2); diff --git a/demos/gtk-demo/pickers.c b/demos/gtk-demo/pickers.c index b921afb5d2ccabca76ac79edd7a6d22e4c5714ee..c2d6c7352ec287eb41c934ee19a868fc89440809 100644 --- a/demos/gtk-demo/pickers.c +++ b/demos/gtk-demo/pickers.c @@ -10,7 +10,12 @@ GtkWidget * do_pickers (GtkWidget *do_widget) { static GtkWidget *window = NULL; - GtkWidget *table, *label, *picker; + GtkWidget *table; + GtkWidget *picker; + GtkColorButton *color_button; + GtkFileChooserButton *file_button; + GtkAppChooserButton *app_button; + GtkLabel *label; if (!window) { @@ -29,47 +34,47 @@ do_pickers (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), table); label = gtk_label_new ("Color:"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_widget_set_hexpand (label, TRUE); - picker = gtk_color_button_new (); - gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (table), picker, 1, 0, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + color_button = gtk_color_button_new (); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (color_button), 1, 0, 1, 1); label = gtk_label_new ("Font:"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_widget_set_hexpand (label, TRUE); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); picker = gtk_font_button_new (); - gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 0, 1, 1, 1); gtk_grid_attach (GTK_GRID (table), picker, 1, 1, 1, 1); label = gtk_label_new ("File:"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_widget_set_hexpand (label, TRUE); - picker = gtk_file_chooser_button_new ("Pick a File", - GTK_FILE_CHOOSER_ACTION_OPEN); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (picker), FALSE); - gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1); - gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + file_button = gtk_file_chooser_button_new ("Pick a File", + GTK_FILE_CHOOSER_ACTION_OPEN); + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (file_button), FALSE); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (file_button), 1, 2, 1, 1); label = gtk_label_new ("Folder:"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - picker = gtk_file_chooser_button_new ("Pick a Folder", - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); - gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1); - gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + file_button = gtk_file_chooser_button_new ("Pick a Folder", + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 0, 3, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (file_button), 1, 3, 1, 1); label = gtk_label_new ("Mail:"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_widget_set_hexpand (label, TRUE); - picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto"); - gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE); - gtk_grid_attach (GTK_GRID (table), label, 0, 4, 1, 1); - gtk_grid_attach (GTK_GRID (table), picker, 1, 4, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + app_button = gtk_app_chooser_button_new ("x-scheme-handler/mailto"); + gtk_app_chooser_button_set_show_dialog_item (app_button, TRUE); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (label), 0, 4, 1, 1); + gtk_grid_attach (GTK_GRID (table), GTK_WIDGET (app_button), 1, 4, 1, 1); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/popover.c b/demos/gtk-demo/popover.c index f3d8bcf5fe2241f7d424bec341f4901c2d4ab234..aa9b33bdb74ad02174c9c6756662a29b752749c3 100644 --- a/demos/gtk-demo/popover.c +++ b/demos/gtk-demo/popover.c @@ -113,7 +113,7 @@ day_selected_cb (GtkCalendar *calendar, rect.width = rect.height = 1; popover = create_popover (GTK_WIDGET (calendar), - gtk_entry_new (), + GTK_WIDGET (gtk_entry_new ()), GTK_POS_BOTTOM); gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect); @@ -127,6 +127,8 @@ do_popover (GtkWidget *do_widget) { static GtkWidget *window = NULL; GtkWidget *popover, *box, *widget; + GtkToggleButton *button; + GtkEntry *entry; if (!window) { @@ -139,27 +141,27 @@ do_popover (GtkWidget *do_widget) g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window); - widget = gtk_toggle_button_new_with_label ("Button"); - popover = create_popover (widget, - gtk_label_new ("This popover does not grab input"), + button = gtk_toggle_button_new_with_label ("Button"); + popover = create_popover (GTK_WIDGET (button), + GTK_WIDGET (gtk_label_new ("This popover does not grab input")), GTK_POS_TOP); gtk_popover_set_autohide (GTK_POPOVER (popover), FALSE); - g_signal_connect (widget, "toggled", + g_signal_connect (button, "toggled", G_CALLBACK (toggle_changed_cb), popover); - gtk_container_add (GTK_CONTAINER (box), widget); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (button)); - widget = gtk_entry_new (); - popover = create_complex_popover (widget, GTK_POS_TOP); - gtk_entry_set_icon_from_icon_name (GTK_ENTRY (widget), + entry = gtk_entry_new (); + popover = create_complex_popover (GTK_WIDGET (entry), GTK_POS_TOP); + gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_PRIMARY, "edit-find"); - gtk_entry_set_icon_from_icon_name (GTK_ENTRY (widget), + gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, "edit-clear"); - g_signal_connect (widget, "icon-press", + g_signal_connect (entry, "icon-press", G_CALLBACK (entry_icon_press_cb), popover); - g_signal_connect (widget, "size-allocate", + g_signal_connect (entry, "size-allocate", G_CALLBACK (entry_size_allocate_cb), popover); - gtk_container_add (GTK_CONTAINER (box), widget); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (entry)); widget = gtk_calendar_new (); g_signal_connect (widget, "day-selected", diff --git a/demos/gtk-demo/rotated_text.c b/demos/gtk-demo/rotated_text.c index ce286cbcc9e16af1356c9f9361662b274e2a3131..53d511cf6c63053b3fe6afd149adf38ed21bab61 100644 --- a/demos/gtk-demo/rotated_text.c +++ b/demos/gtk-demo/rotated_text.c @@ -174,7 +174,7 @@ do_rotated_text (GtkWidget *do_widget) { GtkWidget *box; GtkWidget *drawing_area; - GtkWidget *label; + GtkLabel *label; PangoLayout *layout; PangoAttrList *attrs; @@ -202,15 +202,15 @@ do_rotated_text (GtkWidget *do_widget) /* And a label */ label = gtk_label_new (text); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); /* Set up fancy stuff on the label */ - layout = gtk_label_get_layout (GTK_LABEL (label)); + layout = gtk_label_get_layout (label); pango_cairo_context_set_shape_renderer (pango_layout_get_context (layout), fancy_shape_renderer, NULL, NULL); attrs = create_fancy_attr_list_for_layout (layout); - gtk_label_set_attributes (GTK_LABEL (label), attrs); + gtk_label_set_attributes (label, attrs); pango_attr_list_unref (attrs); } diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c index 3519a2534cb9e5b78c3eff526b49dbae45dd2e80..ad861d01a89530fad033085d32a1809b073917f6 100644 --- a/demos/gtk-demo/search_entry.c +++ b/demos/gtk-demo/search_entry.c @@ -243,8 +243,8 @@ do_search_entry (GtkWidget *do_widget) { GtkWidget *vbox; GtkWidget *hbox; - GtkWidget *label; - GtkWidget *entry; + GtkLabel *label; + GtkEntry *entry; GtkWidget *find_button; GtkWidget *cancel_button; @@ -262,18 +262,18 @@ do_search_entry (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), "Search entry demo"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_label_set_markup (label, "Search entry demo"); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_container_add (GTK_CONTAINER (vbox), hbox); /* Create our entry */ entry = gtk_entry_new (); - gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), + gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_PRIMARY, "edit-find-symbolic"); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); /* Create the find and cancel buttons */ notebook = gtk_notebook_new (); @@ -298,14 +298,14 @@ do_search_entry (GtkWidget *do_widget) set_search_by (NULL, value, entry); g_variant_unref (value); - gtk_entry_set_icon_activatable (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, TRUE); - gtk_entry_set_icon_sensitive (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, TRUE); + gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_PRIMARY, TRUE); + gtk_entry_set_icon_sensitive (entry, GTK_ENTRY_ICON_PRIMARY, TRUE); g_signal_connect (entry, "icon-press", G_CALLBACK (icon_press_cb), NULL); g_signal_connect (entry, "activate", G_CALLBACK (activate_cb), NULL); /* add accessible alternatives for icon functionality */ - entry_add_to_context_menu (GTK_ENTRY (entry)); + entry_add_to_context_menu (entry); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/search_entry2.c b/demos/gtk-demo/search_entry2.c index ea4bb62151d0f8a70e7e44c830f72390e1d40a93..90042aa3c4063b772ef62e81929d464de8258c2b 100644 --- a/demos/gtk-demo/search_entry2.c +++ b/demos/gtk-demo/search_entry2.c @@ -60,11 +60,11 @@ do_search_entry2 (GtkWidget *do_widget) static GtkWidget *window = NULL; GtkWidget *vbox; GtkWidget *hbox; - GtkWidget *label; + GtkLabel *label; GtkWidget *entry; GtkWidget *container; GtkWidget *searchbar; - GtkWidget *button; + GtkToggleButton *button; if (!window) { @@ -95,26 +95,26 @@ do_search_entry2 (GtkWidget *do_widget) /* Help */ label = gtk_label_new ("Start Typing to search"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); /* Toggle button */ button = gtk_toggle_button_new_with_label ("Search"); g_object_bind_property (button, "active", searchbar, "search-mode-enabled", G_BINDING_BIDIRECTIONAL); - gtk_container_add (GTK_CONTAINER (vbox), button); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (button)); /* Result */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_container_add (GTK_CONTAINER (vbox), hbox); label = gtk_label_new ("Result:"); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_widget_set_margin_start (label, 6); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_label_set_xalign (label, 0.0); + gtk_widget_set_margin_start (GTK_WIDGET (label), 6); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); label = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); g_signal_connect (entry, "search-changed", G_CALLBACK (search_changed_cb), label); @@ -125,12 +125,12 @@ do_search_entry2 (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (vbox), hbox); label = gtk_label_new ("Signal:"); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_widget_set_margin_start (label, 6); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_label_set_xalign (label, 0.0); + gtk_widget_set_margin_start (GTK_WIDGET (label), 6); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); label = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); g_signal_connect (entry, "search-changed", G_CALLBACK (search_changed), label); diff --git a/demos/gtk-demo/sidebar.c b/demos/gtk-demo/sidebar.c index 4de18c4c9148d24eef9829eba79e51cfb738588d..37578dfb69396d0e4729da8720651ca5e0c3b35e 100644 --- a/demos/gtk-demo/sidebar.c +++ b/demos/gtk-demo/sidebar.c @@ -62,13 +62,13 @@ do_sidebar (GtkWidget *do_widget) { if (i == 0) { - widget = gtk_image_new_from_icon_name ("org.gtk.Demo4"); + widget = GTK_WIDGET (gtk_image_new_from_icon_name ("org.gtk.Demo4")); gtk_style_context_add_class (gtk_widget_get_style_context (widget), "icon-dropshadow"); gtk_image_set_pixel_size (GTK_IMAGE (widget), 256); } else { - widget = gtk_label_new (c); + widget = GTK_WIDGET (gtk_label_new (c)); } gtk_stack_add_named (GTK_STACK (stack), widget, c); g_object_set (gtk_stack_get_page (GTK_STACK (stack), widget), "title", c, NULL); diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c index 2f628257789a7c6e188dd9a336bc0eaed32b30ac..d21835c792fcc45582c8190dc81dca3eba665f2f 100644 --- a/demos/gtk-demo/sizegroup.c +++ b/demos/gtk-demo/sizegroup.c @@ -18,16 +18,16 @@ /* Convenience function to create a combo box holding a number of strings */ -GtkWidget * +GtkComboBoxText * create_combo_box (const char **strings) { - GtkWidget *combo_box; + GtkComboBoxText *combo_box; const char **str; combo_box = gtk_combo_box_text_new (); for (str = strings; *str; str++) - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), *str); + gtk_combo_box_text_append_text (combo_box, *str); gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0); @@ -41,21 +41,21 @@ add_row (GtkGrid *table, const char *label_text, const char **options) { - GtkWidget *combo_box; - GtkWidget *label; + GtkComboBoxText *combo_box; + GtkLabel *label; label = gtk_label_new_with_mnemonic (label_text); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_widget_set_hexpand (label, TRUE); - gtk_grid_attach (table, label, 0, row, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_grid_attach (table, GTK_WIDGET (label), 0, row, 1, 1); combo_box = create_combo_box (options); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo_box); - gtk_widget_set_halign (combo_box, GTK_ALIGN_END); - gtk_widget_set_valign (combo_box, GTK_ALIGN_BASELINE); - gtk_size_group_add_widget (size_group, combo_box); - gtk_grid_attach (table, combo_box, 1, row, 1, 1); + gtk_label_set_mnemonic_widget (label, GTK_WIDGET (combo_box)); + gtk_widget_set_halign (GTK_WIDGET (combo_box), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (combo_box), GTK_ALIGN_BASELINE); + gtk_size_group_add_widget (size_group, GTK_WIDGET (combo_box)); + gtk_grid_attach (table, GTK_WIDGET (combo_box), 1, row, 1, 1); } static void @@ -83,7 +83,7 @@ do_sizegroup (GtkWidget *do_widget) GtkWidget *table; GtkWidget *frame; GtkWidget *vbox; - GtkWidget *check_button; + GtkCheckButton *check_button; GtkSizeGroup *size_group; static const char *color_options[] = { @@ -142,7 +142,7 @@ do_sizegroup (GtkWidget *do_widget) /* And a check button to turn grouping on and off */ check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping"); - gtk_container_add (GTK_CONTAINER (vbox), check_button); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (check_button)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); g_signal_connect (check_button, "toggled", diff --git a/demos/gtk-demo/sliding_puzzle.c b/demos/gtk-demo/sliding_puzzle.c index 9486004605b7cd2a0afc7982db48b1823abcecbf..7b03ace6464a109dabeedd52bd4b7eef66d86a1d 100644 --- a/demos/gtk-demo/sliding_puzzle.c +++ b/demos/gtk-demo/sliding_puzzle.c @@ -28,7 +28,7 @@ move_puzzle (GtkWidget *grid, int dx, int dy) { - GtkWidget *pos, *next; + GtkPicture *pos, *next; GdkPaintable *piece; guint next_x, next_y; @@ -50,13 +50,13 @@ move_puzzle (GtkWidget *grid, next_y = pos_y + dy; /* Get the current and next image */ - pos = gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y); - next = gtk_grid_get_child_at (GTK_GRID (grid), next_x, next_y); + pos = GTK_PICTURE (gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y)); + next = GTK_PICTURE (gtk_grid_get_child_at (GTK_GRID (grid), next_x, next_y)); /* Move the displayed piece. */ - piece = gtk_picture_get_paintable (GTK_PICTURE (next)); - gtk_picture_set_paintable (GTK_PICTURE (pos), piece); - gtk_picture_set_paintable (GTK_PICTURE (next), NULL); + piece = gtk_picture_get_paintable (next); + gtk_picture_set_paintable (pos, piece); + gtk_picture_set_paintable (next, NULL); /* Update the current position */ pos_x = next_x; @@ -109,7 +109,7 @@ shuffle_puzzle (GtkWidget *grid) static gboolean check_solved (GtkWidget *grid) { - GtkWidget *picture; + GtkPicture *picture; GdkPaintable *piece; guint x, y; @@ -128,8 +128,8 @@ check_solved (GtkWidget *grid) { for (x = 0; x < width; x++) { - picture = gtk_grid_get_child_at (GTK_GRID (grid), x, y); - piece = gtk_picture_get_paintable (GTK_PICTURE (picture)); + picture = GTK_PICTURE (gtk_grid_get_child_at (GTK_GRID (grid), x, y)); + piece = gtk_picture_get_paintable (picture); /* empty cell */ if (piece == NULL) @@ -147,14 +147,14 @@ check_solved (GtkWidget *grid) /* Fill the empty cell to show that we're done. */ - picture = gtk_grid_get_child_at (GTK_GRID (grid), 0, 0); - piece = gtk_picture_get_paintable (GTK_PICTURE (picture)); + picture = GTK_PICTURE (gtk_grid_get_child_at (GTK_GRID (grid), 0, 0)); + piece = gtk_picture_get_paintable (picture); piece = gtk_puzzle_piece_new (gtk_puzzle_piece_get_puzzle (GTK_PUZZLE_PIECE (piece)), pos_x, pos_y, width, height); - picture = gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y); - gtk_picture_set_paintable (GTK_PICTURE (picture), piece); + picture = GTK_PICTURE (gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y)); + gtk_picture_set_paintable (picture, piece); return TRUE; } @@ -279,7 +279,8 @@ puzzle_button_pressed (GtkGestureClick *gesture, static void start_puzzle (GdkPaintable *puzzle) { - GtkWidget *picture, *grid; + GtkPicture *picture; + GtkWidget *grid; GtkEventController *controller; guint x, y; float aspect_ratio; @@ -336,9 +337,9 @@ start_puzzle (GdkPaintable *puzzle) x, y, width, height); picture = gtk_picture_new_for_paintable (piece); - gtk_picture_set_keep_aspect_ratio (GTK_PICTURE (picture), FALSE); + gtk_picture_set_keep_aspect_ratio (picture, FALSE); gtk_grid_attach (GTK_GRID (grid), - picture, + GTK_WIDGET (picture), x, y, 1, 1); } @@ -393,12 +394,12 @@ static void add_choice (GtkWidget *choices, GdkPaintable *paintable) { - GtkWidget *icon; + GtkImage *icon; icon = gtk_image_new_from_paintable (paintable); - gtk_image_set_icon_size (GTK_IMAGE (icon), GTK_ICON_SIZE_LARGE); + gtk_image_set_icon_size (icon, GTK_ICON_SIZE_LARGE); - gtk_container_add (GTK_CONTAINER (choices), icon); + gtk_container_add (GTK_CONTAINER (choices), GTK_WIDGET (icon)); } GtkWidget * @@ -412,7 +413,7 @@ do_sliding_puzzle (GtkWidget *do_widget) GtkWidget *popover; GtkWidget *tweaks; GtkWidget *apply; - GtkWidget *label; + GtkLabel *label; GtkWidget *sw; GtkMediaStream *media; @@ -437,8 +438,8 @@ do_sliding_puzzle (GtkWidget *do_widget) gtk_grid_attach (GTK_GRID (tweaks), sw, 0, 0, 2, 1); label = gtk_label_new ("Size"); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_grid_attach (GTK_GRID (tweaks), label, 0, 1, 1, 1); + gtk_label_set_xalign (label, 0.0); + gtk_grid_attach (GTK_GRID (tweaks), GTK_WIDGET (label), 0, 1, 1, 1); size_spin = gtk_spin_button_new_with_range (2, 10, 1); gtk_spin_button_set_value (GTK_SPIN_BUTTON (size_spin), width); gtk_grid_attach (GTK_GRID (tweaks), size_spin, 1, 1, 1, 1); diff --git a/demos/gtk-demo/spinner.c b/demos/gtk-demo/spinner.c index a134c4ba63864a96a3f3ec2c05431cec77c439d5..e5174f66cc716296101d9bfe9a1d9ee30d52f5e5 100644 --- a/demos/gtk-demo/spinner.c +++ b/demos/gtk-demo/spinner.c @@ -59,7 +59,7 @@ do_spinner (GtkWidget *do_widget) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); spinner = gtk_spinner_new (); gtk_container_add (GTK_CONTAINER (hbox), spinner); - gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ()); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (gtk_entry_new ())); gtk_container_add (GTK_CONTAINER (vbox), hbox); spinner_sensitive = spinner; @@ -67,7 +67,7 @@ do_spinner (GtkWidget *do_widget) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); spinner = gtk_spinner_new (); gtk_container_add (GTK_CONTAINER (hbox), spinner); - gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ()); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (gtk_entry_new ())); gtk_container_add (GTK_CONTAINER (vbox), hbox); spinner_unsensitive = spinner; gtk_widget_set_sensitive (hbox, FALSE); diff --git a/demos/gtk-demo/tagged_entry.c b/demos/gtk-demo/tagged_entry.c index 6c3ec44de8e2ae3a802fdc0dd6a81370631920d3..676154b7577c67dce69a5c72381f129b6215822d 100644 --- a/demos/gtk-demo/tagged_entry.c +++ b/demos/gtk-demo/tagged_entry.c @@ -59,6 +59,7 @@ do_tagged_entry (GtkWidget *do_widget) GtkWidget *box2; GtkWidget *header; GtkWidget *entry; + GtkCheckButton *check; GtkWidget *button; if (!window) @@ -90,9 +91,9 @@ do_tagged_entry (GtkWidget *do_widget) g_signal_connect (button, "clicked", G_CALLBACK (add_tag), entry); gtk_container_add (GTK_CONTAINER (box2), button); - button = gtk_check_button_new_with_mnemonic ("_Spinner"); - g_signal_connect (button, "toggled", G_CALLBACK (toggle_spinner), entry); - gtk_container_add (GTK_CONTAINER (box2), button); + check = gtk_check_button_new_with_mnemonic ("_Spinner"); + g_signal_connect (check, "toggled", G_CALLBACK (toggle_spinner), entry); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (check)); button = gtk_button_new_with_mnemonic ("_Done"); gtk_style_context_add_class (gtk_widget_get_style_context (button), "suggested-action"); diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c index c28312a517c2a08e4a339eb48221fa4b45c08141..37b4ebdb153680e38fb829721f453f8f14c67463 100644 --- a/demos/gtk-demo/textview.c +++ b/demos/gtk-demo/textview.c @@ -423,7 +423,7 @@ attach_widgets (GtkTextView *text_view) } else if (i == 1) { - widget = gtk_combo_box_text_new (); + widget = GTK_WIDGET (gtk_combo_box_text_new ()); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 1"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 2"); @@ -437,7 +437,7 @@ attach_widgets (GtkTextView *text_view) } else if (i == 3) { - widget = gtk_entry_new (); + widget = GTK_WIDGET (gtk_entry_new ()); } else { diff --git a/demos/gtk-demo/themes.c b/demos/gtk-demo/themes.c index bfffc3a69a952de4015ada3415e8f4e57d9f87bd..cc2c46b409b6b6faddf4d3ed80dcaef61b49bdcc 100644 --- a/demos/gtk-demo/themes.c +++ b/demos/gtk-demo/themes.c @@ -98,7 +98,7 @@ change_theme (GtkWidget *widget, { GtkBuilder *builder = data; GtkWidget *header; - GtkWidget *label; + GtkLabel *label; Theme next = themes[theme++ % G_N_ELEMENTS (themes)]; char *name; @@ -112,17 +112,17 @@ change_theme (GtkWidget *widget, gtk_header_bar_set_title (GTK_HEADER_BAR (header), name); g_free (name); - label = GTK_WIDGET (gtk_builder_get_object (builder, "fps")); + label = GTK_LABEL (gtk_builder_get_object (builder, "fps")); if (frame_clock) { char *fps; fps = g_strdup_printf ("%.2f fps", frame_clock_get_fps (frame_clock)); - gtk_label_set_label (GTK_LABEL (label), fps); + gtk_label_set_label (label, fps); g_free (fps); } else - gtk_label_set_label (GTK_LABEL (label), ""); + gtk_label_set_label (label, ""); return G_SOURCE_CONTINUE; } diff --git a/demos/gtk-demo/transparent.c b/demos/gtk-demo/transparent.c index 9f1e9898569f9cb5a3ba188255e371ce7db3b84e..75f6ff347399d55661d39c5c8313d253ae7964d1 100644 --- a/demos/gtk-demo/transparent.c +++ b/demos/gtk-demo/transparent.c @@ -16,7 +16,7 @@ do_transparent (GtkWidget *do_widget) GtkWidget *overlay; GtkWidget *button; GtkWidget *label; - GtkWidget *picture; + GtkPicture *picture; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_display (GTK_WINDOW (window), @@ -52,7 +52,7 @@ do_transparent (GtkWidget *do_widget) blur_overlay_add_overlay (BLUR_OVERLAY (overlay), button, 5.0); picture = gtk_picture_new_for_resource ("/transparent/portland-rose.jpg"); - gtk_container_add (GTK_CONTAINER (overlay), picture); + gtk_container_add (GTK_CONTAINER (overlay), GTK_WIDGET (picture)); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c index 77a2f8440897331489c7abc7f499ed5d2ff4d123..ec89419943bafcb3fc9b0e7070983ca1990f9ae7 100644 --- a/demos/gtk-demo/tree_store.c +++ b/demos/gtk-demo/tree_store.c @@ -402,7 +402,7 @@ do_tree_store (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); gtk_container_add (GTK_CONTAINER (vbox), - gtk_label_new ("Jonathan's Holiday Card Planning Sheet")); + GTK_WIDGET (gtk_label_new ("Jonathan's Holiday Card Planning Sheet"))); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), diff --git a/demos/gtk-demo/video_player.c b/demos/gtk-demo/video_player.c index 73e659d6a9c5bd01805ea7216460c4926d6d6c70..017afe99ab0259370819a5a15578de6940bafe4f 100644 --- a/demos/gtk-demo/video_player.c +++ b/demos/gtk-demo/video_player.c @@ -30,7 +30,7 @@ static void open_clicked_cb (GtkWidget *button, GtkWidget *video) { - GtkWidget *dialog; + GtkFileChooserDialog *dialog; dialog = gtk_file_chooser_dialog_new ("Select a video", GTK_WINDOW (gtk_widget_get_root (button)), @@ -41,7 +41,7 @@ open_clicked_cb (GtkWidget *button, gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); g_signal_connect (dialog, "response", G_CALLBACK (open_dialog_response_cb), video); - gtk_widget_show (dialog); + gtk_widget_show (GTK_WIDGET (dialog)); } static void @@ -57,7 +57,7 @@ GtkWidget * do_video_player (GtkWidget *do_widget) { GtkWidget *title; - GtkWidget *video; + GtkVideo *video; GtkWidget *open_button; GtkWidget *fullscreen_button; @@ -71,7 +71,7 @@ do_video_player (GtkWidget *do_widget) G_CALLBACK (gtk_widget_destroyed), &window); video = gtk_video_new (); - gtk_container_add (GTK_CONTAINER (window), video); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (video)); title = gtk_header_bar_new (); gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (title), TRUE); diff --git a/demos/icon-browser/iconbrowserwin.c b/demos/icon-browser/iconbrowserwin.c index d31a635b4b5b3a1bbd6c13c5902e588b3e35f177..754f87701bf472b97c9ee8a981e623148fe9fb6d 100644 --- a/demos/icon-browser/iconbrowserwin.c +++ b/demos/icon-browser/iconbrowserwin.c @@ -50,7 +50,7 @@ struct _IconBrowserWindow GtkWidget *image5; GtkWidget *image6; GtkWidget *label6; - GtkWidget *description; + GtkLabel *description; }; struct _IconBrowserWindowClass @@ -124,12 +124,12 @@ item_activated (GtkIconView *icon_view, GtkTreePath *path, IconBrowserWindow *wi } if (description && description[0]) { - gtk_label_set_text (GTK_LABEL (win->description), description); - gtk_widget_show (win->description); + gtk_label_set_text (win->description, description); + gtk_widget_show (GTK_WIDGET (win->description)); } else { - gtk_widget_hide (win->description); + gtk_widget_hide (GTK_WIDGET (win->description)); } gtk_window_present (GTK_WINDOW (win->details)); @@ -176,7 +176,7 @@ add_context (IconBrowserWindow *win, const gchar *description) { Context *c; - GtkWidget *row; + GtkLabel *row; c = g_new (Context, 1); c->id = g_strdup (id); @@ -186,16 +186,15 @@ add_context (IconBrowserWindow *win, g_hash_table_insert (win->contexts, c->id, c); row = gtk_label_new (name); - gtk_label_set_xalign (GTK_LABEL (row), 0); + gtk_label_set_xalign (row, 0); g_object_set_data (G_OBJECT (row), "context", c); - gtk_widget_show (row); + gtk_widget_show (GTK_WIDGET (row)); g_object_set (row, "margin", 10, NULL); - gtk_list_box_insert (GTK_LIST_BOX (win->context_list), row, -1); + gtk_list_box_insert (GTK_LIST_BOX (win->context_list), GTK_WIDGET (row), -1); /* set the tooltip on the list box row */ - row = gtk_widget_get_parent (row); - gtk_widget_set_tooltip_text (row, description); + gtk_widget_set_tooltip_text (gtk_widget_get_parent (GTK_WIDGET (row)), description); if (win->current_context == NULL) win->current_context = c; diff --git a/demos/node-editor/node-editor-window.c b/demos/node-editor/node-editor-window.c index 9e880354f3054b5b429f1472aaa05453d543b90f..7831ccb62add1fec2a4d754b3419e05bc98a155d 100644 --- a/demos/node-editor/node-editor-window.c +++ b/demos/node-editor/node-editor-window.c @@ -40,13 +40,13 @@ struct _NodeEditorWindow { GtkApplicationWindow parent; - GtkWidget *picture; + GtkPicture *picture; GtkWidget *text_view; GtkTextBuffer *text_buffer; GtkTextTagTable *tag_table; GtkWidget *testcase_popover; - GtkWidget *testcase_error_label; + GtkLabel *testcase_error_label; GtkWidget *testcase_cairo_checkbutton; GtkWidget *testcase_name_entry; GtkWidget *testcase_save_button; @@ -185,7 +185,7 @@ text_changed (GtkTextBuffer *buffer, gtk_snapshot_append_node (snapshot, node); gsk_render_node_unref (node); paintable = gtk_snapshot_free_to_paintable (snapshot, &bounds.size); - gtk_picture_set_paintable (GTK_PICTURE (self->picture), paintable); + gtk_picture_set_paintable (self->picture, paintable); for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i++) { gpointer item = g_list_model_get_item (G_LIST_MODEL (self->renderers), i); @@ -196,7 +196,7 @@ text_changed (GtkTextBuffer *buffer, } else { - gtk_picture_set_paintable (GTK_PICTURE (self->picture), NULL); + gtk_picture_set_paintable (self->picture, NULL); } GtkTextIter iter; @@ -374,7 +374,7 @@ open_response_cb (GtkWidget *dialog, static void show_open_filechooser (NodeEditorWindow *self) { - GtkWidget *dialog; + GtkFileChooserDialog *dialog; dialog = gtk_file_chooser_dialog_new ("Open node file", GTK_WINDOW (self), @@ -387,7 +387,7 @@ show_open_filechooser (NodeEditorWindow *self) gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), "."); g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), self); - gtk_widget_show (dialog); + gtk_widget_show (GTK_WIDGET (dialog)); } static void @@ -437,7 +437,7 @@ static void save_cb (GtkWidget *button, NodeEditorWindow *self) { - GtkWidget *dialog; + GtkFileChooserDialog *dialog; dialog = gtk_file_chooser_dialog_new ("Save node", GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))), @@ -451,7 +451,7 @@ save_cb (GtkWidget *button, gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), "."); g_signal_connect (dialog, "response", G_CALLBACK (save_response_cb), self); - gtk_widget_show (dialog); + gtk_widget_show (GTK_WIDGET (dialog)); } static GdkTexture * @@ -463,7 +463,7 @@ create_texture (NodeEditorWindow *self) GskRenderNode *node; GdkTexture *texture; - paintable = gtk_picture_get_paintable (GTK_PICTURE (self->picture)); + paintable = gtk_picture_get_paintable (self->picture); if (paintable == NULL || gdk_paintable_get_intrinsic_width (paintable) <= 0 || gdk_paintable_get_intrinsic_height (paintable) <= 0) @@ -491,7 +491,7 @@ create_cairo_texture (NodeEditorWindow *self) GdkTexture *texture; GdkSurface *surface; - paintable = gtk_picture_get_paintable (GTK_PICTURE (self->picture)); + paintable = gtk_picture_get_paintable (self->picture); if (paintable == NULL || gdk_paintable_get_intrinsic_width (paintable) <= 0 || gdk_paintable_get_intrinsic_height (paintable) <= 0) @@ -550,7 +550,7 @@ export_image_cb (GtkWidget *button, NodeEditorWindow *self) { GdkTexture *texture; - GtkWidget *dialog; + GtkFileChooserDialog *dialog; texture = create_texture (self); if (texture == NULL) @@ -567,7 +567,7 @@ export_image_cb (GtkWidget *button, gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); g_signal_connect (dialog, "response", G_CALLBACK (export_image_response_cb), texture); - gtk_widget_show (dialog); + gtk_widget_show (GTK_WIDGET (dialog)); } static void @@ -613,7 +613,7 @@ testcase_save_clicked_cb (GtkWidget *button, if (!gdk_texture_save_to_png (texture, png_file)) { - gtk_label_set_label (GTK_LABEL (self->testcase_error_label), + gtk_label_set_label (self->testcase_error_label, "Could not save texture file"); goto out; } @@ -621,7 +621,7 @@ testcase_save_clicked_cb (GtkWidget *button, text = get_current_text (self->text_buffer); if (!g_file_set_contents (node_file, text, -1, &error)) { - gtk_label_set_label (GTK_LABEL (self->testcase_error_label), error->message); + gtk_label_set_label (self->testcase_error_label, error->message); /* TODO: Remove texture file again? */ goto out; } @@ -665,7 +665,7 @@ node_editor_window_add_renderer (NodeEditorWindow *self, return; } - paintable = gtk_renderer_paintable_new (renderer, gtk_picture_get_paintable (GTK_PICTURE (self->picture))); + paintable = gtk_renderer_paintable_new (renderer, gtk_picture_get_paintable (self->picture)); g_object_set_data_full (G_OBJECT (paintable), "description", g_strdup (description), g_free); g_clear_object (&renderer); @@ -757,20 +757,22 @@ node_editor_window_create_renderer_widget (gpointer item, gpointer user_data) { GdkPaintable *paintable = item; - GtkWidget *box, *label, *picture; + GtkWidget *box; + GtkPicture *picture; + GtkLabel *label; GtkWidget *row; box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_set_size_request (box, 120, 90); label = gtk_label_new (g_object_get_data (G_OBJECT (paintable), "description")); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); picture = gtk_picture_new_for_paintable (paintable); /* don't ever scale up, we want to be as accurate as possible */ - gtk_widget_set_halign (picture, GTK_ALIGN_CENTER); - gtk_widget_set_valign (picture, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (box), picture); + gtk_widget_set_halign (GTK_WIDGET (picture), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (picture), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (picture)); row = gtk_list_box_row_new (); gtk_container_add (GTK_CONTAINER (row), box); diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index d50143deda2d433816bc946c4027ad9c0678dbd9..77b21ff8678b9cb32574dc735323d8b509dd850f 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -273,7 +273,7 @@ activate_inspector (GSimpleAction *action, } static void -spin_value_changed (GtkAdjustment *adjustment, GtkWidget *label) +spin_value_changed (GtkAdjustment *adjustment, GtkLabel *label) { GtkWidget *w; gint v; @@ -284,11 +284,11 @@ spin_value_changed (GtkAdjustment *adjustment, GtkWidget *label) if ((v % 3) == 0) { text = g_strdup_printf ("%d is a multiple of 3", v); - gtk_label_set_label (GTK_LABEL (label), text); + gtk_label_set_label (label, text); g_free (text); } - w = gtk_widget_get_ancestor (label, GTK_TYPE_REVEALER); + w = gtk_widget_get_ancestor (GTK_WIDGET (label), GTK_TYPE_REVEALER); gtk_revealer_set_reveal_child (GTK_REVEALER (w), (v % 3) == 0); } @@ -724,25 +724,25 @@ update_title_header (GtkListBoxRow *row, GtkListBoxRow *before, gpointer data) { - GtkWidget *header; + GtkLabel *header; gchar *title; - header = gtk_list_box_row_get_header (row); + header = GTK_LABEL (gtk_list_box_row_get_header (row)); title = (gchar *)g_object_get_data (G_OBJECT (row), "title"); if (!header && title) { title = g_strdup_printf ("%s", title); header = gtk_label_new (title); - gtk_label_set_use_markup (GTK_LABEL (header), TRUE); - gtk_widget_set_halign (header, GTK_ALIGN_START); - gtk_widget_set_margin_top (header, 12); - gtk_widget_set_margin_start (header, 6); - gtk_widget_set_margin_end (header, 6); - gtk_widget_set_margin_bottom (header, 6); - gtk_widget_show (header); + gtk_label_set_use_markup (header, TRUE); + gtk_widget_set_halign (GTK_WIDGET (header), GTK_ALIGN_START); + gtk_widget_set_margin_top (GTK_WIDGET (header), 12); + gtk_widget_set_margin_start (GTK_WIDGET (header), 6); + gtk_widget_set_margin_end (GTK_WIDGET (header), 6); + gtk_widget_set_margin_bottom (GTK_WIDGET (header), 6); + gtk_widget_show (GTK_WIDGET (header)); - gtk_list_box_row_set_header (row, header); + gtk_list_box_row_set_header (row, GTK_WIDGET (header)); g_free (title); } @@ -751,7 +751,8 @@ update_title_header (GtkListBoxRow *row, static void overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget) { - GtkWidget *box, *row, *label, *swatch; + GtkWidget *box, *row, *swatch; + GtkLabel *label; GdkRGBA rgba; const gchar *color; gchar *text; @@ -797,7 +798,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget) "margin", 6, "xalign", 0.0, NULL); - gtk_container_add (GTK_CONTAINER (row), label); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (label)); gdk_rgba_parse (&rgba, color); swatch = g_object_new (g_type_from_name ("GtkColorSwatch"), "rgba", &rgba, @@ -891,7 +892,8 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser) { "10", "#C68292", NULL } }; gint i; - GtkWidget *row, *box, *label, *swatch; + GtkWidget *row, *box, *swatch; + GtkLabel *label; GtkWidget *sw; GdkRGBA rgba; @@ -908,7 +910,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser) "hexpand", TRUE, "xalign", 0.0, NULL); - gtk_container_add (GTK_CONTAINER (row), label); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (label)); gdk_rgba_parse (&rgba, colors[i].color); swatch = g_object_new (g_type_from_name ("GtkColorSwatch"), "rgba", &rgba, @@ -948,6 +950,7 @@ background_loaded_cb (GObject *source, gpointer data) { BackgroundData *bd = data; + GtkPicture *picture; GtkWidget *child; GdkPixbuf *pixbuf; GError *error = NULL; @@ -960,10 +963,10 @@ background_loaded_cb (GObject *source, return; } - child = gtk_picture_new_for_pixbuf (pixbuf); - gtk_widget_set_size_request (child, 110, 70); - gtk_flow_box_insert (GTK_FLOW_BOX (bd->flowbox), child, -1); - child = gtk_widget_get_parent (child); + picture = gtk_picture_new_for_pixbuf (pixbuf); + gtk_widget_set_size_request (GTK_WIDGET (picture), 110, 70); + gtk_flow_box_insert (GTK_FLOW_BOX (bd->flowbox), GTK_WIDGET (picture), -1); + child = gtk_widget_get_parent (GTK_WIDGET (picture)); g_object_set_data_full (G_OBJECT (child), "filename", bd->filename, g_free); g_free (bd); } @@ -980,7 +983,7 @@ populate_flowbox (GtkWidget *flowbox) GInputStream *stream; BackgroundData *bd; GdkPixbuf *pixbuf; - GtkWidget *child; + GtkPicture *child; if (GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (flowbox), "populated"))) return; @@ -990,7 +993,7 @@ populate_flowbox (GtkWidget *flowbox) pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 110, 70); gdk_pixbuf_fill (pixbuf, 0xffffffff); child = gtk_picture_new_for_pixbuf (pixbuf); - gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), child, -1); + gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), GTK_WIDGET (child), -1); location = "/usr/share/backgrounds/gnome"; dir = g_dir_open (location, 0, &error); diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index 73b0a431fc146e331a831a9883adce63bd9ca4f0..37a538269049e4b76d61dd8c51dfa7971ef7118e 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -87,14 +87,14 @@ static WidgetInfo * create_switch (void) { GtkWidget *widget; - GtkWidget *sw; + GtkSwitch *sw; widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); sw = gtk_switch_new (); - gtk_switch_set_active (GTK_SWITCH (sw), TRUE); - gtk_container_add (GTK_CONTAINER (widget), sw); + gtk_switch_set_active (sw, TRUE); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (sw)); sw = gtk_switch_new (); - gtk_container_add (GTK_CONTAINER (widget), sw); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (sw)); gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); @@ -105,12 +105,12 @@ create_switch (void) static WidgetInfo * create_toggle_button (void) { - GtkWidget *widget; + GtkToggleButton *widget; widget = gtk_toggle_button_new_with_mnemonic ("_Toggle Button"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_toggle_button_set_active (widget, FALSE); + gtk_widget_set_halign (GTK_WIDGDET (widget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGDET (widget), GTK_ALIGN_CENTER); return new_widget_info ("toggle-button", widget, SMALL); } @@ -118,14 +118,14 @@ create_toggle_button (void) static WidgetInfo * create_check_button (void) { - GtkWidget *widget; + GtkCheckButton *widget; widget = gtk_check_button_new_with_mnemonic ("_Check Button"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (widget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (widget), GTK_ALIGN_CENTER); - return new_widget_info ("check-button", widget, SMALL); + return new_widget_info ("check-button", GTK_WIDGET (widget), SMALL); } static WidgetInfo * @@ -144,14 +144,14 @@ static WidgetInfo * create_menu_button (void) { GtkWidget *widget; - GtkWidget *image; + GtkImage *image; GtkWidget *menu; GtkWidget *vbox; widget = gtk_menu_button_new (); image = gtk_image_new (); - gtk_image_set_from_icon_name (GTK_IMAGE (image), "emblem-system-symbolic"); - gtk_container_add (GTK_CONTAINER (widget), image); + gtk_image_set_from_icon_name (image, "emblem-system-symbolic"); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (image)); menu = gtk_popover_new (NULL); gtk_menu_button_set_popover (GTK_MENU_BUTTON (widget), menu); @@ -221,11 +221,11 @@ create_lockbutton (void) static WidgetInfo * create_entry (void) { - GtkWidget *widget; + GtkEntry *widget; widget = gtk_entry_new (); - gtk_widget_set_halign (widget, GTK_ALIGN_FILL); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (widget), GTK_ALIGN_FILL); + gtk_widget_set_valign (GTK_WIDGET (widget), GTK_ALIGN_CENTER); gtk_editable_set_text (GTK_EDITABLE (widget), "Entry"); gtk_editable_set_position (GTK_EDITABLE (widget), -1); @@ -330,7 +330,7 @@ create_combo_box_entry (void) static WidgetInfo * create_combo_box (void) { - GtkWidget *widget; + GtkComboBox *widget; GtkCellRenderer *cell; GtkListStore *store; @@ -342,28 +342,28 @@ create_combo_box (void) store = gtk_list_store_new (1, G_TYPE_STRING); gtk_list_store_insert_with_values (store, NULL, -1, 0, "Combo Box", -1); - gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); + gtk_combo_box_set_model (widget, GTK_TREE_MODEL (store)); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_combo_box_set_active (GTK_WIDGET (widget), 0); + gtk_widget_set_halign (GTK_WIDGET (widget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (widget), GTK_ALIGN_CENTER); - return new_widget_info ("combo-box", widget, SMALL); + return new_widget_info ("combo-box", GTK_WIDGET (widget), SMALL); } static WidgetInfo * create_combo_box_text (void) { - GtkWidget *widget; + GtkComboBoxText *widget; widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Combo Box Text"); + gtk_combo_box_text_append_text (widget, "Combo Box Text"); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (widget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (widget), GTK_ALIGN_CENTER); - return new_widget_info ("combo-box-text", widget, SMALL); + return new_widget_info ("combo-box-text", GTK_WIDGET (widget), SMALL); } static WidgetInfo * @@ -419,7 +419,7 @@ create_search_bar (void) static WidgetInfo * create_action_bar (void) { - GtkWidget *widget; + GtkActionBar *widget; GtkWidget *button; WidgetInfo *info; GtkWidget *view; @@ -439,9 +439,9 @@ create_action_bar (void) gtk_container_add (GTK_CONTAINER (widget), button); g_object_set (gtk_widget_get_parent (button), "margin", 6, "spacing", 6, NULL); - gtk_widget_show (widget); + gtk_widget_show (GTK_WIDGET (widget)); - gtk_container_add (GTK_CONTAINER (box), widget); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (widget)); info = new_widget_info ("action-bar", box, SMALL); @@ -552,7 +552,7 @@ static WidgetInfo * create_color_button (void) { GtkWidget *vbox; - GtkWidget *picker; + GtkColorButton *picker; GdkRGBA color; vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); @@ -560,9 +560,9 @@ create_color_button (void) color.green = 0x90<<8; color.blue = 0xff<<8; picker = gtk_color_button_new_with_rgba (&color); - gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); - gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (vbox), picker); + gtk_widget_set_halign (GTK_WIDGET (picker), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (picker), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (picker)); gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Color Button")); @@ -608,7 +608,7 @@ create_file_button (void) gtk_container_add (GTK_CONTAINER (vbox), vbox2); gtk_container_add (GTK_CONTAINER (vbox), - gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); picker = gtk_file_chooser_button_new ("File Chooser Button", @@ -638,9 +638,9 @@ create_separator (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE); gtk_container_add (GTK_CONTAINER (hbox), - gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); gtk_container_add (GTK_CONTAINER (hbox), - gtk_separator_new (GTK_ORIENTATION_VERTICAL)); + GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_VERTICAL))); gtk_container_add (GTK_CONTAINER (vbox), hbox); gtk_container_add (GTK_CONTAINER (vbox), g_object_new (GTK_TYPE_LABEL, @@ -723,7 +723,7 @@ static WidgetInfo * create_filesel (void) { WidgetInfo *info; - GtkWidget *widget; + GtkFileChooserDialog *widget; widget = gtk_file_chooser_dialog_new ("File Chooser Dialog", NULL, @@ -733,7 +733,7 @@ create_filesel (void) NULL); gtk_window_set_default_size (GTK_WINDOW (widget), 505, 305); - info = new_widget_info ("filechooser", widget, ASIS); + info = new_widget_info ("filechooser", GTK_WIDGET (widget), ASIS); info->include_decorations = TRUE; return info; @@ -743,11 +743,11 @@ static WidgetInfo * create_print_dialog (void) { WidgetInfo *info; - GtkWidget *widget; + GtkPrintUnixDialog *widget; widget = gtk_print_unix_dialog_new ("Print Dialog", NULL); gtk_widget_set_size_request (widget, 505, 350); - info = new_widget_info ("printdialog", widget, ASIS); + info = new_widget_info ("printdialog", GTK_WIDGET (widget), ASIS); info->include_decorations = TRUE; return info; @@ -757,7 +757,7 @@ static WidgetInfo * create_page_setup_dialog (void) { WidgetInfo *info; - GtkWidget *widget; + GtkPageSetupUnixDialog *widget; GtkPageSetup *page_setup; GtkPrintSettings *settings; @@ -769,7 +769,7 @@ create_page_setup_dialog (void) gtk_page_setup_unix_dialog_set_print_settings (GTK_PAGE_SETUP_UNIX_DIALOG (widget), settings); - info = new_widget_info ("pagesetupdialog", widget, ASIS); + info = new_widget_info ("pagesetupdialog", GTK_WIDGET (widget), ASIS); info->include_decorations = TRUE; return info; @@ -778,26 +778,26 @@ create_page_setup_dialog (void) static WidgetInfo * create_toolbar (void) { - GtkWidget *widget; + GtkToolbar *widget; GtkToolItem *item; widget = gtk_toolbar_new (); item = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "document-new"); - gtk_toolbar_insert (GTK_TOOLBAR (widget), item, -1); + gtk_toolbar_insert (widget, item, -1); item = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "document-open"); - gtk_toolbar_insert (GTK_TOOLBAR (widget), item, -1); + gtk_toolbar_insert (widget, item, -1); item = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "view-refresh"); - gtk_toolbar_insert (GTK_TOOLBAR (widget), item, -1); + gtk_toolbar_insert (widget, item, -1); - gtk_toolbar_set_show_arrow (GTK_TOOLBAR (widget), FALSE); + gtk_toolbar_set_show_arrow (widget, FALSE); - return new_widget_info ("toolbar", widget, SMALL); + return new_widget_info ("toolbar", GTK_WIDGET (widget), SMALL); } static WidgetInfo * @@ -819,7 +819,7 @@ create_message_dialog (void) static WidgetInfo * create_about_dialog (void) { - GtkWidget *widget; + GtkAboutDialog *widget; const gchar *authors[] = { "Peter Mattis", "Spencer Kimball", @@ -840,7 +840,7 @@ create_about_dialog (void) "authors", authors, NULL); gtk_window_set_icon_name (GTK_WINDOW (widget), "help-about"); - return new_widget_info ("aboutdialog", widget, ASIS); + return new_widget_info ("aboutdialog", GTK_WIDGET (widget), ASIS); } static WidgetInfo * @@ -998,16 +998,16 @@ create_scales (void) static WidgetInfo * create_image (void) { - GtkWidget *widget; + GtkImage *widget; GtkWidget *vbox; widget = gtk_image_new_from_icon_name ("applications-graphics"); - gtk_image_set_icon_size (GTK_IMAGE (widget), GTK_ICON_SIZE_LARGE); - gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_image_set_icon_size (widget, GTK_ICON_SIZE_LARGE); + gtk_widget_set_halign (GTK_WIDGET (widget), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (widget), GTK_ALIGN_CENTER); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - gtk_container_add (GTK_CONTAINER (vbox), widget); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (widget)); gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Image")); @@ -1090,14 +1090,14 @@ create_assistant (void) static WidgetInfo * create_appchooserbutton (void) { - GtkWidget *picker; + GtkAppChooserButton *picker; GtkWidget *vbox; vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); picker = gtk_app_chooser_button_new ("text/plain"); - gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); - gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (vbox), picker); + gtk_widget_set_halign (GTK_WIDGET (picker), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (picker), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (picker)); gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Application Button")); @@ -1108,12 +1108,12 @@ static WidgetInfo * create_appchooserdialog (void) { WidgetInfo *info; - GtkWidget *widget; + GtkAppChooserDialog *widget; widget = gtk_app_chooser_dialog_new_for_content_type (NULL, 0, "image/png"); gtk_window_set_default_size (GTK_WINDOW (widget), 200, 300); - info = new_widget_info ("appchooserdialog", widget, ASIS); + info = new_widget_info ("appchooserdialog", GTK_WIDGET (widget), ASIS); info->include_decorations = TRUE; return info; @@ -1123,11 +1123,11 @@ static WidgetInfo * create_fontchooserdialog (void) { WidgetInfo *info; - GtkWidget *widget; + GtkFontChooserDialog *widget; widget = gtk_font_chooser_dialog_new ("Font Chooser Dialog", NULL); gtk_window_set_default_size (GTK_WINDOW (widget), 200, 300); - info = new_widget_info ("fontchooser", widget, ASIS); + info = new_widget_info ("fontchooser", GTK_WIDGET (widget), ASIS); info->include_decorations = TRUE; return info; @@ -1137,10 +1137,10 @@ static WidgetInfo * create_colorchooserdialog (void) { WidgetInfo *info; - GtkWidget *widget; + GtkColorChooserDialog *widget; widget = gtk_color_chooser_dialog_new ("Color Chooser Dialog", NULL); - info = new_widget_info ("colorchooser", widget, ASIS); + info = new_widget_info ("colorchooser", GTK_WIDGET (widget), ASIS); info->include_decorations = TRUE; return info; @@ -1164,7 +1164,7 @@ create_headerbar (void) gtk_header_bar_set_subtitle (GTK_HEADER_BAR (bar), "(subtitle)"); gtk_window_set_titlebar (GTK_WINDOW (window), bar); button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("bookmark-new-symbolic")); + gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (gtk_image_new_from_icon_name ("bookmark-new-symbolic"))); gtk_header_bar_pack_end (GTK_HEADER_BAR (bar), button); return new_widget_info ("headerbar", window, ASIS); @@ -1264,7 +1264,7 @@ create_sidebar (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (hbox), sidebar); - gtk_container_add (GTK_CONTAINER (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL)); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_VERTICAL))); gtk_container_add (GTK_CONTAINER (hbox), stack); gtk_container_add (GTK_CONTAINER (frame), hbox); @@ -1278,6 +1278,7 @@ create_list_box (void) GtkWidget *list; GtkWidget *row; GtkWidget *button; + GtkEntry *entry; WidgetInfo *info; widget = gtk_frame_new (NULL); @@ -1309,10 +1310,10 @@ create_list_box (void) gtk_container_add (GTK_CONTAINER (list), row); row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_container_add (GTK_CONTAINER (row), gtk_label_new ("Line Three")); - button = gtk_entry_new (); - gtk_widget_set_hexpand (button, TRUE); - gtk_widget_set_halign (button, GTK_ALIGN_END); - gtk_container_add (GTK_CONTAINER (row), button); + entry = gtk_entry_new (); + gtk_widget_set_hexpand (GTK_WIDGET (entry), TRUE); + gtk_widget_set_halign (GTK_WIDGET (entry), GTK_ALIGN_END); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (entry)); gtk_container_add (GTK_CONTAINER (list), row); gtk_container_add (GTK_CONTAINER (widget), list); diff --git a/examples/application10/exampleappwin.c b/examples/application10/exampleappwin.c index 31f527b128ab736c6f44189a082db9b428d0e795..b507d6dba8450cd8ec0602142b2dbf943f5d018b 100644 --- a/examples/application10/exampleappwin.c +++ b/examples/application10/exampleappwin.c @@ -15,7 +15,7 @@ struct _ExampleAppWindow GtkWidget *gears; GtkWidget *sidebar; GtkWidget *words; - GtkWidget *lines; + GtkLabel *lines; GtkWidget *lines_label; }; @@ -135,7 +135,7 @@ update_lines (ExampleAppWindow *win) count = gtk_text_buffer_get_line_count (buffer); lines = g_strdup_printf ("%d", count); - gtk_label_set_text (GTK_LABEL (win->lines), lines); + gtk_label_set_text (win->lines, lines); g_free (lines); } diff --git a/examples/application9/exampleappwin.c b/examples/application9/exampleappwin.c index 0394904d76ddc12e3f92440c0b524e7b793629a0..434124178250d52282f0a02b7ab3d581daf22415 100644 --- a/examples/application9/exampleappwin.c +++ b/examples/application9/exampleappwin.c @@ -15,7 +15,7 @@ struct _ExampleAppWindow GtkWidget *gears; GtkWidget *sidebar; GtkWidget *words; - GtkWidget *lines; + GtkLabel *lines; GtkWidget *lines_label; }; @@ -135,7 +135,7 @@ update_lines (ExampleAppWindow *win) count = gtk_text_buffer_get_line_count (buffer); lines = g_strdup_printf ("%d", count); - gtk_label_set_text (GTK_LABEL (win->lines), lines); + gtk_label_set_text (win->lines, lines); g_free (lines); } diff --git a/examples/bp/bloatpad.c b/examples/bp/bloatpad.c index 0cac3c711186b214264015848e392a5d74ba1ab2..3d721c9b8fbe77084dbb93b4fa45555c332895a7 100644 --- a/examples/bp/bloatpad.c +++ b/examples/bp/bloatpad.c @@ -212,9 +212,11 @@ new_window (GApplication *app, GFile *file) { GtkWidget *window, *grid, *scrolled, *view; - GtkWidget *toolbar; + GtkToolbar *toolbar; GtkToolItem *button; - GtkWidget *sw, *box, *label; + GtkSwitch *sw; + GtkWidget *box; + GtkLabel *label; window = gtk_application_window_new (GTK_APPLICATION (app)); gtk_window_set_default_size ((GtkWindow*)window, 640, 480); @@ -249,14 +251,14 @@ new_window (GApplication *app, box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (button), box); label = gtk_label_new ("Fullscreen:"); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); sw = gtk_switch_new (); - gtk_widget_set_valign (sw, GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (sw), GTK_ALIGN_CENTER); gtk_actionable_set_action_name (GTK_ACTIONABLE (sw), "win.fullscreen"); - gtk_container_add (GTK_CONTAINER (box), sw); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (sw)); gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (button)); - gtk_grid_attach (GTK_GRID (grid), toolbar, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (toolbar), 0, 0, 1, 1); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_widget_set_hexpand (scrolled, TRUE); @@ -402,8 +404,8 @@ edit_accels (GSimpleAction *action, gpointer user_data) { GtkApplication *app = user_data; - GtkWidget *combo; - GtkWidget *entry; + GtkComboBoxText *combo; + GtkEntry *entry; gchar **actions; GtkWidget *dialog; gint i; @@ -412,12 +414,12 @@ edit_accels (GSimpleAction *action, gtk_window_set_application (GTK_WINDOW (dialog), app); actions = gtk_application_list_action_descriptions (app); combo = gtk_combo_box_text_new (); - gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), combo); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), GTK_WIDGET (combo)); for (i = 0; actions[i]; i++) - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), actions[i], actions[i]); + gtk_combo_box_text_append (combo, actions[i], actions[i]); g_signal_connect (combo, "changed", G_CALLBACK (combo_changed), dialog); entry = gtk_entry_new (); - gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), entry); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), GTK_WIDGET (entry)); gtk_dialog_add_button (GTK_DIALOG (dialog), "Close", GTK_RESPONSE_CLOSE); gtk_dialog_add_button (GTK_DIALOG (dialog), "Set", GTK_RESPONSE_APPLY); g_signal_connect (dialog, "response", G_CALLBACK (response), dialog); diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 4b38d343f490f337dcb8df86214259e3f550972b..302e0361d70d2d1e3a4cf1451c026b65dad4860a 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -178,17 +178,17 @@ typedef struct GtkWidget *stack; GtkWidget *stack_switcher; - GtkWidget *credits_button; - GtkWidget *license_button; + GtkToggleButton *credits_button; + GtkToggleButton *license_button; GtkWidget *system_button; GtkWidget *logo_image; - GtkWidget *name_label; - GtkWidget *version_label; - GtkWidget *comments_label; - GtkWidget *copyright_label; - GtkWidget *license_label; - GtkWidget *website_label; + GtkLabel *name_label; + GtkLabel *version_label; + GtkLabel *comments_label; + GtkLabel *copyright_label; + GtkLabel *license_label; + GtkLabel *website_label; GtkWidget *credits_page; GtkWidget *license_page; @@ -724,10 +724,10 @@ switch_page (GtkAboutDialog *about, priv->in_switch_page = TRUE; if (priv->credits_button) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->credits_button), + gtk_toggle_button_set_active (priv->credits_button, g_str_equal (name, "credits")); if (priv->license_button) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->license_button), + gtk_toggle_button_set_active (priv->license_button, g_str_equal (name, "license")); priv->in_switch_page = FALSE; } @@ -746,7 +746,7 @@ apply_use_header_bar (GtkAboutDialog *about) priv->credits_button, "visible", G_BINDING_SYNC_CREATE); g_signal_connect (priv->credits_button, "toggled", G_CALLBACK (toggle_credits), about); - gtk_dialog_add_action_widget (GTK_DIALOG (about), priv->credits_button, GTK_RESPONSE_NONE); + gtk_dialog_add_action_widget (GTK_DIALOG (about), GTK_WIDGET (priv->credits_button), GTK_RESPONSE_NONE); priv->license_button = gtk_toggle_button_new_with_mnemonic (_("_License")); g_object_bind_property (priv->license_page, "visible", @@ -1031,7 +1031,7 @@ update_website (GtkAboutDialog *about) { GtkAboutDialogPrivate *priv = gtk_about_dialog_get_instance_private (about); - gtk_widget_show (priv->website_label); + gtk_widget_show (GTK_WIDGET (priv->website_label)); if (priv->website_url) { @@ -1052,15 +1052,15 @@ update_website (GtkAboutDialog *about) priv->website_url, _("Website")); } - gtk_label_set_markup (GTK_LABEL (priv->website_label), markup); + gtk_label_set_markup (priv->website_label, markup); g_free (markup); } else { if (priv->website_text) - gtk_label_set_text (GTK_LABEL (priv->website_label), priv->website_text); + gtk_label_set_text (priv->website_label, priv->website_text); else - gtk_widget_hide (priv->website_label); + gtk_widget_hide (GTK_WIDGET (priv->website_label)); } } @@ -1103,15 +1103,15 @@ update_name_version (GtkAboutDialog *about) if (priv->version != NULL) { - gtk_label_set_markup (GTK_LABEL (priv->version_label), priv->version); - gtk_widget_show (priv->version_label); + gtk_label_set_markup (priv->version_label, priv->version); + gtk_widget_show (GTK_WIDGET (priv->version_label)); } else - gtk_widget_hide (priv->version_label); + gtk_widget_hide (GTK_WIDGET (priv->version_label)); name_string = g_markup_printf_escaped ("%s", priv->name); - gtk_label_set_markup (GTK_LABEL (priv->name_label), name_string); + gtk_label_set_markup (priv->name_label, name_string); g_free (name_string); } @@ -1230,13 +1230,13 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about, { copyright_string = g_markup_printf_escaped ("%s", priv->copyright); - gtk_label_set_markup (GTK_LABEL (priv->copyright_label), copyright_string); + gtk_label_set_markup (priv->copyright_label, copyright_string); g_free (copyright_string); - gtk_widget_show (priv->copyright_label); + gtk_widget_show (GTK_WIDGET (priv->copyright_label)); } else - gtk_widget_hide (priv->copyright_label); + gtk_widget_hide (GTK_WIDGET (priv->copyright_label)); g_object_notify_by_pspec (G_OBJECT (about), props[PROP_COPYRIGHT]); } @@ -1281,13 +1281,13 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about, if (comments) { priv->comments = g_strdup (comments); - gtk_label_set_text (GTK_LABEL (priv->comments_label), priv->comments); - gtk_widget_show (priv->comments_label); + gtk_label_set_text (priv->comments_label, priv->comments); + gtk_widget_show (GTK_WIDGET (priv->comments_label)); } else { priv->comments = NULL; - gtk_widget_hide (priv->comments_label); + gtk_widget_hide (GTK_WIDGET (priv->comments_label)); } g_free (tmp); @@ -1344,7 +1344,7 @@ gtk_about_dialog_set_license (GtkAboutDialog *about, } g_free (tmp); - gtk_widget_hide (priv->license_label); + gtk_widget_hide (GTK_WIDGET (priv->license_label)); update_license_button_visibility (about); @@ -1703,8 +1703,8 @@ gtk_about_dialog_get_translator_credits (GtkAboutDialog *about) * Using gettext(), a simple way to achieve that is to mark the * string for translation: * |[ - * GtkWidget *about = gtk_about_dialog_new (); - * gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG (about), + * GtkAboutDialog *about = gtk_about_dialog_new (); + * gtk_about_dialog_set_translator_credits (about, * _("translator-credits")); * ]| * It is a good idea to use the customary msgid “translator-credits” for this @@ -2156,7 +2156,7 @@ add_credits_section (GtkAboutDialog *about, gchar *title, gchar **people) { - GtkWidget *label; + GtkLabel *label; gchar *markup; gchar **p; gchar *q0, *q1, *q2, *r1, *r2; @@ -2166,11 +2166,11 @@ add_credits_section (GtkAboutDialog *about, markup = g_strdup_printf ("%s", title); label = gtk_label_new (markup); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_use_markup (label, TRUE); g_free (markup); - gtk_widget_set_halign (label, GTK_ALIGN_END); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_grid_attach (grid, label, 0, *row, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_grid_attach (grid, GTK_WIDGET (label), 0, *row, 1, 1); for (p = people; *p; p++) { @@ -2259,21 +2259,21 @@ add_credits_section (GtkAboutDialog *about, g_string_append (str, ""); label = gtk_label_new (str->str); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); + gtk_label_set_use_markup (label, TRUE); + gtk_label_set_selectable (label, TRUE); g_signal_connect_swapped (label, "activate-link", G_CALLBACK (emit_activate_link), about); g_string_free (str, TRUE); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_grid_attach (grid, label, 1, *row, 1, 1); - gtk_widget_show (label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_grid_attach (grid, GTK_WIDGET (label), 1, *row, 1, 1); + gtk_widget_show (GTK_WIDGET (label)); (*row)++; } /* skip one at the end */ label = gtk_label_new (""); - gtk_grid_attach (grid, label, 1, *row, 1, 1); + gtk_grid_attach (grid, GTK_WIDGET (label), 1, *row, 1, 1); (*row)++; } @@ -2354,7 +2354,7 @@ populate_system_page (GtkAboutDialog *about) * * Returns: a newly created #GtkAboutDialog */ -GtkWidget * +GtkAboutDialog * gtk_about_dialog_new (void) { return g_object_new (GTK_TYPE_ABOUT_DIALOG, NULL); @@ -2388,8 +2388,8 @@ gtk_show_about_dialog (GtkWindow *parent, const gchar *first_property_name, ...) { - static GtkWidget *global_about_dialog = NULL; - GtkWidget *dialog = NULL; + static GtkAboutDialog *global_about_dialog = NULL; + GtkAboutDialog *dialog = NULL; va_list var_args; if (parent) @@ -2483,9 +2483,9 @@ gtk_about_dialog_set_license_type (GtkAboutDialog *about, license_string = g_strdup_printf ("%s", priv->license); - gtk_label_set_markup (GTK_LABEL (priv->license_label), license_string); + gtk_label_set_markup (priv->license_label, license_string); g_free (license_string); - gtk_widget_show (priv->license_label); + gtk_widget_show (GTK_WIDGET (priv->license_label)); update_license_button_visibility (about); @@ -2494,7 +2494,7 @@ gtk_about_dialog_set_license_type (GtkAboutDialog *about, } else { - gtk_widget_show (priv->license_label); + gtk_widget_show (GTK_WIDGET (priv->license_label)); } g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LICENSE_TYPE]); diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h index 561b09f4890bd5c1f51c2997ce7d2d2cc9173bd6..52e09ab7d9d50c286dc86c8423de8cea003bc6d8 100644 --- a/gtk/gtkaboutdialog.h +++ b/gtk/gtkaboutdialog.h @@ -88,7 +88,7 @@ typedef enum { GDK_AVAILABLE_IN_ALL GType gtk_about_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_about_dialog_new (void); +GtkAboutDialog *gtk_about_dialog_new (void); GDK_AVAILABLE_IN_ALL void gtk_show_about_dialog (GtkWindow *parent, const gchar *first_property_name, diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index 65c8b4b7f55857eb469684ac3e9ec7fa500e1dfc..0210d48587db807409ec808c6b7e937f98543c73 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -111,7 +111,7 @@ struct _GtkAccelLabelClass typedef struct _GtkAccelLabelPrivate GtkAccelLabelPrivate; struct _GtkAccelLabelPrivate { - GtkWidget *text_label; + GtkLabel *text_label; GtkWidget *accel_label; GtkWidget *accel_widget; /* done */ @@ -286,13 +286,13 @@ gtk_accel_label_init (GtkAccelLabel *accel_label) priv->accel_group = NULL; priv->text_label = gtk_label_new (""); - gtk_widget_set_hexpand (priv->text_label, TRUE); - gtk_label_set_xalign (GTK_LABEL (priv->text_label), 0.0f); + gtk_widget_set_hexpand (GTK_WIDGET (priv->text_label), TRUE); + gtk_label_set_xalign (priv->text_label, 0.0f); priv->accel_label = g_object_new (GTK_TYPE_LABEL, "css-name", "accelerator", NULL); - gtk_widget_set_parent (priv->text_label, GTK_WIDGET (accel_label)); - gtk_widget_set_parent (priv->accel_label, GTK_WIDGET (accel_label)); + gtk_widget_set_parent (GTK_WIDGET (priv->text_label), GTK_WIDGET (accel_label)); + gtk_widget_set_parent (GTK_WIDGET (priv->accel_label), GTK_WIDGET (accel_label)); } /** @@ -334,8 +334,8 @@ gtk_accel_label_finalize (GObject *object) GtkAccelLabel *accel_label = GTK_ACCEL_LABEL (object); GtkAccelLabelPrivate *priv = gtk_accel_label_get_instance_private (accel_label); - gtk_widget_unparent (priv->accel_label); - gtk_widget_unparent (priv->text_label); + gtk_widget_unparent (GTK_WIDGET (priv->accel_label)); + gtk_widget_unparent (GTK_WIDGET (priv->text_label)); G_OBJECT_CLASS (gtk_accel_label_parent_class)->finalize (object); } @@ -984,7 +984,7 @@ gtk_accel_label_set_label (GtkAccelLabel *accel_label, g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label)); - gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->text_label), text); + gtk_label_set_text_with_mnemonic (priv->text_label, text); } /** @@ -1003,7 +1003,7 @@ gtk_accel_label_get_label (GtkAccelLabel *accel_label) g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), NULL); - return gtk_label_get_label (GTK_LABEL (priv->text_label)); + return gtk_label_get_label (priv->text_label); } /** @@ -1024,9 +1024,9 @@ gtk_accel_label_set_use_underline (GtkAccelLabel *accel_label, setting = !!setting; - if (setting != gtk_label_get_use_underline (GTK_LABEL (priv->text_label))) + if (setting != gtk_label_get_use_underline (priv->text_label)) { - gtk_label_set_use_underline (GTK_LABEL (priv->text_label), setting); + gtk_label_set_use_underline (priv->text_label, setting); g_object_notify_by_pspec (G_OBJECT (accel_label), props[PROP_USE_UNDERLINE]); } @@ -1049,5 +1049,5 @@ gtk_accel_label_get_use_underline (GtkAccelLabel *accel_label) g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), FALSE); - return gtk_label_get_use_underline (GTK_LABEL (priv->text_label)); + return gtk_label_get_use_underline (priv->text_label); } diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c index d8ad85977818e2c5559f3e020d7fc8cbffbada73..8da11641f7b8ad133b683b9d64e02e33f9848566 100644 --- a/gtk/gtkactionbar.c +++ b/gtk/gtkactionbar.c @@ -68,10 +68,10 @@ struct _GtkActionBarClass struct _GtkActionBarPrivate { - GtkWidget *center_box; - GtkWidget *start_box; - GtkWidget *end_box; - GtkWidget *revealer; + GtkCenterBox *center_box; + GtkWidget *start_box; + GtkWidget *end_box; + GtkWidget *revealer; }; enum { @@ -108,8 +108,8 @@ gtk_action_bar_remove (GtkContainer *container, gtk_container_remove (GTK_CONTAINER (priv->start_box), child); else if (gtk_widget_get_parent (child) == priv->end_box) gtk_container_remove (GTK_CONTAINER (priv->end_box), child); - else if (child == gtk_center_box_get_center_widget (GTK_CENTER_BOX (priv->center_box))) - gtk_center_box_set_center_widget (GTK_CENTER_BOX (priv->center_box), NULL); + else if (child == gtk_center_box_get_center_widget (priv->center_box)) + gtk_center_box_set_center_widget (priv->center_box, NULL); else g_warning ("Can't remove non-child %s %p from GtkActionBar %p", G_OBJECT_TYPE_NAME (child), child, container); @@ -125,8 +125,8 @@ gtk_action_bar_forall (GtkContainer *container, if (priv->start_box != NULL) gtk_container_forall (GTK_CONTAINER (priv->start_box), callback, callback_data); - if (gtk_center_box_get_center_widget (GTK_CENTER_BOX (priv->center_box)) != NULL) - (*callback) (gtk_center_box_get_center_widget (GTK_CENTER_BOX (priv->center_box)), callback_data); + if (gtk_center_box_get_center_widget (priv->center_box) != NULL) + (*callback) (gtk_center_box_get_center_widget (priv->center_box), callback_data); if (priv->end_box != NULL) gtk_container_forall (GTK_CONTAINER (priv->end_box), callback, callback_data); @@ -225,9 +225,9 @@ gtk_action_bar_destroy (GtkWidget *widget) GtkActionBar *self = GTK_ACTION_BAR (widget); GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (self); - gtk_center_box_set_start_widget (GTK_CENTER_BOX (priv->center_box), NULL); - gtk_center_box_set_center_widget (GTK_CENTER_BOX (priv->center_box), NULL); - gtk_center_box_set_end_widget (GTK_CENTER_BOX (priv->center_box), NULL); + gtk_center_box_set_start_widget (priv->center_box, NULL); + gtk_center_box_set_center_widget (priv->center_box, NULL); + gtk_center_box_set_end_widget (priv->center_box, NULL); priv->start_box = NULL; priv->end_box = NULL; @@ -288,10 +288,10 @@ gtk_action_bar_init (GtkActionBar *action_bar) priv->end_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); priv->center_box = gtk_center_box_new (); - gtk_center_box_set_start_widget (GTK_CENTER_BOX (priv->center_box), priv->start_box); - gtk_center_box_set_end_widget (GTK_CENTER_BOX (priv->center_box), priv->end_box); + gtk_center_box_set_start_widget (priv->center_box, priv->start_box); + gtk_center_box_set_end_widget (priv->center_box, priv->end_box); - gtk_container_add (GTK_CONTAINER (priv->revealer), priv->center_box); + gtk_container_add (GTK_CONTAINER (priv->revealer), GTK_WIDGET (priv->center_box)); } static GtkBuildableIface *parent_buildable_iface; @@ -368,7 +368,7 @@ gtk_action_bar_set_center_widget (GtkActionBar *action_bar, { GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar); - gtk_center_box_set_center_widget (GTK_CENTER_BOX (priv->center_box), center_widget); + gtk_center_box_set_center_widget (priv->center_box, center_widget); } /** @@ -386,7 +386,7 @@ gtk_action_bar_get_center_widget (GtkActionBar *action_bar) g_return_val_if_fail (GTK_IS_ACTION_BAR (action_bar), NULL); - return gtk_center_box_get_center_widget (GTK_CENTER_BOX (priv->center_box)); + return gtk_center_box_get_center_widget (priv->center_box); } /** @@ -396,10 +396,10 @@ gtk_action_bar_get_center_widget (GtkActionBar *action_bar) * * Returns: a new #GtkActionBar */ -GtkWidget * +GtkActionBar * gtk_action_bar_new (void) { - return GTK_WIDGET (g_object_new (GTK_TYPE_ACTION_BAR, NULL)); + return g_object_new (GTK_TYPE_ACTION_BAR, NULL); } /** diff --git a/gtk/gtkactionbar.h b/gtk/gtkactionbar.h index 38e23c2bea77d8ee655d62b16447994944c0e08e..c650cfc90353020d307729ca5ebfcda86dae5f0d 100644 --- a/gtk/gtkactionbar.h +++ b/gtk/gtkactionbar.h @@ -35,27 +35,27 @@ G_BEGIN_DECLS typedef struct _GtkActionBar GtkActionBar; GDK_AVAILABLE_IN_ALL -GType gtk_action_bar_get_type (void) G_GNUC_CONST; +GType gtk_action_bar_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_action_bar_new (void); +GtkActionBar *gtk_action_bar_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_action_bar_get_center_widget (GtkActionBar *action_bar); +GtkWidget *gtk_action_bar_get_center_widget (GtkActionBar *action_bar); GDK_AVAILABLE_IN_ALL -void gtk_action_bar_set_center_widget (GtkActionBar *action_bar, - GtkWidget *center_widget); +void gtk_action_bar_set_center_widget (GtkActionBar *action_bar, + GtkWidget *center_widget); GDK_AVAILABLE_IN_ALL -void gtk_action_bar_pack_start (GtkActionBar *action_bar, - GtkWidget *child); +void gtk_action_bar_pack_start (GtkActionBar *action_bar, + GtkWidget *child); GDK_AVAILABLE_IN_ALL -void gtk_action_bar_pack_end (GtkActionBar *action_bar, - GtkWidget *child); +void gtk_action_bar_pack_end (GtkActionBar *action_bar, + GtkWidget *child); GDK_AVAILABLE_IN_ALL -void gtk_action_bar_set_revealed (GtkActionBar *action_bar, - gboolean revealed); +void gtk_action_bar_set_revealed (GtkActionBar *action_bar, + gboolean revealed); GDK_AVAILABLE_IN_ALL -gboolean gtk_action_bar_get_revealed (GtkActionBar *action_bar); +gboolean gtk_action_bar_get_revealed (GtkActionBar *action_bar); G_END_DECLS diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c index 4c8dc45ee415f1f3a829cb4953164fcdee45265b..fa148ce16ee69873e44b47b1ccd099231c6c1ef7 100644 --- a/gtk/gtkappchooserbutton.c +++ b/gtk/gtkappchooserbutton.c @@ -120,7 +120,7 @@ struct _GtkAppChooserButtonClass { typedef struct { - GtkWidget *combobox; + GtkComboBox *combobox; GtkListStore *store; gchar *content_type; @@ -210,7 +210,7 @@ select_application_func_cb (GtkTreeModel *model, result = TRUE; else if (g_app_info_equal (app, app_to_match)) { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combobox), iter); + gtk_combo_box_set_active_iter (priv->combobox, iter); result = TRUE; } else @@ -252,7 +252,7 @@ other_application_dialog_response_cb (GtkDialog *dialog, /* reset the active item, otherwise we are stuck on * 'Other application…' */ - gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combobox), priv->last_active); + gtk_combo_box_set_active (priv->combobox, priv->last_active); gtk_widget_destroy (GTK_WIDGET (dialog)); return; } @@ -272,7 +272,8 @@ static void other_application_item_activated_cb (GtkAppChooserButton *self) { GtkAppChooserButtonPrivate *priv = gtk_app_chooser_button_get_instance_private (self); - GtkWidget *dialog, *widget; + GtkAppChooserDialog *dialog; + GtkWidget *widget; GtkRoot *root; root = gtk_widget_get_root (GTK_WIDGET (self)); @@ -280,14 +281,14 @@ other_application_item_activated_cb (GtkAppChooserButton *self) GTK_DIALOG_DESTROY_WITH_PARENT, priv->content_type); gtk_window_set_modal (GTK_WINDOW (dialog), gtk_window_get_modal (GTK_WINDOW (root))); - gtk_app_chooser_dialog_set_heading (GTK_APP_CHOOSER_DIALOG (dialog), priv->heading); + gtk_app_chooser_dialog_set_heading (dialog, priv->heading); - widget = gtk_app_chooser_dialog_get_widget (GTK_APP_CHOOSER_DIALOG (dialog)); + widget = gtk_app_chooser_dialog_get_widget (dialog); g_object_set (widget, "show-fallback", TRUE, "show-other", TRUE, NULL); - gtk_widget_show (dialog); + gtk_widget_show (GTK_WIDGET (dialog)); g_signal_connect (dialog, "response", G_CALLBACK (other_application_dialog_response_cb), self); @@ -402,7 +403,7 @@ gtk_app_chooser_button_populate (GtkAppChooserButton *self) else gtk_app_chooser_button_ensure_dialog_item (self, &iter); - gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combobox), 0); + gtk_combo_box_set_active (priv->combobox, 0); } static void @@ -412,12 +413,12 @@ gtk_app_chooser_button_build_ui (GtkAppChooserButton *self) GtkCellRenderer *cell; GtkCellArea *area; - gtk_combo_box_set_model (GTK_COMBO_BOX (priv->combobox), + gtk_combo_box_set_model (priv->combobox, GTK_TREE_MODEL (priv->store)); area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (priv->combobox)); - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (priv->combobox), + gtk_combo_box_set_row_separator_func (priv->combobox, row_separator_func, NULL, NULL); cell = gtk_cell_renderer_pixbuf_new (); @@ -524,7 +525,7 @@ gtk_app_chooser_button_get_app_info (GtkAppChooser *object) GtkTreeIter iter; GAppInfo *info; - if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->combobox), &iter)) + if (!gtk_combo_box_get_active_iter (priv->combobox, &iter)) return NULL; gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &iter, @@ -613,7 +614,7 @@ gtk_app_chooser_button_finalize (GObject *obj) g_free (priv->content_type); g_free (priv->heading); g_object_unref (priv->store); - gtk_widget_unparent (priv->combobox); + gtk_widget_unparent (GTK_WIDGET (priv->combobox)); G_OBJECT_CLASS (gtk_app_chooser_button_parent_class)->finalize (obj); } @@ -630,7 +631,7 @@ gtk_app_chooser_button_measure (GtkWidget *widget, GtkAppChooserButton *button = GTK_APP_CHOOSER_BUTTON (widget); GtkAppChooserButtonPrivate *priv = gtk_app_chooser_button_get_instance_private (button); - gtk_widget_measure (priv->combobox, orientation, for_size, + gtk_widget_measure (GTK_WIDGET (priv->combobox), orientation, for_size, minimum, natural, minimum_baseline, natural_baseline); } @@ -644,7 +645,7 @@ gtk_app_chooser_button_size_allocate (GtkWidget *widget, GtkAppChooserButton *button = GTK_APP_CHOOSER_BUTTON (widget); GtkAppChooserButtonPrivate *priv = gtk_app_chooser_button_get_instance_private (button); - gtk_widget_size_allocate (priv->combobox, &(GtkAllocation){0, 0, width, height}, baseline); + gtk_widget_size_allocate (GTK_WIDGET (priv->combobox), &(GtkAllocation){0, 0, width, height}, baseline); } static void @@ -759,7 +760,7 @@ gtk_app_chooser_button_init (GtkAppChooserButton *self) G_TYPE_BOOLEAN, /* separator */ G_TYPE_BOOLEAN); /* custom */ priv->combobox = gtk_combo_box_new_with_model (GTK_TREE_MODEL (priv->store)); - gtk_widget_set_parent (priv->combobox, GTK_WIDGET (self)); + gtk_widget_set_parent (GTK_WIDGET (priv->combobox), GTK_WIDGET (self)); g_signal_connect (priv->combobox, "changed", G_CALLBACK (gtk_app_chooser_button_changed), self); @@ -849,7 +850,7 @@ real_insert_separator (GtkAppChooserButton *self, * * Returns: a newly created #GtkAppChooserButton */ -GtkWidget * +GtkAppChooserButton * gtk_app_chooser_button_new (const gchar *content_type) { g_return_val_if_fail (content_type != NULL, NULL); @@ -936,7 +937,7 @@ gtk_app_chooser_button_set_active_custom_item (GtkAppChooserButton *self, return; } - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combobox), &iter); + gtk_combo_box_set_active_iter (priv->combobox, &iter); } /** diff --git a/gtk/gtkappchooserbutton.h b/gtk/gtkappchooserbutton.h index c57456aeef92ebc6b62983ea9315c71744a7f130..509fa7e75061138e9949c31ca4beb5e3418ad1e3 100644 --- a/gtk/gtkappchooserbutton.h +++ b/gtk/gtkappchooserbutton.h @@ -38,38 +38,37 @@ G_BEGIN_DECLS typedef struct _GtkAppChooserButton GtkAppChooserButton; GDK_AVAILABLE_IN_ALL -GType gtk_app_chooser_button_get_type (void) G_GNUC_CONST; +GType gtk_app_chooser_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_app_chooser_button_new (const gchar *content_type); +GtkAppChooserButton * gtk_app_chooser_button_new (const gchar *content_type); GDK_AVAILABLE_IN_ALL -void gtk_app_chooser_button_append_separator (GtkAppChooserButton *self); +void gtk_app_chooser_button_append_separator (GtkAppChooserButton *self); GDK_AVAILABLE_IN_ALL -void gtk_app_chooser_button_append_custom_item (GtkAppChooserButton *self, - const gchar *name, - const gchar *label, - GIcon *icon); +void gtk_app_chooser_button_append_custom_item (GtkAppChooserButton *self, + const gchar *name, + const gchar *label, + GIcon *icon); GDK_AVAILABLE_IN_ALL -void gtk_app_chooser_button_set_active_custom_item (GtkAppChooserButton *self, - const gchar *name); +void gtk_app_chooser_button_set_active_custom_item (GtkAppChooserButton *self, + const gchar *name); GDK_AVAILABLE_IN_ALL -void gtk_app_chooser_button_set_show_dialog_item (GtkAppChooserButton *self, - gboolean setting); +void gtk_app_chooser_button_set_show_dialog_item (GtkAppChooserButton *self, + gboolean setting); GDK_AVAILABLE_IN_ALL -gboolean gtk_app_chooser_button_get_show_dialog_item (GtkAppChooserButton *self); +gboolean gtk_app_chooser_button_get_show_dialog_item (GtkAppChooserButton *self); GDK_AVAILABLE_IN_ALL -void gtk_app_chooser_button_set_heading (GtkAppChooserButton *self, - const gchar *heading); +void gtk_app_chooser_button_set_heading (GtkAppChooserButton *self, + const gchar *heading); GDK_AVAILABLE_IN_ALL -const gchar * - gtk_app_chooser_button_get_heading (GtkAppChooserButton *self); +const gchar * gtk_app_chooser_button_get_heading (GtkAppChooserButton *self); GDK_AVAILABLE_IN_ALL -void gtk_app_chooser_button_set_show_default_item (GtkAppChooserButton *self, - gboolean setting); +void gtk_app_chooser_button_set_show_default_item (GtkAppChooserButton *self, + gboolean setting); GDK_AVAILABLE_IN_ALL -gboolean gtk_app_chooser_button_get_show_default_item (GtkAppChooserButton *self); +gboolean gtk_app_chooser_button_get_show_default_item (GtkAppChooserButton *self); G_END_DECLS diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index cc512bdbeb0402e0d3092f3abbcafbd66dbee1b8..a606cc0c2ee3fc52e449b5915fefac7a368968f7 100644 --- a/gtk/gtkappchooserdialog.c +++ b/gtk/gtkappchooserdialog.c @@ -77,7 +77,7 @@ struct _GtkAppChooserDialogPrivate { GFile *gfile; char *heading; - GtkWidget *label; + GtkLabel *label; GtkWidget *inner_box; GtkWidget *open_label; @@ -242,12 +242,12 @@ set_dialog_properties (GtkAppChooserDialog *self) if (priv->heading != NULL) { - gtk_label_set_markup (GTK_LABEL (priv->label), priv->heading); - gtk_widget_show (priv->label); + gtk_label_set_markup (priv->label, priv->heading); + gtk_widget_show (GTK_WIDGET (priv->label)); } else { - gtk_widget_hide (priv->label); + gtk_widget_hide (GTK_WIDGET (priv->label)); } gtk_app_chooser_widget_set_default_text (GTK_APP_CHOOSER_WIDGET (priv->app_chooser_widget), @@ -444,20 +444,20 @@ setup_search (GtkAppChooserDialog *self) g_object_get (self, "use-header-bar", &use_header, NULL); if (use_header) { - GtkWidget *button; - GtkWidget *image; + GtkToggleButton *button; + GtkImage *image; GtkWidget *header; button = gtk_toggle_button_new (); - gtk_widget_set_valign (button, GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (button), GTK_ALIGN_CENTER); image = gtk_image_new_from_icon_name ("edit-find-symbolic"); - gtk_container_add (GTK_CONTAINER (button), image); - gtk_style_context_add_class (gtk_widget_get_style_context (button), "image-button"); - gtk_style_context_remove_class (gtk_widget_get_style_context (button), "text-button"); + gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (image)); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (button)), "image-button"); + gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (button)), "text-button"); header = gtk_dialog_get_header_bar (GTK_DIALOG (self)); - gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button); - gtk_size_group_add_widget (priv->buttons, button); + gtk_header_bar_pack_end (GTK_HEADER_BAR (header), GTK_WIDGET (button)); + gtk_size_group_add_widget (priv->buttons, GTK_WIDGET (button)); g_object_bind_property (button, "active", priv->search_bar, "search-mode-enabled", @@ -645,7 +645,7 @@ gtk_app_chooser_dialog_init (GtkAppChooserDialog *self) } static void -set_parent_and_flags (GtkWidget *dialog, +set_parent_and_flags (GtkAppChooserDialog *dialog, GtkWindow *parent, GtkDialogFlags flags) { @@ -670,12 +670,12 @@ set_parent_and_flags (GtkWidget *dialog, * * Returns: a newly created #GtkAppChooserDialog **/ -GtkWidget * +GtkAppChooserDialog * gtk_app_chooser_dialog_new (GtkWindow *parent, GtkDialogFlags flags, GFile *file) { - GtkWidget *retval; + GtkAppChooserDialog *retval; g_return_val_if_fail (G_IS_FILE (file), NULL); @@ -699,12 +699,12 @@ gtk_app_chooser_dialog_new (GtkWindow *parent, * * Returns: a newly created #GtkAppChooserDialog **/ -GtkWidget * +GtkAppChooserDialog * gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent, GtkDialogFlags flags, const gchar *content_type) { - GtkWidget *retval; + GtkAppChooserDialog *retval; g_return_val_if_fail (content_type != NULL, NULL); @@ -758,12 +758,12 @@ gtk_app_chooser_dialog_set_heading (GtkAppChooserDialog *self, { if (priv->heading) { - gtk_label_set_markup (GTK_LABEL (priv->label), priv->heading); - gtk_widget_show (priv->label); + gtk_label_set_markup (priv->label, priv->heading); + gtk_widget_show (GTK_WIDGET (priv->label)); } else { - gtk_widget_hide (priv->label); + gtk_widget_hide (GTK_WIDGET (priv->label)); } } diff --git a/gtk/gtkappchooserdialog.h b/gtk/gtkappchooserdialog.h index 45c7d8b66bc132b317a1f3262d59272dfb47fe9a..ba0651c3b8b7d46b52811321ec9449e31225db5a 100644 --- a/gtk/gtkappchooserdialog.h +++ b/gtk/gtkappchooserdialog.h @@ -44,13 +44,13 @@ GDK_AVAILABLE_IN_ALL GType gtk_app_chooser_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_app_chooser_dialog_new (GtkWindow *parent, - GtkDialogFlags flags, - GFile *file); +GtkAppChooserDialog * gtk_app_chooser_dialog_new (GtkWindow *parent, + GtkDialogFlags flags, + GFile *file); GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent, - GtkDialogFlags flags, - const gchar *content_type); +GtkAppChooserDialog * gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent, + GtkDialogFlags flags, + const gchar *content_type); GDK_AVAILABLE_IN_ALL GtkWidget * gtk_app_chooser_dialog_get_widget (GtkAppChooserDialog *self); diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 4161e2d1b437f9b25b8bf958830fb93fd8662b8c..494a55cad39ef4fd8459464bd4bf3a7bacaad2eb 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -99,8 +99,8 @@ struct _GtkAssistantPage gchar *title; GtkWidget *page; - GtkWidget *regular_title; - GtkWidget *current_title; + GtkLabel *regular_title; + GtkLabel *current_title; }; struct _GtkAssistantPageClass @@ -917,8 +917,8 @@ update_page_title_state (GtkAssistant *assistant, GList *list) if (page == priv->current_page) { - gtk_widget_set_visible (page->regular_title, FALSE); - gtk_widget_set_visible (page->current_title, visible); + gtk_widget_set_visible (GTK_WIDGET (page->regular_title), FALSE); + gtk_widget_set_visible (GTK_WIDGET (page->current_title), visible); } else { @@ -946,8 +946,8 @@ update_page_title_state (GtkAssistant *assistant, GList *list) } } - gtk_widget_set_visible (page->regular_title, visible); - gtk_widget_set_visible (page->current_title, FALSE); + gtk_widget_set_visible (GTK_WIDGET (page->regular_title), visible); + gtk_widget_set_visible (GTK_WIDGET (page->current_title), FALSE); } return visible; @@ -1176,11 +1176,11 @@ assistant_remove_page_cb (GtkContainer *container, g_signal_handlers_disconnect_by_func (page_info->page, on_page_page_notify, assistant); g_signal_handlers_disconnect_by_func (page_info, on_page_notify, assistant); - gtk_size_group_remove_widget (priv->title_size_group, page_info->regular_title); - gtk_size_group_remove_widget (priv->title_size_group, page_info->current_title); + gtk_size_group_remove_widget (priv->title_size_group, GTK_WIDGET (page_info->regular_title)); + gtk_size_group_remove_widget (priv->title_size_group, GTK_WIDGET (page_info->current_title)); - gtk_container_remove (GTK_CONTAINER (priv->sidebar), page_info->regular_title); - gtk_container_remove (GTK_CONTAINER (priv->sidebar), page_info->current_title); + gtk_container_remove (GTK_CONTAINER (priv->sidebar), GTK_WIDGET (page_info->regular_title)); + gtk_container_remove (GTK_CONTAINER (priv->sidebar), GTK_WIDGET (page_info->current_title)); priv->pages = g_list_remove_link (priv->pages, element); priv->visited_pages = g_slist_remove_all (priv->visited_pages, page_info); @@ -1274,8 +1274,8 @@ gtk_assistant_page_set_property (GObject *object, if (assistant) { - gtk_label_set_text ((GtkLabel*) page->regular_title, page->title); - gtk_label_set_text ((GtkLabel*) page->current_title, page->title); + gtk_label_set_text (page->regular_title, page->title); + gtk_label_set_text (page->current_title, page->title); update_title_state (GTK_ASSISTANT (assistant)); } @@ -1802,17 +1802,17 @@ gtk_assistant_add_page (GtkAssistant *assistant, page_info->regular_title = gtk_label_new (page_info->title); page_info->current_title = gtk_label_new (page_info->title); - gtk_label_set_xalign (GTK_LABEL (page_info->regular_title), 0.0); - gtk_label_set_xalign (GTK_LABEL (page_info->current_title), 0.0); + gtk_label_set_xalign (page_info->regular_title, 0.0); + gtk_label_set_xalign (page_info->current_title, 0.0); - gtk_widget_show (page_info->regular_title); - gtk_widget_hide (page_info->current_title); + gtk_widget_show (GTK_WIDGET (page_info->regular_title)); + gtk_widget_hide (GTK_WIDGET (page_info->current_title)); - context = gtk_widget_get_style_context (page_info->current_title); + context = gtk_widget_get_style_context (GTK_WIDGET (page_info->current_title)); gtk_style_context_add_class (context, GTK_STYLE_CLASS_HIGHLIGHT); - gtk_size_group_add_widget (priv->title_size_group, page_info->regular_title); - gtk_size_group_add_widget (priv->title_size_group, page_info->current_title); + gtk_size_group_add_widget (priv->title_size_group, GTK_WIDGET (page_info->regular_title)); + gtk_size_group_add_widget (priv->title_size_group, GTK_WIDGET (page_info->current_title)); g_signal_connect (G_OBJECT (page_info->page), "notify::visible", G_CALLBACK (on_page_page_notify), assistant); @@ -1840,8 +1840,8 @@ gtk_assistant_add_page (GtkAssistant *assistant, sibling = gtk_widget_get_next_sibling (sibling); } - gtk_box_insert_child_after (GTK_BOX (priv->sidebar), page_info->current_title, sibling); - gtk_box_insert_child_after (GTK_BOX (priv->sidebar), page_info->regular_title, sibling); + gtk_box_insert_child_after (GTK_BOX (priv->sidebar), GTK_WIDGET (page_info->current_title), sibling); + gtk_box_insert_child_after (GTK_BOX (priv->sidebar), GTK_WIDGET (page_info->regular_title), sibling); name = g_strdup_printf ("%p", page_info->page); gtk_stack_add_named (GTK_STACK (priv->content), page_info->page, name); diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 6fcc605b0837bf4e84c66ae5b08c05f2b3cf8a1c..8c169c85cf008a585a4ee58aa28079b91210deec 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -800,7 +800,7 @@ gtk_button_set_label (GtkButton *button, if (child != NULL) gtk_container_remove (GTK_CONTAINER (button), child); - child = gtk_label_new (NULL); + child = GTK_WIDGET (gtk_label_new (NULL)); if (priv->use_underline) { gtk_label_set_use_underline (GTK_LABEL (child), priv->use_underline); @@ -957,7 +957,7 @@ gtk_button_set_icon_name (GtkButton *button, if (child != NULL) gtk_container_remove (GTK_CONTAINER (button), child); - child = gtk_image_new_from_icon_name (icon_name); + child = GTK_WIDGET (gtk_image_new_from_icon_name (icon_name)); gtk_container_add (GTK_CONTAINER (button), child); gtk_style_context_remove_class (context, "text-button"); gtk_style_context_add_class (context, "image-button"); diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c index b160d03bf5579cabeb74b662e3cd4c6b45d1458e..37e93fc48a103803a8331e5b93ce28ea17187272 100644 --- a/gtk/gtkcellrendereraccel.c +++ b/gtk/gtkcellrendereraccel.c @@ -120,7 +120,7 @@ struct _GtkCellRendererAccelClass struct _GtkCellRendererAccelPrivate { - GtkWidget *sizing_label; + GtkLabel *sizing_label; GtkCellRendererAccelMode accel_mode; GdkModifierType accel_mods; @@ -440,7 +440,7 @@ gtk_cell_renderer_accel_get_preferred_width (GtkCellRenderer *cell, g_object_ref_sink (priv->sizing_label); } - gtk_widget_get_preferred_size (priv->sizing_label, &min_req, &nat_req); + gtk_widget_get_preferred_size (GTK_WIDGET (priv->sizing_label), &min_req, &nat_req); GTK_CELL_RENDERER_CLASS (gtk_cell_renderer_accel_parent_class)->get_preferred_width (cell, widget, minimum_size, natural_size); @@ -490,7 +490,7 @@ struct _GtkCellEditableWidget GtkCellRendererAccelMode accel_mode; gchar *path; GtkCellRenderer *cell; - GtkWidget *label; + GtkLabel *label; }; enum { @@ -684,7 +684,7 @@ gtk_cell_editable_widget_dispose (GObject *object) { GtkCellEditableWidget *box = (GtkCellEditableWidget*)object; - g_clear_pointer (&box->label, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &box->label, gtk_widget_unparent); G_OBJECT_CLASS (gtk_cell_editable_widget_parent_class)->dispose (object); } @@ -760,17 +760,17 @@ gtk_cell_editable_widget_new (GtkCellRenderer *cell, box->cell = cell; box->label = gtk_label_new (NULL); - gtk_widget_set_halign (box->label, GTK_ALIGN_START); - gtk_widget_set_valign (box->label, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (box->label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (box->label), GTK_ALIGN_CENTER); - gtk_widget_set_state_flags (box->label, GTK_STATE_FLAG_SELECTED, TRUE); + gtk_widget_set_state_flags (GTK_WIDGET (box->label), GTK_STATE_FLAG_SELECTED, TRUE); /* This label is displayed in a treeview cell displaying an accelerator * when the cell is clicked to change the acelerator. */ - gtk_label_set_text (GTK_LABEL (box->label), _("New accelerator…")); + gtk_label_set_text (box->label, _("New accelerator…")); - gtk_widget_set_parent (box->label, GTK_WIDGET (box)); + gtk_widget_set_parent (GTK_WIDGET (box->label), GTK_WIDGET (box)); gtk_grab_add (GTK_WIDGET (box)); diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c index 1e333a68d11a53c37f12dccc04d267c05e275b7b..4ece226949ef5306412171cc802c556186c9d1c6 100644 --- a/gtk/gtkcellrenderercombo.c +++ b/gtk/gtkcellrenderercombo.c @@ -66,7 +66,7 @@ struct _GtkCellRendererComboPrivate { GtkTreeModel *model; - GtkWidget *combo; + GtkComboBox *combo; gboolean has_entry; @@ -446,7 +446,7 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell, { GtkCellRendererCombo *cell_combo = GTK_CELL_RENDERER_COMBO (cell); GtkCellRendererComboPrivate *priv = gtk_cell_renderer_combo_get_instance_private (cell_combo); - GtkWidget *combo; + GtkComboBox *combo; SearchData search_data; gboolean editable; gchar *text; @@ -478,7 +478,7 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell, combo = gtk_combo_box_new (); if (priv->model) - gtk_combo_box_set_model (GTK_COMBO_BOX (combo), priv->model); + gtk_combo_box_set_model (combo, priv->model); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), @@ -492,7 +492,7 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell, search_data.found = FALSE; gtk_tree_model_foreach (priv->model, find_text, &search_data); if (search_data.found) - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), + gtk_combo_box_set_active_iter (combo, &(search_data.iter)); } } @@ -502,7 +502,7 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell, I_(GTK_CELL_RENDERER_COMBO_PATH), g_strdup (path), g_free); - gtk_widget_show (combo); + gtk_widget_show (GTK_WIDGET (combo)); g_signal_connect (GTK_CELL_EDITABLE (combo), "editing-done", G_CALLBACK (gtk_cell_renderer_combo_editing_done), diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 7ed41be696f60b43bd09a169e73ec08f0b3e7e7b..2f854b0351f424d7357ca183b675e3be998c63d3 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -165,7 +165,7 @@ typedef struct _GtkCellRendererTextPrivate GtkCellRendererTextPrivate; struct _GtkCellRendererTextPrivate { - GtkWidget *entry; + GtkEntry *entry; PangoAttrList *extra_attrs; GdkRGBA foreground; @@ -1824,8 +1824,8 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer *cell, priv->entry = gtk_entry_new (); g_object_ref_sink (G_OBJECT (priv->entry)); - gtk_entry_set_has_frame (GTK_ENTRY (priv->entry), FALSE); - gtk_entry_set_alignment (GTK_ENTRY (priv->entry), xalign); + gtk_entry_set_has_frame (priv->entry, FALSE); + gtk_entry_set_alignment (priv->entry, xalign); gtk_editable_set_width_chars (GTK_EDITABLE (priv->entry), 5); if (priv->text) diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 12132c29440901ebe6b31a9a2485cc1a37508f7e..e99aac2eddce0f1fe183d45b8e83e5b2a6567827 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -818,14 +818,14 @@ row_changed_cb (GtkTreeModel *model, * * Returns: A newly created #GtkCellView widget. */ -GtkWidget * +GtkCellView * gtk_cell_view_new (void) { GtkCellView *cellview; cellview = g_object_new (GTK_TYPE_CELL_VIEW, NULL); - return GTK_WIDGET (cellview); + return cellview; } @@ -844,17 +844,17 @@ gtk_cell_view_new (void) * * Returns: A newly created #GtkCellView widget. */ -GtkWidget * +GtkCellView * gtk_cell_view_new_with_context (GtkCellArea *area, GtkCellAreaContext *context) { g_return_val_if_fail (GTK_IS_CELL_AREA (area), NULL); g_return_val_if_fail (context == NULL || GTK_IS_CELL_AREA_CONTEXT (context), NULL); - return (GtkWidget *)g_object_new (GTK_TYPE_CELL_VIEW, - "cell-area", area, - "cell-area-context", context, - NULL); + return g_object_new (GTK_TYPE_CELL_VIEW, + "cell-area", area, + "cell-area-context", context, + NULL); } /** @@ -866,7 +866,7 @@ gtk_cell_view_new_with_context (GtkCellArea *area, * * Returns: A newly created #GtkCellView widget. */ -GtkWidget * +GtkCellView * gtk_cell_view_new_with_text (const gchar *text) { GtkCellView *cellview; @@ -884,7 +884,7 @@ gtk_cell_view_new_with_text (const gchar *text) gtk_cell_view_set_value (cellview, renderer, "text", &value); g_value_unset (&value); - return GTK_WIDGET (cellview); + return cellview; } /** @@ -897,7 +897,7 @@ gtk_cell_view_new_with_text (const gchar *text) * * Returns: A newly created #GtkCellView widget. */ -GtkWidget * +GtkCellView * gtk_cell_view_new_with_markup (const gchar *markup) { GtkCellView *cellview; @@ -915,7 +915,7 @@ gtk_cell_view_new_with_markup (const gchar *markup) gtk_cell_view_set_value (cellview, renderer, "markup", &value); g_value_unset (&value); - return GTK_WIDGET (cellview); + return cellview; } /** @@ -927,7 +927,7 @@ gtk_cell_view_new_with_markup (const gchar *markup) * * Returns: A newly created #GtkCellView widget. */ -GtkWidget * +GtkCellView * gtk_cell_view_new_with_texture (GdkTexture *texture) { GtkCellView *cellview; @@ -945,7 +945,7 @@ gtk_cell_view_new_with_texture (GdkTexture *texture) gtk_cell_view_set_value (cellview, renderer, "texture", &value); g_value_unset (&value); - return GTK_WIDGET (cellview); + return cellview; } /** diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h index ebfef56a3c28bd83358732c099c1dee9cdf82352..391cd8f191a5ed739365515e0cdfc478b1714a9e 100644 --- a/gtk/gtkcellview.h +++ b/gtk/gtkcellview.h @@ -39,16 +39,16 @@ typedef struct _GtkCellView GtkCellView; GDK_AVAILABLE_IN_ALL GType gtk_cell_view_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_cell_view_new (void); +GtkCellView *gtk_cell_view_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_cell_view_new_with_context (GtkCellArea *area, +GtkCellView *gtk_cell_view_new_with_context (GtkCellArea *area, GtkCellAreaContext *context); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_cell_view_new_with_text (const gchar *text); +GtkCellView *gtk_cell_view_new_with_text (const gchar *text); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_cell_view_new_with_markup (const gchar *markup); +GtkCellView *gtk_cell_view_new_with_markup (const gchar *markup); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_cell_view_new_with_texture (GdkTexture *texture); +GtkCellView *gtk_cell_view_new_with_texture (GdkTexture *texture); GDK_AVAILABLE_IN_ALL void gtk_cell_view_set_model (GtkCellView *cell_view, GtkTreeModel *model); diff --git a/gtk/gtkcenterbox.c b/gtk/gtkcenterbox.c index 8bd0a7fda07d4390e4c4d4ce3a6b343f661b773b..af3d17a726347a1648cb54b14edd4fa8d8fc5c6a 100644 --- a/gtk/gtkcenterbox.c +++ b/gtk/gtkcenterbox.c @@ -230,10 +230,10 @@ gtk_center_box_init (GtkCenterBox *self) * * Returns: the new #GtkCenterBox. */ -GtkWidget * +GtkCenterBox * gtk_center_box_new (void) { - return GTK_WIDGET (g_object_new (GTK_TYPE_CENTER_BOX, NULL)); + return g_object_new (GTK_TYPE_CENTER_BOX, NULL); } /** diff --git a/gtk/gtkcenterbox.h b/gtk/gtkcenterbox.h index c1996a35f453d5da29fdfe79608c0be572653cb8..0e6cfe8eec7e73e9bb1f57bbd4da3ce9c1d3b13d 100644 --- a/gtk/gtkcenterbox.h +++ b/gtk/gtkcenterbox.h @@ -41,19 +41,19 @@ typedef struct _GtkCenterBox GtkCenterBox; typedef struct _GtkCenterBoxClass GtkCenterBoxClass; GDK_AVAILABLE_IN_ALL -GType gtk_center_box_get_type (void) G_GNUC_CONST; +GType gtk_center_box_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_center_box_new (void); +GtkCenterBox *gtk_center_box_new (void); GDK_AVAILABLE_IN_ALL -void gtk_center_box_set_start_widget (GtkCenterBox *self, - GtkWidget *child); +void gtk_center_box_set_start_widget (GtkCenterBox *self, + GtkWidget *child); GDK_AVAILABLE_IN_ALL -void gtk_center_box_set_center_widget (GtkCenterBox *self, - GtkWidget *child); +void gtk_center_box_set_center_widget (GtkCenterBox *self, + GtkWidget *child); GDK_AVAILABLE_IN_ALL -void gtk_center_box_set_end_widget (GtkCenterBox *self, - GtkWidget *child); +void gtk_center_box_set_end_widget (GtkCenterBox *self, + GtkWidget *child); GDK_AVAILABLE_IN_ALL GtkWidget * gtk_center_box_get_start_widget (GtkCenterBox *self); diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index e57fa71b89ff22ee5e6beb2d1a1f8719fc74a30f..600e709040887b9790de476d31dfd57af96fce6c 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -410,7 +410,7 @@ gtk_check_button_init (GtkCheckButton *check_button) * * Returns: a #GtkWidget. */ -GtkWidget* +GtkCheckButton* gtk_check_button_new (void) { return g_object_new (GTK_TYPE_CHECK_BUTTON, NULL); @@ -425,7 +425,7 @@ gtk_check_button_new (void) * * Returns: a #GtkWidget. */ -GtkWidget* +GtkCheckButton* gtk_check_button_new_with_label (const gchar *label) { return g_object_new (GTK_TYPE_CHECK_BUTTON, "label", label, NULL); @@ -442,7 +442,7 @@ gtk_check_button_new_with_label (const gchar *label) * * Returns: a new #GtkCheckButton */ -GtkWidget* +GtkCheckButton* gtk_check_button_new_with_mnemonic (const gchar *label) { return g_object_new (GTK_TYPE_CHECK_BUTTON, diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h index 9a7ed350f70b4336ea6cfec296f8ca5efef06741..f99123d185b5068a4d0244d45c607e43759a2850 100644 --- a/gtk/gtkcheckbutton.h +++ b/gtk/gtkcheckbutton.h @@ -62,23 +62,23 @@ struct _GtkCheckButtonClass GDK_AVAILABLE_IN_ALL -GType gtk_check_button_get_type (void) G_GNUC_CONST; +GType gtk_check_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_check_button_new (void); +GtkCheckButton* gtk_check_button_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_check_button_new_with_label (const gchar *label); +GtkCheckButton* gtk_check_button_new_with_label (const gchar *label); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_check_button_new_with_mnemonic (const gchar *label); +GtkCheckButton* gtk_check_button_new_with_mnemonic (const gchar *label); GDK_AVAILABLE_IN_ALL -void gtk_check_button_set_draw_indicator (GtkCheckButton *check_button, - gboolean draw_indicator); +void gtk_check_button_set_draw_indicator (GtkCheckButton *check_button, + gboolean draw_indicator); GDK_AVAILABLE_IN_ALL -gboolean gtk_check_button_get_draw_indicator (GtkCheckButton *check_button); +gboolean gtk_check_button_get_draw_indicator (GtkCheckButton *check_button); GDK_AVAILABLE_IN_ALL -void gtk_check_button_set_inconsistent (GtkCheckButton *check_button, - gboolean inconsistent); +void gtk_check_button_set_inconsistent (GtkCheckButton *check_button, + gboolean inconsistent); GDK_AVAILABLE_IN_ALL -gboolean gtk_check_button_get_inconsistent (GtkCheckButton *check_button); +gboolean gtk_check_button_get_inconsistent (GtkCheckButton *check_button); G_END_DECLS diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index 19759ff8e4d2d9c4e506d768eeba2bd6f7807ce1..d9380a78699ee96e14f152678ed5b76d438d62fd 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -82,7 +82,7 @@ typedef struct GtkWidget *button; GtkWidget *swatch; /* Widget where we draw the color sample */ - GtkWidget *cs_dialog; /* Color selection dialog */ + GtkColorChooserDialog *cs_dialog; /* Color selection dialog */ gchar *title; /* Title for the color selection window */ GdkRGBA rgba; @@ -351,7 +351,7 @@ gtk_color_button_finalize (GObject *object) GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (button); if (priv->cs_dialog != NULL) - gtk_widget_destroy (priv->cs_dialog); + gtk_widget_destroy (GTK_WIDGET (priv->cs_dialog)); g_free (priv->title); gtk_widget_unparent (priv->button); @@ -373,7 +373,7 @@ gtk_color_button_finalize (GObject *object) * * Returns: a new color button */ -GtkWidget * +GtkColorButton * gtk_color_button_new (void) { return g_object_new (GTK_TYPE_COLOR_BUTTON, NULL); @@ -387,7 +387,7 @@ gtk_color_button_new (void) * * Returns: a new color button */ -GtkWidget * +GtkColorButton * gtk_color_button_new_with_rgba (const GdkRGBA *rgba) { return g_object_new (GTK_TYPE_COLOR_BUTTON, "rgba", rgba, NULL); @@ -437,7 +437,8 @@ static void ensure_dialog (GtkColorButton *button) { GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (button); - GtkWidget *parent, *dialog; + GtkWidget *parent; + GtkColorChooserDialog *dialog; if (priv->cs_dialog != NULL) return; diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h index 554238701ef0b3d303ee8da17347e708a44d58be..c98941f5a72f68f9c760b047bc7dace9af948a9b 100644 --- a/gtk/gtkcolorbutton.h +++ b/gtk/gtkcolorbutton.h @@ -47,16 +47,16 @@ G_BEGIN_DECLS typedef struct _GtkColorButton GtkColorButton; GDK_AVAILABLE_IN_ALL -GType gtk_color_button_get_type (void) G_GNUC_CONST; +GType gtk_color_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_color_button_new (void); +GtkColorButton * gtk_color_button_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_color_button_new_with_rgba (const GdkRGBA *rgba); +GtkColorButton * gtk_color_button_new_with_rgba (const GdkRGBA *rgba); GDK_AVAILABLE_IN_ALL -void gtk_color_button_set_title (GtkColorButton *button, - const gchar *title); +void gtk_color_button_set_title (GtkColorButton *button, + const gchar *title); GDK_AVAILABLE_IN_ALL -const gchar *gtk_color_button_get_title (GtkColorButton *button); +const gchar * gtk_color_button_get_title (GtkColorButton *button); G_END_DECLS diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c index b37e520dd50a870d370059ddd56dfd67a74357c7..910841fe8a42bc2a8bd2e1df7b3f8dc764c7338d 100644 --- a/gtk/gtkcolorchooserdialog.c +++ b/gtk/gtkcolorchooserdialog.c @@ -277,7 +277,7 @@ gtk_color_chooser_dialog_iface_init (GtkColorChooserInterface *iface) * * Returns: a new #GtkColorChooserDialog */ -GtkWidget * +GtkColorChooserDialog * gtk_color_chooser_dialog_new (const gchar *title, GtkWindow *parent) { @@ -288,5 +288,5 @@ gtk_color_chooser_dialog_new (const gchar *title, "transient-for", parent, NULL); - return GTK_WIDGET (dialog); + return dialog; } diff --git a/gtk/gtkcolorchooserdialog.h b/gtk/gtkcolorchooserdialog.h index b4a16d083b41722dabb1a98f13d0cd2bab751e87..8f97c15f4cca6dc7683552322288bca3a5f6fb2e 100644 --- a/gtk/gtkcolorchooserdialog.h +++ b/gtk/gtkcolorchooserdialog.h @@ -33,11 +33,11 @@ G_BEGIN_DECLS typedef struct _GtkColorChooserDialog GtkColorChooserDialog; GDK_AVAILABLE_IN_ALL -GType gtk_color_chooser_dialog_get_type (void) G_GNUC_CONST; +GType gtk_color_chooser_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_color_chooser_dialog_new (const gchar *title, - GtkWindow *parent); +GtkColorChooserDialog * gtk_color_chooser_dialog_new (const gchar *title, + GtkWindow *parent); G_END_DECLS diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c index a9c4f129620ea8c827c611cb359044698affa26e..9baa229d5716c3cd49edda99ba7fea69282ea852 100644 --- a/gtk/gtkcolorchooserwidget.c +++ b/gtk/gtkcolorchooserwidget.c @@ -80,7 +80,7 @@ struct _GtkColorChooserWidgetPrivate GtkWidget *editor; GtkSizeGroup *size_group; - GtkWidget *custom_label; + GtkLabel *custom_label; GtkWidget *custom; GtkWidget *button; @@ -305,7 +305,7 @@ remove_palette (GtkColorChooserWidget *cc) for (l = children; l; l = l->next) { widget = l->data; - if (widget == priv->custom_label || widget == priv->custom) + if (widget == GTK_WIDGET (priv->custom_label) || widget == priv->custom) continue; gtk_container_remove (GTK_CONTAINER (priv->palette), widget); } @@ -528,7 +528,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc) GtkWidget *box; GtkWidget *p; GtkWidget *button; - GtkWidget *label; + GtkLabel *label; gint i; double color[4]; GdkRGBA rgba; @@ -547,8 +547,8 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc) /* translators: label for the custom section in the color chooser */ priv->custom_label = label = gtk_label_new (_("Custom")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (priv->palette), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_container_add (GTK_CONTAINER (priv->palette), GTK_WIDGET (label)); priv->custom = box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (box, "margin-top", 12, NULL); diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index bbb7dba9b1ecd63bf65ed2332fec694473207a12..861c647c828f042bb0c8bcb2f6351ad47009e542 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -116,7 +116,7 @@ typedef struct gint active; /* Only temporary */ GtkTreeRowReference *active_row; - GtkWidget *cell_view; + GtkCellView *cell_view; GtkWidget *box; GtkWidget *button; @@ -391,7 +391,7 @@ gtk_combo_box_compute_expand (GtkWidget *widget, GtkWidget *child; child = gtk_bin_get_child (GTK_BIN (combo_box)); - if (child && child != priv->cell_view) + if (child && child != GTK_WIDGET (priv->cell_view)) { *hexpand = gtk_widget_compute_expand (child, GTK_ORIENTATION_HORIZONTAL); *vexpand = gtk_widget_compute_expand (child, GTK_ORIENTATION_VERTICAL); @@ -1024,15 +1024,14 @@ static void gtk_combo_box_create_child (GtkComboBox *combo_box) { GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); - GtkWidget *child; if (priv->has_entry) { - GtkWidget *entry; + GtkEntry *entry; GtkStyleContext *context; entry = gtk_entry_new (); - gtk_container_add (GTK_CONTAINER (combo_box), entry); + gtk_container_add (GTK_CONTAINER (combo_box), GTK_WIDGET (entry)); context = gtk_widget_get_style_context (GTK_WIDGET (entry)); gtk_style_context_add_class (context, "combo"); @@ -1042,13 +1041,12 @@ gtk_combo_box_create_child (GtkComboBox *combo_box) } else { - child = gtk_cell_view_new_with_context (priv->area, NULL); - priv->cell_view = child; - gtk_widget_set_hexpand (child, TRUE); - gtk_cell_view_set_fit_model (GTK_CELL_VIEW (priv->cell_view), TRUE); - gtk_cell_view_set_model (GTK_CELL_VIEW (priv->cell_view), priv->model); - gtk_box_insert_child_after (GTK_BOX (gtk_widget_get_parent (priv->arrow)), priv->cell_view, NULL); - _gtk_bin_set_child (GTK_BIN (combo_box), priv->cell_view); + priv->cell_view = gtk_cell_view_new_with_context (priv->area, NULL); + gtk_widget_set_hexpand (GTK_WIDGET (priv->cell_view), TRUE); + gtk_cell_view_set_fit_model (priv->cell_view, TRUE); + gtk_cell_view_set_model (priv->cell_view, priv->model); + gtk_box_insert_child_after (GTK_BOX (gtk_widget_get_parent (priv->arrow)), GTK_WIDGET (priv->cell_view), NULL); + _gtk_bin_set_child (GTK_BIN (combo_box), GTK_WIDGET (priv->cell_view)); } } @@ -1075,8 +1073,8 @@ gtk_combo_box_add (GtkContainer *container, if (priv->cell_view) { - gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (priv->cell_view)), - priv->cell_view); + gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (GTK_WIDGET (priv->cell_view))), + GTK_WIDGET (priv->cell_view)); _gtk_bin_set_child (GTK_BIN (container), NULL); priv->cell_view = NULL; } @@ -1446,7 +1444,7 @@ gtk_combo_box_unset_model (GtkComboBox *combo_box) } if (priv->cell_view) - gtk_cell_view_set_model (GTK_CELL_VIEW (priv->cell_view), NULL); + gtk_cell_view_set_model (priv->cell_view, NULL); } static void @@ -1459,7 +1457,7 @@ gtk_combo_box_forall (GtkContainer *container, GtkWidget *child; child = gtk_bin_get_child (GTK_BIN (container)); - if (child && child != priv->cell_view) + if (child && child != GTK_WIDGET (priv->cell_view)) (* callback) (child, callback_data); } @@ -1748,7 +1746,7 @@ gtk_combo_box_model_row_deleted (GtkTreeModel *model, if (!gtk_tree_row_reference_valid (priv->active_row)) { if (priv->cell_view) - gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (priv->cell_view), NULL); + gtk_cell_view_set_displayed_row (priv->cell_view, NULL); g_signal_emit (combo_box, combo_box_signals[CHANGED], 0); } @@ -1832,7 +1830,7 @@ gtk_combo_box_cell_layout_get_area (GtkCellLayout *cell_layout) * * Returns: A new #GtkComboBox. */ -GtkWidget * +GtkComboBox * gtk_combo_box_new (void) { return g_object_new (GTK_TYPE_COMBO_BOX, NULL); @@ -1845,7 +1843,7 @@ gtk_combo_box_new (void) * * Returns: A new #GtkComboBox. */ -GtkWidget * +GtkComboBox * gtk_combo_box_new_with_entry (void) { return g_object_new (GTK_TYPE_COMBO_BOX, "has-entry", TRUE, NULL); @@ -1859,7 +1857,7 @@ gtk_combo_box_new_with_entry (void) * * Returns: A new #GtkComboBox. */ -GtkWidget * +GtkComboBox * gtk_combo_box_new_with_model (GtkTreeModel *model) { GtkComboBox *combo_box; @@ -1868,7 +1866,7 @@ gtk_combo_box_new_with_model (GtkTreeModel *model) combo_box = g_object_new (GTK_TYPE_COMBO_BOX, "model", model, NULL); - return GTK_WIDGET (combo_box); + return combo_box; } /** @@ -1880,7 +1878,7 @@ gtk_combo_box_new_with_model (GtkTreeModel *model) * * Returns: A new #GtkComboBox */ -GtkWidget * +GtkComboBox * gtk_combo_box_new_with_model_and_entry (GtkTreeModel *model) { return g_object_new (GTK_TYPE_COMBO_BOX, @@ -1990,7 +1988,7 @@ gtk_combo_box_set_active_internal (GtkComboBox *combo_box, gtk_tree_popover_set_active (GTK_TREE_POPOVER (priv->popup_widget), -1); if (priv->cell_view) - gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (priv->cell_view), NULL); + gtk_cell_view_set_displayed_row (priv->cell_view, NULL); /* * Do not emit a "changed" signal when an already invalid selection was @@ -2008,7 +2006,7 @@ gtk_combo_box_set_active_internal (GtkComboBox *combo_box, gtk_tree_path_get_indices (path)[0]); if (priv->cell_view) - gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (priv->cell_view), path); + gtk_cell_view_set_displayed_row (priv->cell_view, path); } g_signal_emit (combo_box, combo_box_signals[CHANGED], 0); @@ -2119,7 +2117,7 @@ gtk_combo_box_set_model (GtkComboBox *combo_box, gtk_tree_popover_set_model (GTK_TREE_POPOVER (priv->popup_widget), priv->model); if (priv->cell_view) - gtk_cell_view_set_model (GTK_CELL_VIEW (priv->cell_view), + gtk_cell_view_set_model (priv->cell_view, priv->model); if (priv->active != -1) diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h index 8a306b66fae5d9f37b08d64b37778469afe89da8..7e76b14f907d3f5cd9ecfd8adeda0693af80092b 100644 --- a/gtk/gtkcombobox.h +++ b/gtk/gtkcombobox.h @@ -71,13 +71,13 @@ struct _GtkComboBoxClass GDK_AVAILABLE_IN_ALL GType gtk_combo_box_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_combo_box_new (void); +GtkComboBox *gtk_combo_box_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_combo_box_new_with_entry (void); +GtkComboBox *gtk_combo_box_new_with_entry (void); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_combo_box_new_with_model (GtkTreeModel *model); +GtkComboBox *gtk_combo_box_new_with_model (GtkTreeModel *model); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_combo_box_new_with_model_and_entry (GtkTreeModel *model); +GtkComboBox *gtk_combo_box_new_with_model_and_entry (GtkTreeModel *model); /* get/set active item */ GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c index 3794690414fee7dec871a3ca57ed1bc758a393ee..5872c8f0de2d4a07fa8a050f9b36764b35b1ac9f 100644 --- a/gtk/gtkcomboboxtext.c +++ b/gtk/gtkcomboboxtext.c @@ -350,7 +350,7 @@ gtk_combo_box_text_buildable_custom_finished (GtkBuildable *buildable, * * Returns: A new #GtkComboBoxText */ -GtkWidget * +GtkComboBoxText * gtk_combo_box_text_new (void) { return g_object_new (GTK_TYPE_COMBO_BOX_TEXT, @@ -365,7 +365,7 @@ gtk_combo_box_text_new (void) * * Returns: a new #GtkComboBoxText */ -GtkWidget * +GtkComboBoxText * gtk_combo_box_text_new_with_entry (void) { return g_object_new (GTK_TYPE_COMBO_BOX_TEXT, diff --git a/gtk/gtkcomboboxtext.h b/gtk/gtkcomboboxtext.h index 80feb5ab4f909194bf947b3f4fb43309e8e67630..c4719ab8a4df865c13e9b2797728c8f80e5392dc 100644 --- a/gtk/gtkcomboboxtext.h +++ b/gtk/gtkcomboboxtext.h @@ -36,9 +36,9 @@ typedef struct _GtkComboBoxText GtkComboBoxText; GDK_AVAILABLE_IN_ALL GType gtk_combo_box_text_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_combo_box_text_new (void); +GtkComboBoxText* gtk_combo_box_text_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_combo_box_text_new_with_entry (void); +GtkComboBoxText* gtk_combo_box_text_new_with_entry (void); GDK_AVAILABLE_IN_ALL void gtk_combo_box_text_append_text (GtkComboBoxText *combo_box, const gchar *text); diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c index 56e9e3a4a578f1985638f6f40df60d6efc507ea5..9c42fd880c8e6c8690ca1d693ef3aed076012364 100644 --- a/gtk/gtkcustompaperunixdialog.c +++ b/gtk/gtkcustompaperunixdialog.c @@ -54,7 +54,7 @@ struct _GtkCustomPaperUnixDialogPrivate GtkWidget *treeview; GtkWidget *values_box; - GtkWidget *printer_combo; + GtkComboBox *printer_combo; GtkWidget *width_widget; GtkWidget *height_widget; GtkWidget *top_widget; @@ -393,11 +393,11 @@ gtk_custom_paper_unix_dialog_finalize (GObject *object) * * Returns: the new #GtkCustomPaperUnixDialog */ -GtkWidget * +GtkCustomPaperUnixDialog * _gtk_custom_paper_unix_dialog_new (GtkWindow *parent, const gchar *title) { - GtkWidget *result; + GtkCustomPaperUnixDialog *result; if (title == NULL) title = _("Manage Custom Sizes"); @@ -445,7 +445,7 @@ printer_added_cb (GtkPrintBackend *backend, strcmp (priv->waiting_for_printer, gtk_printer_get_name (printer)) == 0) { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->printer_combo), + gtk_combo_box_set_active_iter (priv->printer_combo, &iter); priv->waiting_for_printer = NULL; } @@ -536,9 +536,10 @@ static void unit_widget_changed (GtkCustomPaperUnixDialog *dialog); static GtkWidget * new_unit_widget (GtkCustomPaperUnixDialog *dialog, GtkUnit unit, - GtkWidget *mnemonic_label) + GtkLabel *mnemonic_label) { - GtkWidget *hbox, *button, *label; + GtkWidget *hbox, *button; + GtkLabel *label; UnitWidget *data; data = g_new0 (UnitWidget, 1); @@ -565,11 +566,11 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog, label = gtk_label_new (_("inch")); else label = gtk_label_new (_("mm")); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (hbox), label); - gtk_widget_show (label); - gtk_label_set_mnemonic_widget (GTK_LABEL (mnemonic_label), button); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); + gtk_label_set_mnemonic_widget (mnemonic_label, button); g_object_set_data_full (G_OBJECT (hbox), "unit-data", data, g_free); @@ -633,7 +634,7 @@ update_combo_sensitivity_from_printers (GtkCustomPaperUnixDialog *dialog) gtk_tree_selection_get_selected (selection, NULL, &iter)) sensitive = TRUE; - gtk_widget_set_sensitive (priv->printer_combo, sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (priv->printer_combo), sensitive); } static void @@ -864,7 +865,7 @@ get_margins_finished_callback (GtkPrinter *printer, if (success) set_margins_from_printer (dialog, printer); - gtk_combo_box_set_active (GTK_COMBO_BOX (priv->printer_combo), 0); + gtk_combo_box_set_active (priv->printer_combo, 0); } static void @@ -872,11 +873,8 @@ margins_from_printer_changed (GtkCustomPaperUnixDialog *dialog) { GtkCustomPaperUnixDialogPrivate *priv = dialog->priv; GtkTreeIter iter; - GtkComboBox *combo; GtkPrinter *printer; - combo = GTK_COMBO_BOX (priv->printer_combo); - if (priv->request_details_tag) { g_signal_handler_disconnect (priv->request_details_printer, @@ -886,9 +884,9 @@ margins_from_printer_changed (GtkCustomPaperUnixDialog *dialog) priv->request_details_tag = 0; } - if (gtk_combo_box_get_active_iter (combo, &iter)) + if (gtk_combo_box_get_active_iter (priv->printer_combo, &iter)) { - gtk_tree_model_get (gtk_combo_box_get_model (combo), &iter, + gtk_tree_model_get (gtk_combo_box_get_model (priv->printer_combo), &iter, PRINTER_LIST_COL_PRINTER, &printer, -1); if (printer) @@ -896,7 +894,7 @@ margins_from_printer_changed (GtkCustomPaperUnixDialog *dialog) if (gtk_printer_has_details (printer)) { set_margins_from_printer (dialog, printer); - gtk_combo_box_set_active (combo, 0); + gtk_combo_box_set_active (priv->printer_combo, 0); } else { @@ -964,20 +962,21 @@ static GtkWidget * wrap_in_frame (const gchar *label, GtkWidget *child) { - GtkWidget *frame, *label_widget; + GtkLabel *label_widget; + GtkWidget *frame; gchar *bold_text; label_widget = gtk_label_new (NULL); - gtk_widget_set_halign (label_widget, GTK_ALIGN_START); - gtk_widget_set_valign (label_widget, GTK_ALIGN_CENTER); - gtk_widget_show (label_widget); + gtk_widget_set_halign (GTK_WIDGET (label_widget), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label_widget), GTK_ALIGN_CENTER); + gtk_widget_show (GTK_WIDGET (label_widget)); bold_text = g_markup_printf_escaped ("%s", label); - gtk_label_set_markup (GTK_LABEL (label_widget), bold_text); + gtk_label_set_markup (label_widget, bold_text); g_free (bold_text); frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - gtk_container_add (GTK_CONTAINER (frame), label_widget); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label_widget)); gtk_widget_set_margin_start (child, 12); gtk_widget_set_halign (child, GTK_ALIGN_FILL); @@ -998,12 +997,12 @@ toolbutton_new (GtkCustomPaperUnixDialog *dialog, GCallback callback) { GtkToolItem *item; - GtkWidget *image; + GtkImage *image; item = gtk_tool_button_new (NULL, NULL); image = gtk_image_new_from_gicon (icon); - gtk_widget_show (image); - gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (item), image); + gtk_widget_show (GTK_WIDGET (image)); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (item), GTK_WIDGET (image)); gtk_widget_set_sensitive (GTK_WIDGET (item), sensitive); g_signal_connect_swapped (item, "clicked", callback, dialog); @@ -1020,8 +1019,11 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) GtkCustomPaperUnixDialogPrivate *priv = dialog->priv; GtkDialog *cpu_dialog = GTK_DIALOG (dialog); GtkWidget *content_area; - GtkWidget *grid, *label, *widget, *frame, *combo; - GtkWidget *hbox, *vbox, *treeview, *scrolled, *toolbar, *button; + GtkWidget *grid, *widget, *frame; + GtkComboBox *combo; + GtkWidget *hbox, *vbox, *treeview, *scrolled, *button; + GtkLabel *label; + GtkToolbar *toolbar; GtkCellRenderer *cell; GtkTreeViewColumn *column; GtkTreeIter iter; @@ -1074,23 +1076,23 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) toolbar = gtk_toolbar_new (); - context = gtk_widget_get_style_context (toolbar); + context = gtk_widget_get_style_context (GTK_WIDGET (toolbar)); gtk_style_context_add_class (context, GTK_STYLE_CLASS_INLINE_TOOLBAR); - gtk_container_add (GTK_CONTAINER (vbox), toolbar); - gtk_widget_show (toolbar); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (toolbar)); + gtk_widget_show (GTK_WIDGET (toolbar)); icon = g_themed_icon_new_with_default_fallbacks ("list-add-symbolic"); button = toolbutton_new (dialog, icon, TRUE, TRUE, G_CALLBACK (add_custom_paper)); g_object_unref (icon); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (button), 0); + gtk_toolbar_insert (toolbar, GTK_TOOL_ITEM (button), 0); icon = g_themed_icon_new_with_default_fallbacks ("list-remove-symbolic"); button = toolbutton_new (dialog, icon, TRUE, TRUE, G_CALLBACK (remove_custom_paper)); g_object_unref (icon); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (button), 1); + gtk_toolbar_insert (toolbar, GTK_TOOL_ITEM (button), 1); user_units = _gtk_print_get_default_user_units (); @@ -1105,10 +1107,10 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) gtk_grid_set_column_spacing (GTK_GRID (grid), 12); label = gtk_label_new_with_mnemonic (_("_Width:")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_widget_show (label); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_widget_show (GTK_WIDGET (label)); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); widget = new_unit_widget (dialog, user_units, label); priv->width_widget = widget; @@ -1116,10 +1118,10 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) gtk_widget_show (widget); label = gtk_label_new_with_mnemonic (_("_Height:")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_widget_show (label); - gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_widget_show (GTK_WIDGET (label)); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 1, 1, 1); widget = new_unit_widget (dialog, user_units, label); priv->height_widget = widget; @@ -1136,10 +1138,10 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) gtk_grid_set_column_spacing (GTK_GRID (grid), 12); label = gtk_label_new_with_mnemonic (_("_Top:")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); - gtk_widget_show (label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); + gtk_widget_show (GTK_WIDGET (label)); widget = new_unit_widget (dialog, user_units, label); priv->top_widget = widget; @@ -1147,10 +1149,10 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) gtk_widget_show (widget); label = gtk_label_new_with_mnemonic (_("_Bottom:")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1); - gtk_widget_show (label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 1, 1, 1); + gtk_widget_show (GTK_WIDGET (label)); widget = new_unit_widget (dialog, user_units, label); priv->bottom_widget = widget; @@ -1158,10 +1160,10 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) gtk_widget_show (widget); label = gtk_label_new_with_mnemonic (_("_Left:")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1); - gtk_widget_show (label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 2, 1, 1); + gtk_widget_show (GTK_WIDGET (label)); widget = new_unit_widget (dialog, user_units, label); priv->left_widget = widget; @@ -1169,10 +1171,10 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) gtk_widget_show (widget); label = gtk_label_new_with_mnemonic (_("_Right:")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1); - gtk_widget_show (label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 3, 1, 1); + gtk_widget_show (GTK_WIDGET (label)); widget = new_unit_widget (dialog, user_units, label); priv->right_widget = widget; @@ -1200,9 +1202,9 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) custom_paper_printer_data_func, NULL, NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - gtk_container_add (GTK_CONTAINER (hbox), combo); - gtk_widget_show (combo); + gtk_combo_box_set_active (combo, 0); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (combo)); + gtk_widget_show (GTK_WIDGET (combo)); g_signal_connect_swapped (combo, "changed", G_CALLBACK (margins_from_printer_changed), dialog); diff --git a/gtk/gtkcustompaperunixdialog.h b/gtk/gtkcustompaperunixdialog.h index 60566b15e8db5cb92f3b9c1ab99e89413193836e..98039f68c3be01c6b326b18d05d0c22060a09f17 100644 --- a/gtk/gtkcustompaperunixdialog.h +++ b/gtk/gtkcustompaperunixdialog.h @@ -59,13 +59,13 @@ struct _GtkCustomPaperUnixDialogClass }; GDK_AVAILABLE_IN_ALL -GType gtk_custom_paper_unix_dialog_get_type (void) G_GNUC_CONST; -GtkWidget * _gtk_custom_paper_unix_dialog_new (GtkWindow *parent, - const gchar *title); -GtkUnit _gtk_print_get_default_user_units (void); -void _gtk_print_load_custom_papers (GtkListStore *store); -void _gtk_print_save_custom_papers (GtkListStore *store); -GList * _gtk_load_custom_papers (void); +GType gtk_custom_paper_unix_dialog_get_type (void) G_GNUC_CONST; +GtkCustomPaperUnixDialog * _gtk_custom_paper_unix_dialog_new (GtkWindow *parent, + const gchar *title); +GtkUnit _gtk_print_get_default_user_units (void); +void _gtk_print_load_custom_papers (GtkListStore *store); +void _gtk_print_save_custom_papers (GtkListStore *store); +GList * _gtk_load_custom_papers (void); G_END_DECLS diff --git a/gtk/gtkdragicon.c b/gtk/gtkdragicon.c index c4bb48ea8c5173e65b9561ba4de44274e21a7ccb..bda87123686e179101207dc0fa00d7791216a3d6 100644 --- a/gtk/gtkdragicon.c +++ b/gtk/gtkdragicon.c @@ -433,15 +433,15 @@ gtk_drag_icon_set_from_paintable (GdkDrag *drag, int hot_y) { GtkWidget *icon; - GtkWidget *picture; + GtkPicture *picture; gdk_drag_set_hotspot (drag, hot_x, hot_y); icon = gtk_drag_icon_new_for_drag (drag); picture = gtk_picture_new_for_paintable (paintable); - gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE); - gtk_container_add (GTK_CONTAINER (icon), picture); + gtk_picture_set_can_shrink (picture, FALSE); + gtk_container_add (GTK_CONTAINER (icon), GTK_WIDGET (picture)); g_object_set_data_full (G_OBJECT (drag), "icon", diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index 1ee33acdbf3e5e63140509e4888b15667ffd342a..9354da581a007b8d98c57e6adf16b1eaad7fd64a 100644 --- a/gtk/gtkeditable.c +++ b/gtk/gtkeditable.c @@ -127,7 +127,7 @@ * { * ... * gtk_editable_finish_delegate (GTK_EDITABLE (self)); - * g_clear_pointer (&self->text_widget, gtk_widget_unparent); + * g_clear_pointer ((GtkWidget **) &self->text_widget, gtk_widget_unparent); * ... * } * ]| diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c index 9865ce8aebbd497d1f321d34091eea2e410c948a..4f456c3d6d211cc5b6a7d82ead23cc0917ff670e 100644 --- a/gtk/gtkemojichooser.c +++ b/gtk/gtkemojichooser.c @@ -346,7 +346,7 @@ add_emoji (GtkWidget *box, GtkEmojiChooser *chooser) { GtkWidget *child; - GtkWidget *label; + GtkLabel *label; PangoAttrList *attrs; GVariant *codes; char text[64]; @@ -373,17 +373,17 @@ add_emoji (GtkWidget *box, label = gtk_label_new (text); attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_scale_new (PANGO_SCALE_X_LARGE)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); + gtk_label_set_attributes (label, attrs); pango_attr_list_unref (attrs); - layout = gtk_label_get_layout (GTK_LABEL (label)); + layout = gtk_label_get_layout (label); pango_layout_get_extents (layout, &rect, NULL); /* Check for fallback rendering that generates too wide items */ if (pango_layout_get_unknown_glyphs_count (layout) > 0 || rect.width >= 1.5 * chooser->emoji_max_width) { - gtk_widget_destroy (label); + gtk_widget_destroy (GTK_WIDGET (label)); return; } @@ -397,7 +397,7 @@ add_emoji (GtkWidget *box, if (chooser) g_signal_connect (child, "popup-menu", G_CALLBACK (popup_menu), chooser); - gtk_container_add (GTK_CONTAINER (child), label); + gtk_container_add (GTK_CONTAINER (child), GTK_WIDGET (label)); gtk_flow_box_insert (GTK_FLOW_BOX (box), child, prepend ? 0 : -1); } @@ -771,8 +771,8 @@ gtk_emoji_chooser_class_init (GtkEmojiChooserClass *klass) gtk_widget_class_bind_template_callback (widget_class, long_pressed_cb); } -GtkWidget * +GtkEmojiChooser * gtk_emoji_chooser_new (void) { - return GTK_WIDGET (g_object_new (GTK_TYPE_EMOJI_CHOOSER, NULL)); + return g_object_new (GTK_TYPE_EMOJI_CHOOSER, NULL); } diff --git a/gtk/gtkemojichooser.h b/gtk/gtkemojichooser.h index 63670b5d5cebd42d9bd56e4bcf938208405ed104..d74f58e8631dfa6eef806ad70f029e6c2306288a 100644 --- a/gtk/gtkemojichooser.h +++ b/gtk/gtkemojichooser.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS typedef struct _GtkEmojiChooser GtkEmojiChooser; typedef struct _GtkEmojiChooserClass GtkEmojiChooserClass; -GType gtk_emoji_chooser_get_type (void) G_GNUC_CONST; -GtkWidget *gtk_emoji_chooser_new (void); +GType gtk_emoji_chooser_get_type (void) G_GNUC_CONST; +GtkEmojiChooser *gtk_emoji_chooser_new (void); G_END_DECLS diff --git a/gtk/gtkemojicompletion.c b/gtk/gtkemojicompletion.c index 41e37ff2215b183266fab35fc6e0f6ee61cd7b9c..1a9e25af792e242ecc454a8a63fe2a7a8fb608bc 100644 --- a/gtk/gtkemojicompletion.c +++ b/gtk/gtkemojicompletion.c @@ -454,7 +454,7 @@ add_emoji_variation (GtkWidget *box, gunichar modifier) { GtkWidget *child; - GtkWidget *label; + GtkLabel *label; PangoAttrList *attrs; char text[64]; @@ -463,7 +463,7 @@ add_emoji_variation (GtkWidget *box, label = gtk_label_new (text); attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_scale_new (PANGO_SCALE_X_LARGE)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); + gtk_label_set_attributes (label, attrs); pango_attr_list_unref (attrs); child = g_object_new (GTK_TYPE_FLOW_BOX_CHILD, "css-name", "emoji", NULL); @@ -474,7 +474,7 @@ add_emoji_variation (GtkWidget *box, if (modifier != 0) g_object_set_data (G_OBJECT (child), "modifier", GUINT_TO_POINTER (modifier)); - gtk_container_add (GTK_CONTAINER (child), label); + gtk_container_add (GTK_CONTAINER (child), GTK_WIDGET (label)); gtk_flow_box_insert (GTK_FLOW_BOX (box), child, -1); } @@ -484,7 +484,7 @@ add_emoji (GtkWidget *list, GtkEmojiCompletion *completion) { GtkWidget *child; - GtkWidget *label; + GtkLabel *label; GtkWidget *box; PangoAttrList *attrs; char text[64]; @@ -497,15 +497,15 @@ add_emoji (GtkWidget *list, label = gtk_label_new (text); attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_scale_new (PANGO_SCALE_X_LARGE)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); + gtk_label_set_attributes (label, attrs); pango_attr_list_unref (attrs); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "emoji"); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "emoji"); child = g_object_new (GTK_TYPE_LIST_BOX_ROW, "css-name", "emoji-completion-row", NULL); gtk_widget_set_focus_on_click (child, FALSE); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (child), box); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); g_object_set_data (G_OBJECT (child), "base", label); stack = gtk_stack_new (); @@ -516,9 +516,9 @@ add_emoji (GtkWidget *list, g_variant_get_child (emoji_data, 2, "&s", &shortname); label = gtk_label_new (shortname); - gtk_label_set_xalign (GTK_LABEL (label), 0); + gtk_label_set_xalign (label, 0); - gtk_stack_add_named (GTK_STACK (stack), label, "text"); + gtk_stack_add_named (GTK_STACK (stack), GTK_WIDGET (label), "text"); if (has_variations (emoji_data)) { @@ -648,7 +648,7 @@ gtk_emoji_completion_class_init (GtkEmojiCompletionClass *klass) gtk_widget_class_bind_template_callback (widget_class, row_activated); } -GtkWidget * +GtkEmojiCompletion * gtk_emoji_completion_new (GtkText *text) { GtkEmojiCompletion *completion; @@ -659,5 +659,5 @@ gtk_emoji_completion_new (GtkText *text) connect_signals (completion, text); - return GTK_WIDGET (completion); + return completion; } diff --git a/gtk/gtkemojicompletion.h b/gtk/gtkemojicompletion.h index 620c1395a1600dde9d9328444ec900a1eae1ca9f..7f0c1b875e999a185b5e9ab47f692e9874fa8719 100644 --- a/gtk/gtkemojicompletion.h +++ b/gtk/gtkemojicompletion.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS typedef struct _GtkEmojiCompletion GtkEmojiCompletion; typedef struct _GtkEmojiCompletionClass GtkEmojiCompletionClass; -GType gtk_emoji_completion_get_type (void) G_GNUC_CONST; -GtkWidget *gtk_emoji_completion_new (GtkText *text); +GType gtk_emoji_completion_get_type (void) G_GNUC_CONST; +GtkEmojiCompletion *gtk_emoji_completion_new (GtkText *text); G_END_DECLS diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 921a96951bebea70028801c119746ad9264abf74..198819d1db4282122fec0159266e98f6c00386ef 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -157,7 +157,7 @@ struct _GtkEntryPrivate { EntryIconInfo *icons[MAX_ICONS]; - GtkWidget *text; + GtkText *text; GtkWidget *progress_widget; GtkWidget *emoji_chooser; @@ -167,7 +167,7 @@ struct _GtkEntryPrivate struct _EntryIconInfo { - GtkWidget *widget; + GtkImage *widget; gchar *tooltip; guint nonactivatable : 1; guint in_drag : 1; @@ -308,7 +308,7 @@ gtk_entry_grab_focus (GtkWidget *widget) GtkEntry *entry = GTK_ENTRY (widget); GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); - return gtk_widget_grab_focus (priv->text); + return gtk_widget_grab_focus (GTK_WIDGET (priv->text)); } static gboolean @@ -318,7 +318,7 @@ gtk_entry_mnemonic_activate (GtkWidget *widget, GtkEntry *entry = GTK_ENTRY (widget); GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); - gtk_widget_grab_focus (priv->text); + gtk_widget_grab_focus (GTK_WIDGET (priv->text)); return TRUE; } @@ -1275,7 +1275,7 @@ gtk_entry_init (GtkEntry *entry) GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); priv->text = gtk_text_new (); - gtk_widget_set_parent (priv->text, GTK_WIDGET (entry)); + gtk_widget_set_parent (GTK_WIDGET (priv->text), GTK_WIDGET (entry)); gtk_editable_init_delegate (GTK_EDITABLE (entry)); connect_text_signals (entry); @@ -1295,7 +1295,7 @@ gtk_entry_dispose (GObject *object) disconnect_text_signals (entry); gtk_editable_finish_delegate (GTK_EDITABLE (entry)); } - g_clear_pointer (&priv->text, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->text, gtk_widget_unparent); g_clear_pointer (&priv->emoji_chooser, gtk_widget_unparent); @@ -1323,7 +1323,7 @@ gtk_entry_finalize (GObject *object) g_clear_object (&icon_info->content); - gtk_widget_unparent (icon_info->widget); + gtk_widget_unparent (GTK_WIDGET (icon_info->widget)); g_slice_free (EntryIconInfo, icon_info); } @@ -1349,7 +1349,7 @@ update_icon_style (GtkWidget *widget, if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) icon_pos = 1 - icon_pos; - context = gtk_widget_get_style_context (icon_info->widget); + context = gtk_widget_get_style_context (GTK_WIDGET (icon_info->widget)); gtk_style_context_add_class (context, sides[icon_pos]); gtk_style_context_remove_class (context, sides[1 - icon_pos]); } @@ -1384,11 +1384,11 @@ update_node_ordering (GtkEntry *entry) icon_info = priv->icons[first_icon_pos]; if (icon_info) - gtk_css_node_insert_after (parent, gtk_widget_get_css_node (icon_info->widget), NULL); + gtk_css_node_insert_after (parent, gtk_widget_get_css_node (GTK_WIDGET (icon_info->widget)), NULL); icon_info = priv->icons[second_icon_pos]; if (icon_info) - gtk_css_node_insert_before (parent, gtk_widget_get_css_node (icon_info->widget), NULL); + gtk_css_node_insert_before (parent, gtk_widget_get_css_node (GTK_WIDGET (icon_info->widget)), NULL); } static GtkEntryIconPosition @@ -1399,10 +1399,10 @@ get_icon_position_from_controller (GtkEntry *entry, GtkWidget *widget = gtk_event_controller_get_widget (controller); if (priv->icons[GTK_ENTRY_ICON_PRIMARY] && - priv->icons[GTK_ENTRY_ICON_PRIMARY]->widget == widget) + GTK_WIDGET (priv->icons[GTK_ENTRY_ICON_PRIMARY]->widget) == widget) return GTK_ENTRY_ICON_PRIMARY; else if (priv->icons[GTK_ENTRY_ICON_SECONDARY] && - priv->icons[GTK_ENTRY_ICON_SECONDARY]->widget == widget) + GTK_WIDGET (priv->icons[GTK_ENTRY_ICON_SECONDARY]->widget) == widget) return GTK_ENTRY_ICON_SECONDARY; g_assert_not_reached (); @@ -1463,7 +1463,7 @@ icon_drag_update_cb (GtkGestureDrag *gesture, icon_info = priv->icons[pos]; if (icon_info->content != NULL && - gtk_drag_check_threshold (icon_info->widget, start_x, start_y, x, y)) + gtk_drag_check_threshold (GTK_WIDGET (icon_info->widget), start_x, start_y, x, y)) { GdkPaintable *paintable; GdkSurface *surface; @@ -1476,7 +1476,7 @@ icon_drag_update_cb (GtkGestureDrag *gesture, device = gtk_gesture_get_device (GTK_GESTURE (gesture)); drag = gdk_drag_begin (surface, device, icon_info->content, icon_info->actions, start_x, start_y); - paintable = gtk_widget_paintable_new (icon_info->widget); + paintable = gtk_widget_paintable_new (GTK_WIDGET (icon_info->widget)); gtk_drag_icon_set_from_paintable (drag, paintable, -2, -2); g_object_unref (paintable); @@ -1499,11 +1499,11 @@ construct_icon_info (GtkWidget *widget, priv->icons[icon_pos] = icon_info; icon_info->widget = gtk_image_new (); - gtk_widget_set_cursor_from_name (icon_info->widget, "default"); + gtk_widget_set_cursor_from_name (GTK_WIDGET (icon_info->widget), "default"); if (icon_pos == GTK_ENTRY_ICON_PRIMARY) - gtk_widget_insert_before (icon_info->widget, widget, priv->text); + gtk_widget_insert_before (GTK_WIDGET (icon_info->widget), widget, GTK_WIDGET (priv->text)); else - gtk_widget_insert_after (icon_info->widget, widget, priv->text); + gtk_widget_insert_after (GTK_WIDGET (icon_info->widget), widget, GTK_WIDGET (priv->text)); update_icon_style (widget, icon_pos); update_node_ordering (entry); @@ -1511,12 +1511,12 @@ construct_icon_info (GtkWidget *widget, press = gtk_gesture_click_new (); g_signal_connect (press, "pressed", G_CALLBACK (icon_pressed_cb), entry); g_signal_connect (press, "released", G_CALLBACK (icon_released_cb), entry); - gtk_widget_add_controller (icon_info->widget, GTK_EVENT_CONTROLLER (press)); + gtk_widget_add_controller (GTK_WIDGET (icon_info->widget), GTK_EVENT_CONTROLLER (press)); drag = gtk_gesture_drag_new (); g_signal_connect (drag, "drag-update", G_CALLBACK (icon_drag_update_cb), entry); - gtk_widget_add_controller (icon_info->widget, GTK_EVENT_CONTROLLER (drag)); + gtk_widget_add_controller (GTK_WIDGET (icon_info->widget), GTK_EVENT_CONTROLLER (drag)); gtk_gesture_group (press, drag); @@ -1536,7 +1536,7 @@ gtk_entry_measure (GtkWidget *widget, GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); int i; - gtk_widget_measure (priv->text, + gtk_widget_measure (GTK_WIDGET (priv->text), orientation, for_size, minimum, natural, @@ -1550,7 +1550,7 @@ gtk_entry_measure (GtkWidget *widget, if (!icon_info) continue; - gtk_widget_measure (icon_info->widget, + gtk_widget_measure (GTK_WIDGET (icon_info->widget), GTK_ORIENTATION_HORIZONTAL, -1, &icon_min, &icon_nat, NULL, NULL); @@ -1607,7 +1607,7 @@ gtk_entry_size_allocate (GtkWidget *widget, if (!icon_info) continue; - gtk_widget_measure (icon_info->widget, + gtk_widget_measure (GTK_WIDGET (icon_info->widget), GTK_ORIENTATION_HORIZONTAL, -1, NULL, &icon_width, @@ -1622,7 +1622,7 @@ gtk_entry_size_allocate (GtkWidget *widget, icon_alloc.width = icon_width; icon_alloc.height = height; - gtk_widget_size_allocate (icon_info->widget, &icon_alloc, baseline); + gtk_widget_size_allocate (GTK_WIDGET (icon_info->widget), &icon_alloc, baseline); text_alloc.width -= icon_width; @@ -1631,7 +1631,7 @@ gtk_entry_size_allocate (GtkWidget *widget, text_alloc.x += icon_width; } - gtk_widget_size_allocate (priv->text, &text_alloc, baseline); + gtk_widget_size_allocate (GTK_WIDGET (priv->text), &text_alloc, baseline); if (priv->progress_widget && gtk_widget_get_visible (priv->progress_widget)) { @@ -1679,7 +1679,7 @@ gtk_entry_snapshot (GtkWidget *widget, if (priv->progress_widget && gtk_widget_get_visible (priv->progress_widget)) gtk_widget_snapshot_child (widget, priv->progress_widget, snapshot); - gtk_widget_snapshot_child (widget, priv->text, snapshot); + gtk_widget_snapshot_child (widget, GTK_WIDGET (priv->text), snapshot); /* Draw icons */ for (i = 0; i < MAX_ICONS; i++) @@ -1687,7 +1687,7 @@ gtk_entry_snapshot (GtkWidget *widget, EntryIconInfo *icon_info = priv->icons[i]; if (icon_info != NULL) - gtk_widget_snapshot_child (widget, icon_info->widget, snapshot); + gtk_widget_snapshot_child (widget, GTK_WIDGET (icon_info->widget), snapshot); } } @@ -1712,7 +1712,7 @@ gtk_entry_grab_focus_without_selecting (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), FALSE); - return gtk_text_grab_focus_without_selecting (GTK_TEXT (priv->text)); + return gtk_text_grab_focus_without_selecting (priv->text); } static void @@ -1799,7 +1799,7 @@ gtk_entry_reset_im_context (GtkEntry *entry) g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_reset_im_context (GTK_TEXT (priv->text)); + gtk_text_reset_im_context (priv->text); } static void @@ -1813,7 +1813,7 @@ gtk_entry_clear_icon (GtkEntry *entry, if (icon_info == NULL) return; - storage_type = gtk_image_get_storage_type (GTK_IMAGE (icon_info->widget)); + storage_type = gtk_image_get_storage_type (icon_info->widget); if (storage_type == GTK_IMAGE_EMPTY) return; @@ -1849,7 +1849,7 @@ gtk_entry_clear_icon (GtkEntry *entry, break; } - gtk_image_clear (GTK_IMAGE (icon_info->widget)); + gtk_image_clear (icon_info->widget); g_object_notify_by_pspec (G_OBJECT (entry), entry_props[icon_pos == GTK_ENTRY_ICON_PRIMARY @@ -1869,7 +1869,7 @@ gtk_entry_clear_icon (GtkEntry *entry, * * Returns: a new #GtkEntry. */ -GtkWidget* +GtkEntry* gtk_entry_new (void) { return g_object_new (GTK_TYPE_ENTRY, NULL); @@ -1883,7 +1883,7 @@ gtk_entry_new (void) * * Returns: a new #GtkEntry */ -GtkWidget* +GtkEntry* gtk_entry_new_with_buffer (GtkEntryBuffer *buffer) { g_return_val_if_fail (GTK_IS_ENTRY_BUFFER (buffer), NULL); @@ -1896,7 +1896,7 @@ get_buffer (GtkEntry *entry) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); - return gtk_text_get_buffer (GTK_TEXT (priv->text)); + return gtk_text_get_buffer (priv->text); } /** @@ -1932,7 +1932,7 @@ gtk_entry_set_buffer (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_buffer (GTK_TEXT (priv->text), buffer); + gtk_text_set_buffer (priv->text, buffer); } /** @@ -1963,7 +1963,7 @@ gtk_entry_set_visibility (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_visibility (GTK_TEXT (priv->text), visible); + gtk_text_set_visibility (priv->text, visible); } /** @@ -1982,7 +1982,7 @@ gtk_entry_get_visibility (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), FALSE); - return gtk_text_get_visibility (GTK_TEXT (priv->text)); + return gtk_text_get_visibility (priv->text); } /** @@ -2006,7 +2006,7 @@ gtk_entry_set_invisible_char (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_invisible_char (GTK_TEXT (priv->text), ch); + gtk_text_set_invisible_char (priv->text, ch); } /** @@ -2026,7 +2026,7 @@ gtk_entry_get_invisible_char (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), 0); - return gtk_text_get_invisible_char (GTK_TEXT (priv->text)); + return gtk_text_get_invisible_char (priv->text); } /** @@ -2044,7 +2044,7 @@ gtk_entry_unset_invisible_char (GtkEntry *entry) g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_unset_invisible_char (GTK_TEXT (priv->text)); + gtk_text_unset_invisible_char (priv->text); } /** @@ -2062,7 +2062,7 @@ gtk_entry_set_overwrite_mode (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_overwrite_mode (GTK_TEXT (priv->text), overwrite); + gtk_text_set_overwrite_mode (priv->text, overwrite); } /** @@ -2080,7 +2080,7 @@ gtk_entry_get_overwrite_mode (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), FALSE); - return gtk_text_get_overwrite_mode (GTK_TEXT (priv->text)); + return gtk_text_get_overwrite_mode (priv->text); } @@ -2107,7 +2107,7 @@ gtk_entry_set_max_length (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_max_length (GTK_TEXT (priv->text), max); + gtk_text_set_max_length (priv->text, max); } /** @@ -2130,7 +2130,7 @@ gtk_entry_get_max_length (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), 0); - return gtk_text_get_max_length (GTK_TEXT (priv->text)); + return gtk_text_get_max_length (priv->text); } /** @@ -2154,7 +2154,7 @@ gtk_entry_get_text_length (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), 0); - return gtk_text_get_text_length (GTK_TEXT (priv->text)); + return gtk_text_get_text_length (priv->text); } /** @@ -2175,7 +2175,7 @@ gtk_entry_set_activates_default (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_activates_default (GTK_TEXT (priv->text), setting); + gtk_text_set_activates_default (priv->text, setting); } /** @@ -2193,7 +2193,7 @@ gtk_entry_get_activates_default (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), FALSE); - return gtk_text_get_activates_default (GTK_TEXT (priv->text)); + return gtk_text_get_activates_default (priv->text); } /** @@ -2313,7 +2313,7 @@ gtk_entry_set_icon_from_paintable (GtkEntry *entry, { g_object_ref (paintable); - gtk_image_set_from_paintable (GTK_IMAGE (icon_info->widget), paintable); + gtk_image_set_from_paintable (icon_info->widget, paintable); if (icon_pos == GTK_ENTRY_ICON_PRIMARY) { @@ -2370,7 +2370,7 @@ gtk_entry_set_icon_from_icon_name (GtkEntry *entry, if (icon_name != NULL) { - gtk_image_set_from_icon_name (GTK_IMAGE (icon_info->widget), icon_name); + gtk_image_set_from_icon_name (icon_info->widget, icon_name); if (icon_pos == GTK_ENTRY_ICON_PRIMARY) { @@ -2423,7 +2423,7 @@ gtk_entry_set_icon_from_gicon (GtkEntry *entry, if (icon) { - gtk_image_set_from_gicon (GTK_IMAGE (icon_info->widget), icon); + gtk_image_set_from_gicon (icon_info->widget, icon); if (icon_pos == GTK_ENTRY_ICON_PRIMARY) { @@ -2531,7 +2531,7 @@ gtk_entry_get_icon_paintable (GtkEntry *entry, if (!icon_info) return NULL; - return gtk_image_get_paintable (GTK_IMAGE (icon_info->widget)); + return gtk_image_get_paintable (icon_info->widget); } /** @@ -2561,7 +2561,7 @@ gtk_entry_get_icon_gicon (GtkEntry *entry, if (!icon_info) return NULL; - return gtk_image_get_gicon (GTK_IMAGE (icon_info->widget)); + return gtk_image_get_gicon (icon_info->widget); } /** @@ -2591,7 +2591,7 @@ gtk_entry_get_icon_name (GtkEntry *entry, if (!icon_info) return NULL; - return gtk_image_get_icon_name (GTK_IMAGE (icon_info->widget)); + return gtk_image_get_icon_name (icon_info->widget); } /** @@ -2617,9 +2617,9 @@ gtk_entry_set_icon_sensitive (GtkEntry *entry, if ((icon_info = priv->icons[icon_pos]) == NULL) icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos); - if (gtk_widget_get_sensitive (icon_info->widget) != sensitive) + if (gtk_widget_get_sensitive (GTK_WIDGET (icon_info->widget)) != sensitive) { - gtk_widget_set_sensitive (icon_info->widget, sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (icon_info->widget), sensitive); g_object_notify_by_pspec (G_OBJECT (entry), entry_props[icon_pos == GTK_ENTRY_ICON_PRIMARY @@ -2652,7 +2652,7 @@ gtk_entry_get_icon_sensitive (GtkEntry *entry, if (!icon_info) return TRUE; /* Default of the property */ - return gtk_widget_get_sensitive (icon_info->widget); + return gtk_widget_get_sensitive (GTK_WIDGET (icon_info->widget)); } /** @@ -2681,7 +2681,7 @@ gtk_entry_get_icon_storage_type (GtkEntry *entry, if (!icon_info) return GTK_IMAGE_EMPTY; - return gtk_image_get_storage_type (GTK_IMAGE (icon_info->widget)); + return gtk_image_get_storage_type (icon_info->widget); } /** @@ -2716,10 +2716,10 @@ gtk_entry_get_icon_at_pos (GtkEntry *entry, if (icon_info == NULL) continue; - gtk_widget_translate_coordinates (GTK_WIDGET (entry), icon_info->widget, + gtk_widget_translate_coordinates (GTK_WIDGET (entry), GTK_WIDGET (icon_info->widget), x, y, &icon_x, &icon_y); - if (gtk_widget_contains (icon_info->widget, icon_x, icon_y)) + if (gtk_widget_contains (GTK_WIDGET (icon_info->widget), icon_x, icon_y)) return i; } @@ -2829,7 +2829,7 @@ gtk_entry_get_icon_area (GtkEntry *entry, icon_info = priv->icons[icon_pos]; if (icon_info && - gtk_widget_compute_bounds (icon_info->widget, GTK_WIDGET (entry), &r)) + gtk_widget_compute_bounds (GTK_WIDGET (icon_info->widget), GTK_WIDGET (entry), &r)) { *icon_area = (GdkRectangle){ floorf (r.origin.x), @@ -3300,7 +3300,7 @@ gtk_entry_set_placeholder_text (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_placeholder_text (GTK_TEXT (priv->text), text); + gtk_text_set_placeholder_text (priv->text, text); } /** @@ -3321,7 +3321,7 @@ gtk_entry_get_placeholder_text (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL); - return gtk_text_get_placeholder_text (GTK_TEXT (priv->text)); + return gtk_text_get_placeholder_text (priv->text); } /** @@ -3342,7 +3342,7 @@ gtk_entry_set_input_purpose (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_input_purpose (GTK_TEXT (priv->text), purpose); + gtk_text_set_input_purpose (priv->text, purpose); } /** @@ -3358,7 +3358,7 @@ gtk_entry_get_input_purpose (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), GTK_INPUT_PURPOSE_FREE_FORM); - return gtk_text_get_input_purpose (GTK_TEXT (priv->text)); + return gtk_text_get_input_purpose (priv->text); } /** @@ -3378,7 +3378,7 @@ gtk_entry_set_input_hints (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_input_hints (GTK_TEXT (priv->text), hints); + gtk_text_set_input_hints (priv->text, hints); } /** @@ -3394,7 +3394,7 @@ gtk_entry_get_input_hints (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), GTK_INPUT_HINT_NONE); - return gtk_text_get_input_hints (GTK_TEXT (priv->text)); + return gtk_text_get_input_hints (priv->text); } /** @@ -3413,7 +3413,7 @@ gtk_entry_set_attributes (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_attributes (GTK_TEXT (priv->text), attrs); + gtk_text_set_attributes (priv->text, attrs); } /** @@ -3433,7 +3433,7 @@ gtk_entry_get_attributes (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL); - return gtk_text_get_attributes (GTK_TEXT (priv->text)); + return gtk_text_get_attributes (priv->text); } /** @@ -3453,7 +3453,7 @@ gtk_entry_set_tabs (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_tabs (GTK_TEXT (priv->text), tabs); + gtk_text_set_tabs (priv->text, tabs); } /** @@ -3473,7 +3473,7 @@ gtk_entry_get_tabs (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL); - return gtk_text_get_tabs (GTK_TEXT (priv->text)); + return gtk_text_get_tabs (priv->text); } static void @@ -3544,7 +3544,7 @@ gtk_entry_get_key_controller (GtkEntry *entry) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); - return gtk_text_get_key_controller (GTK_TEXT (priv->text)); + return gtk_text_get_key_controller (priv->text); } GtkText * @@ -3552,7 +3552,7 @@ gtk_entry_get_text_widget (GtkEntry *entry) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); - return GTK_TEXT (priv->text); + return priv->text; } /** @@ -3571,7 +3571,7 @@ gtk_entry_set_extra_menu (GtkEntry *entry, g_return_if_fail (GTK_IS_ENTRY (entry)); - gtk_text_set_extra_menu (GTK_TEXT (priv->text), model); + gtk_text_set_extra_menu (priv->text, model); g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_EXTRA_MENU]); } @@ -3591,5 +3591,5 @@ gtk_entry_get_extra_menu (GtkEntry *entry) g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL); - return gtk_text_get_extra_menu (GTK_TEXT (priv->text)); + return gtk_text_get_extra_menu (priv->text); } diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index 66571c4cc1af7a1ecf156703fa750e500c908905..bf4dbf0a0fb0d18935f2e068ca630122b5a7f822 100644 --- a/gtk/gtkentry.h +++ b/gtk/gtkentry.h @@ -121,9 +121,9 @@ struct _GtkEntryClass GDK_AVAILABLE_IN_ALL GType gtk_entry_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_entry_new (void); +GtkEntry* gtk_entry_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_entry_new_with_buffer (GtkEntryBuffer *buffer); +GtkEntry* gtk_entry_new_with_buffer (GtkEntryBuffer *buffer); GDK_AVAILABLE_IN_ALL GtkEntryBuffer* gtk_entry_get_buffer (GtkEntry *entry); diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index f1a38acc487b17531a0953bb9a6f457b2c7f7a97..03093528cb7e126d07b5eb9fcffaf0c08cb0eec6 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -65,7 +65,7 @@ * static void * create_expander (void) * { - * GtkWidget *expander = gtk_expander_new_with_mnemonic ("_More Options"); + * GtkExpander *expander = gtk_expander_new_with_mnemonic ("_More Options"); * g_signal_connect (expander, "notify::expanded", * G_CALLBACK (expander_callback), NULL); * @@ -870,7 +870,7 @@ gtk_expander_measure (GtkWidget *widget, * * Returns: a new #GtkExpander widget. */ -GtkWidget * +GtkExpander * gtk_expander_new (const gchar *label) { return g_object_new (GTK_TYPE_EXPANDER, "label", label, NULL); @@ -890,7 +890,7 @@ gtk_expander_new (const gchar *label) * * Returns: a new #GtkExpander widget. */ -GtkWidget * +GtkExpander * gtk_expander_new_with_mnemonic (const gchar *label) { return g_object_new (GTK_TYPE_EXPANDER, @@ -993,14 +993,14 @@ gtk_expander_set_label (GtkExpander *expander, } else { - GtkWidget *child; + GtkLabel *child; child = gtk_label_new (label); - gtk_label_set_use_underline (GTK_LABEL (child), priv->use_underline); - gtk_label_set_use_markup (GTK_LABEL (child), priv->use_markup); - gtk_widget_show (child); + gtk_label_set_use_underline (child, priv->use_underline); + gtk_label_set_use_markup (child, priv->use_markup); + gtk_widget_show (GTK_WIDGET (child)); - gtk_expander_set_label_widget (expander, child); + gtk_expander_set_label_widget (expander, GTK_WIDGET (child)); } g_object_notify (G_OBJECT (expander), "label"); diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h index 0970ed74e70143209cbfd2e86f76fc68a003d402..dad4d839e1d099063d4b9c6cabadad223510f5b4 100644 --- a/gtk/gtkexpander.h +++ b/gtk/gtkexpander.h @@ -40,9 +40,9 @@ GDK_AVAILABLE_IN_ALL GType gtk_expander_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_expander_new (const gchar *label); +GtkExpander *gtk_expander_new (const gchar *label); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_expander_new_with_mnemonic (const gchar *label); +GtkExpander *gtk_expander_new_with_mnemonic (const gchar *label); GDK_AVAILABLE_IN_ALL void gtk_expander_set_expanded (GtkExpander *expander, diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index b858f8325194b94eddd75e8bb87c16baa4eb61a5..c3cf6b4cf6135548fff99958bf60c7c29f264b56 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -141,13 +141,13 @@ * An example for adding extra widgets: * |[ * - * GtkWidget *toggle; + * GtkCheckButton *toggle; * * ... * * toggle = gtk_check_button_new_with_label ("Open file read-only"); - * gtk_widget_show (toggle); - * gtk_file_chooser_set_extra_widget (my_file_chooser, toggle); + * gtk_widget_show (GTK_WIDGET (toggle)); + * gtk_file_chooser_set_extra_widget (my_file_chooser, GTK_WIDGET (toggle)); * } * ]| * @@ -351,10 +351,10 @@ gtk_file_chooser_default_init (GtkFileChooserInterface *iface) * g_signal_connect (chooser, "confirm-overwrite", * G_CALLBACK (confirm_overwrite_callback), NULL); * - * if (gtk_dialog_run (chooser) == GTK_RESPONSE_ACCEPT) + * if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT) * save_to_file (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser)); * - * gtk_widget_destroy (chooser); + * gtk_widget_destroy (GTK_WIDGET (chooser)); * ]| * * Returns: a #GtkFileChooserConfirmation value that indicates which diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 00bacca83f3b588d1ec6ee1c54783d4692ddc76c..256f796a0ac00e6b9861fc8943e846e214feedea 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -79,7 +79,7 @@ * * |[ * { - * GtkWidget *button; + * GtkFileChooserButton *button; * * button = gtk_file_chooser_button_new (_("Select a file"), * GTK_FILE_CHOOSER_ACTION_OPEN); @@ -191,9 +191,9 @@ typedef struct GtkFileChooserNative *native; /* Otherwise this is set */ GtkWidget *box; GtkWidget *button; - GtkWidget *image; - GtkWidget *label; - GtkWidget *combo_box; + GtkImage *image; + GtkLabel *label; + GtkComboBox *combo_box; GtkCellRenderer *icon_cell; GtkCellRenderer *name_cell; @@ -443,7 +443,7 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button) { GtkFileChooserButtonPrivate *priv = gtk_file_chooser_button_get_instance_private (button); GtkWidget *box; - GtkWidget *icon; + GtkImage *icon; GdkContentFormatsBuilder *builder; GdkContentFormats *target_list; GtkDropTarget *dest; @@ -452,16 +452,16 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button) g_signal_connect (priv->button, "clicked", G_CALLBACK (button_clicked_cb), button); priv->image = gtk_image_new (); priv->label = gtk_label_new (_(FALLBACK_DISPLAY_NAME)); - gtk_label_set_xalign (GTK_LABEL (priv->label), 0.0f); - gtk_widget_set_hexpand (priv->label, TRUE); + gtk_label_set_xalign (priv->label, 0.0f); + gtk_widget_set_hexpand (GTK_WIDGET (priv->label), TRUE); icon = gtk_image_new_from_icon_name ("document-open-symbolic"); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_widget_set_valign (priv->image, GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (box), priv->image); - gtk_widget_set_valign (priv->label, GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (box), priv->label); - gtk_widget_set_valign (icon, GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (box), icon); + gtk_widget_set_valign (GTK_WIDGET (priv->image), GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (priv->image)); + gtk_widget_set_valign (GTK_WIDGET (priv->label), GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (priv->label)); + gtk_widget_set_valign (GTK_WIDGET (icon), GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (icon)); gtk_container_add (GTK_CONTAINER (priv->button), box); gtk_widget_set_parent (priv->button, GTK_WIDGET (button)); @@ -488,8 +488,8 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button) gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->combo_box), priv->name_cell, "text", DISPLAY_NAME_COLUMN, NULL); - gtk_widget_hide (priv->combo_box); - gtk_widget_set_parent (priv->combo_box, GTK_WIDGET (button)); + gtk_widget_hide (GTK_WIDGET (priv->combo_box)); + gtk_widget_set_parent (GTK_WIDGET (priv->combo_box), GTK_WIDGET (button)); /* Bookmarks manager */ priv->bookmarks_manager = _gtk_bookmarks_manager_new (bookmarks_changed_cb, button); @@ -838,8 +838,8 @@ gtk_file_chooser_button_constructed (GObject *object) filter_model_visible_func, object, NULL); - gtk_combo_box_set_model (GTK_COMBO_BOX (priv->combo_box), priv->filter_model); - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (priv->combo_box), + gtk_combo_box_set_model (priv->combo_box, priv->filter_model); + gtk_combo_box_set_row_separator_func (priv->combo_box, combo_box_row_separator_func, NULL, NULL); @@ -905,12 +905,12 @@ gtk_file_chooser_button_set_property (GObject *object, switch (g_value_get_enum (value)) { case GTK_FILE_CHOOSER_ACTION_OPEN: - gtk_widget_hide (priv->combo_box); + gtk_widget_hide (GTK_WIDGET (priv->combo_box)); gtk_widget_show (priv->button); gtk_widget_queue_resize (GTK_WIDGET (button)); break; case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: - gtk_widget_show (priv->combo_box); + gtk_widget_show (GTK_WIDGET (priv->combo_box)); gtk_widget_hide (priv->button); gtk_widget_queue_resize (GTK_WIDGET (button)); break; @@ -961,7 +961,7 @@ gtk_file_chooser_button_get_property (GObject *object, { case PROP_WIDTH_CHARS: g_value_set_int (value, - gtk_label_get_width_chars (GTK_LABEL (priv->label))); + gtk_label_get_width_chars (priv->label)); break; case PROP_TITLE: @@ -995,7 +995,7 @@ gtk_file_chooser_button_finalize (GObject *object) g_clear_object (&priv->current_folder_while_inactive); gtk_widget_unparent (priv->button); - gtk_widget_unparent (priv->combo_box); + gtk_widget_unparent (GTK_WIDGET (priv->combo_box)); G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize (object); } @@ -1014,12 +1014,12 @@ gtk_file_chooser_button_state_flags_changed (GtkWidget *widget, if (gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_DROP_ACTIVE) { gtk_widget_set_state_flags (priv->button, GTK_STATE_FLAG_DROP_ACTIVE, FALSE); - gtk_widget_set_state_flags (priv->combo_box, GTK_STATE_FLAG_DROP_ACTIVE, FALSE); + gtk_widget_set_state_flags (GTK_WIDGET (priv->combo_box), GTK_STATE_FLAG_DROP_ACTIVE, FALSE); } else { gtk_widget_unset_state_flags (priv->button, GTK_STATE_FLAG_DROP_ACTIVE); - gtk_widget_unset_state_flags (priv->combo_box, GTK_STATE_FLAG_DROP_ACTIVE); + gtk_widget_unset_state_flags (GTK_WIDGET (priv->combo_box), GTK_STATE_FLAG_DROP_ACTIVE); } GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->state_flags_changed (widget, previous_state); @@ -1283,7 +1283,7 @@ gtk_file_chooser_button_mnemonic_activate (GtkWidget *widget, gtk_widget_grab_focus (priv->button); break; case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: - return gtk_widget_mnemonic_activate (priv->combo_box, group_cycling); + return gtk_widget_mnemonic_activate (GTK_WIDGET (priv->combo_box), group_cycling); break; case GTK_FILE_CHOOSER_ACTION_SAVE: case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER: @@ -2262,7 +2262,7 @@ select_combo_box_row_no_notify (GtkFileChooserButton *button, int pos) &filter_iter, &iter); g_signal_handlers_block_by_func (priv->combo_box, combo_box_changed_cb, button); - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combo_box), &filter_iter); + gtk_combo_box_set_active_iter (priv->combo_box, &filter_iter); g_signal_handlers_unblock_by_func (priv->combo_box, combo_box_changed_cb, button); } @@ -2321,7 +2321,7 @@ update_combo_box (GtkFileChooserButton *button) if (row_found) { g_signal_handlers_block_by_func (priv->combo_box, combo_box_changed_cb, button); - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combo_box), + gtk_combo_box_set_active_iter (priv->combo_box, &iter); g_signal_handlers_unblock_by_func (priv->combo_box, combo_box_changed_cb, button); } @@ -2374,11 +2374,11 @@ update_label_get_info_cb (GCancellable *cancellable, if (cancelled || error) goto out; - gtk_label_set_text (GTK_LABEL (priv->label), g_file_info_get_display_name (info)); + gtk_label_set_text (priv->label, g_file_info_get_display_name (info)); icon = _gtk_file_info_get_icon (info, ICON_SIZE, gtk_widget_get_scale_factor (GTK_WIDGET (button))); - gtk_image_set_from_gicon (GTK_IMAGE (priv->image), icon); - gtk_image_set_pixel_size (GTK_IMAGE (priv->image), ICON_SIZE); + gtk_image_set_from_gicon (priv->image, icon); + gtk_image_set_pixel_size (priv->image, ICON_SIZE); if (icon) g_object_unref (icon); @@ -2424,8 +2424,8 @@ update_label_and_image (GtkFileChooserButton *button) label_text = _gtk_file_system_volume_get_display_name (volume); icon = _gtk_file_system_volume_get_icon (volume); - gtk_image_set_from_gicon (GTK_IMAGE (priv->image), icon); - gtk_image_set_pixel_size (GTK_IMAGE (priv->image), ICON_SIZE); + gtk_image_set_from_gicon (priv->image, icon); + gtk_image_set_pixel_size (priv->image, ICON_SIZE); if (icon) g_object_unref (icon); } @@ -2456,8 +2456,8 @@ update_label_and_image (GtkFileChooserButton *button) label_text = _gtk_bookmarks_manager_get_bookmark_label (priv->bookmarks_manager, file); icon = g_themed_icon_new ("text-x-generic"); - gtk_image_set_from_gicon (GTK_IMAGE (priv->image), icon); - gtk_image_set_pixel_size (GTK_IMAGE (priv->image), ICON_SIZE); + gtk_image_set_from_gicon (priv->image, icon); + gtk_image_set_pixel_size (priv->image, ICON_SIZE); if (icon) g_object_unref (icon); @@ -2477,13 +2477,13 @@ out: if (label_text) { - gtk_label_set_text (GTK_LABEL (priv->label), label_text); + gtk_label_set_text (priv->label, label_text); g_free (label_text); } else { - gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME)); - gtk_image_set_from_gicon (GTK_IMAGE (priv->image), NULL); + gtk_label_set_text (priv->label, _(FALLBACK_DISPLAY_NAME)); + gtk_image_set_from_gicon (priv->image, NULL); } if (done_changing_selection) @@ -2628,7 +2628,7 @@ open_dialog (GtkFileChooserButton *button) } } - gtk_widget_set_sensitive (priv->combo_box, FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (priv->combo_box), FALSE); if (priv->dialog) { G_GNUC_BEGIN_IGNORE_DEPRECATIONS @@ -2792,7 +2792,7 @@ common_response_cb (GtkFileChooserButton *button, update_label_and_image (button); update_combo_box (button); - gtk_widget_set_sensitive (priv->combo_box, TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (priv->combo_box), TRUE); } @@ -2843,7 +2843,7 @@ native_response_cb (GtkFileChooserNative *native, * * Returns: a new button widget. */ -GtkWidget * +GtkFileChooserButton * gtk_file_chooser_button_new (const gchar *title, GtkFileChooserAction action) { @@ -2873,7 +2873,7 @@ gtk_file_chooser_button_new (const gchar *title, * * Returns: a new button widget. */ -GtkWidget * +GtkFileChooserButton * gtk_file_chooser_button_new_with_dialog (GtkWidget *dialog) { g_return_val_if_fail (GTK_IS_FILE_CHOOSER (dialog) && GTK_IS_DIALOG (dialog), NULL); @@ -2942,7 +2942,7 @@ gtk_file_chooser_button_get_width_chars (GtkFileChooserButton *button) g_return_val_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (button), -1); - return gtk_label_get_width_chars (GTK_LABEL (priv->label)); + return gtk_label_get_width_chars (priv->label); } /** @@ -2960,6 +2960,6 @@ gtk_file_chooser_button_set_width_chars (GtkFileChooserButton *button, g_return_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (button)); - gtk_label_set_width_chars (GTK_LABEL (priv->label), n_chars); + gtk_label_set_width_chars (priv->label, n_chars); g_object_notify (G_OBJECT (button), "width-chars"); } diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h index 0d41d41f74da4e590f2c975dc855b28f2d8432c3..c8418907d00d16c520b1b78850ca5a08600c0167 100644 --- a/gtk/gtkfilechooserbutton.h +++ b/gtk/gtkfilechooserbutton.h @@ -35,22 +35,22 @@ G_BEGIN_DECLS typedef struct _GtkFileChooserButton GtkFileChooserButton; GDK_AVAILABLE_IN_ALL -GType gtk_file_chooser_button_get_type (void) G_GNUC_CONST; +GType gtk_file_chooser_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_file_chooser_button_new (const gchar *title, - GtkFileChooserAction action); +GtkFileChooserButton * gtk_file_chooser_button_new (const gchar *title, + GtkFileChooserAction action); GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_file_chooser_button_new_with_dialog (GtkWidget *dialog); +GtkFileChooserButton * gtk_file_chooser_button_new_with_dialog (GtkWidget *dialog); GDK_AVAILABLE_IN_ALL -const gchar * gtk_file_chooser_button_get_title (GtkFileChooserButton *button); +const gchar * gtk_file_chooser_button_get_title (GtkFileChooserButton *button); GDK_AVAILABLE_IN_ALL -void gtk_file_chooser_button_set_title (GtkFileChooserButton *button, - const gchar *title); +void gtk_file_chooser_button_set_title (GtkFileChooserButton *button, + const gchar *title); GDK_AVAILABLE_IN_ALL -gint gtk_file_chooser_button_get_width_chars (GtkFileChooserButton *button); +gint gtk_file_chooser_button_get_width_chars (GtkFileChooserButton *button); GDK_AVAILABLE_IN_ALL -void gtk_file_chooser_button_set_width_chars (GtkFileChooserButton *button, - gint n_chars); +void gtk_file_chooser_button_set_width_chars (GtkFileChooserButton *button, + gint n_chars); G_END_DECLS diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index 2ce649e2588ad480064a907db352d332322b9bed..9dfe3cee71aaf94077275330de234c5c959cb1de 100644 --- a/gtk/gtkfilechooserdialog.c +++ b/gtk/gtkfilechooserdialog.c @@ -69,7 +69,7 @@ * #GtkFileChooserDialog to select a file for opening: * * |[ - * GtkWidget *dialog; + * GtkFileChooserDialog *dialog; * GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN; * gint res; * @@ -92,13 +92,13 @@ * g_free (filename); * } * - * gtk_widget_destroy (dialog); + * gtk_widget_destroy (GTK_WIDGET (dialog)); * ]| * * To use a dialog for saving, you can use this: * * |[ - * GtkWidget *dialog; + * GtkFileChooserDialog *dialog; * GtkFileChooser *chooser; * GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SAVE; * gint res; @@ -132,7 +132,7 @@ * g_free (filename); * } * - * gtk_widget_destroy (dialog); + * gtk_widget_destroy (GTK_WIDGET (dialog)); * ]| * * ## Setting up a file chooser dialog ## {#gtkfilechooserdialog-setting-up} @@ -168,7 +168,7 @@ * could call gtk_file_chooser_dialog_new() as follows: * * |[ - * GtkWidget *dialog; + * GtkFileChooserDialog *dialog; * GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN; * * dialog = gtk_file_chooser_dialog_new ("Open File", @@ -480,17 +480,17 @@ setup_search (GtkFileChooserDialog *dialog) g_object_get (dialog, "use-header-bar", &use_header, NULL); if (use_header) { - GtkWidget *button; + GtkToggleButton *button; GtkWidget *header; button = gtk_toggle_button_new (); - gtk_widget_set_focus_on_click (button, FALSE); - gtk_widget_set_valign (button, GTK_ALIGN_CENTER); + gtk_widget_set_focus_on_click (GTK_WIDGET (button), FALSE); + gtk_widget_set_valign (GTK_WIDGET (button), GTK_ALIGN_CENTER); gtk_button_set_icon_name (GTK_BUTTON (button), "edit-find-symbolic"); - gtk_widget_show (button); + gtk_widget_show (GTK_WIDGET (button)); header = gtk_dialog_get_header_bar (GTK_DIALOG (dialog)); - gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button); + gtk_header_bar_pack_end (GTK_HEADER_BAR (header), GTK_WIDGET (button)); g_object_bind_property (button, "active", priv->widget, "search-mode", @@ -528,7 +528,7 @@ setup_save_entry (GtkFileChooserDialog *dialog) if (need_entry && !priv->has_entry) { GtkWidget *box; - GtkWidget *label; + GtkLabel *label; GtkWidget *entry; box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); @@ -536,9 +536,9 @@ setup_save_entry (GtkFileChooserDialog *dialog) entry = _gtk_file_chooser_entry_new (FALSE, FALSE); g_object_set (label, "margin-start", 6, "margin-end", 6, NULL); g_object_set (entry, "margin-start", 6, "margin-end", 6, NULL); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); - gtk_container_add (GTK_CONTAINER (box), label); - gtk_container_add (GTK_CONTAINER (box), entry); + gtk_label_set_mnemonic_widget (label, entry); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (entry)); gtk_header_bar_set_custom_title (GTK_HEADER_BAR (header), box); gtk_file_chooser_widget_set_save_entry (GTK_FILE_CHOOSER_WIDGET (priv->widget), entry); @@ -644,14 +644,14 @@ response_cb (GtkDialog *dialog, priv->response_requested = FALSE; } -static GtkWidget * +static GtkFileChooserDialog * gtk_file_chooser_dialog_new_valist (const gchar *title, GtkWindow *parent, GtkFileChooserAction action, const gchar *first_button_text, va_list varargs) { - GtkWidget *result; + GtkFileChooserDialog *result; const char *button_text = first_button_text; gint response_id; @@ -686,14 +686,14 @@ gtk_file_chooser_dialog_new_valist (const gchar *title, * * Returns: a new #GtkFileChooserDialog **/ -GtkWidget * +GtkFileChooserDialog * gtk_file_chooser_dialog_new (const gchar *title, GtkWindow *parent, GtkFileChooserAction action, const gchar *first_button_text, ...) { - GtkWidget *result; + GtkFileChooserDialog *result; va_list varargs; va_start (varargs, first_button_text); diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h index 4c42ff35b792db8319560713541c3919a5fd390f..714c293882c9ff996dda722f51ad5fbf5f538a4b 100644 --- a/gtk/gtkfilechooserdialog.h +++ b/gtk/gtkfilechooserdialog.h @@ -35,13 +35,13 @@ G_BEGIN_DECLS typedef struct _GtkFileChooserDialog GtkFileChooserDialog; GDK_AVAILABLE_IN_ALL -GType gtk_file_chooser_dialog_get_type (void) G_GNUC_CONST; +GType gtk_file_chooser_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_file_chooser_dialog_new (const gchar *title, - GtkWindow *parent, - GtkFileChooserAction action, - const gchar *first_button_text, - ...) G_GNUC_NULL_TERMINATED; +GtkFileChooserDialog *gtk_file_chooser_dialog_new (const gchar *title, + GtkWindow *parent, + GtkFileChooserAction action, + const gchar *first_button_text, + ...) G_GNUC_NULL_TERMINATED; G_END_DECLS diff --git a/gtk/gtkfilechoosererrorstack.c b/gtk/gtkfilechoosererrorstack.c index f15615c2b37c2a2aecae21318ccff76edb86465d..9d5ea9a8e14d2e629d619659e06c69221d12c8a2 100644 --- a/gtk/gtkfilechoosererrorstack.c +++ b/gtk/gtkfilechoosererrorstack.c @@ -40,7 +40,7 @@ gtk_file_chooser_error_stack_class_init (GtkFileChooserErrorStackClass *class) static void gtk_file_chooser_error_stack_init (GtkFileChooserErrorStack *self) { - GtkWidget *label; + GtkLabel *label; GtkStack *stack; self->stack = gtk_stack_new (); @@ -51,68 +51,68 @@ gtk_file_chooser_error_stack_init (GtkFileChooserErrorStack *self) gtk_stack_set_transition_duration (stack, 50); label = gtk_label_new (""); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "no-error"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "no-error"); label = gtk_label_new (""); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "custom"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "custom"); label = gtk_label_new (_("A folder cannot be called “.”")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "folder-cannot-be-called-dot"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "folder-cannot-be-called-dot"); label = gtk_label_new (_("A file cannot be called “.”")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "file-cannot-be-called-dot"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "file-cannot-be-called-dot"); label = gtk_label_new (_("A folder cannot be called “..”")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "folder-cannot-be-called-dot-dot"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "folder-cannot-be-called-dot-dot"); label = gtk_label_new (_("A file cannot be called “..”")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "file-cannot-be-called-dot-dot"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "file-cannot-be-called-dot-dot"); label = gtk_label_new (_("Folder names cannot contain “/”")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "folder-name-cannot-contain-slash"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "folder-name-cannot-contain-slash"); label = gtk_label_new (_("File names cannot contain “/”")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "file-name-cannot-contain-slash"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "file-name-cannot-contain-slash"); label = gtk_label_new (_("Folder names should not begin with a space")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "folder-name-should-not-begin-with-space"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "folder-name-should-not-begin-with-space"); label = gtk_label_new (_("File names should not begin with a space")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "file-name-should-not-begin-with-space"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "file-name-should-not-begin-with-space"); label = gtk_label_new (_("Folder names should not end with a space")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "folder-name-should-not-end-with-space"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "folder-name-should-not-end-with-space"); label = gtk_label_new (_("File names should not end with a space")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "file-name-should-not-end-with-space"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "file-name-should-not-end-with-space"); label = gtk_label_new (_("Folder names starting with a “.” are hidden")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "folder-name-with-dot-is-hidden"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "folder-name-with-dot-is-hidden"); label = gtk_label_new (_("File names starting with a “.” are hidden")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "file-name-with-dot-is-hidden"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "file-name-with-dot-is-hidden"); label = gtk_label_new (_("A folder with that name already exists")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "folder-name-already-exists"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "folder-name-already-exists"); label = gtk_label_new (_("A file with that name already exists")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_stack_add_named (stack, label, "file-name-already-exists"); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_stack_add_named (stack, GTK_WIDGET (label), "file-name-already-exists"); gtk_stack_set_visible_child_name (stack, "no-error"); } diff --git a/gtk/gtkfilechoosernativeportal.c b/gtk/gtkfilechoosernativeportal.c index 3fa5145f7c663c92e935367620f719e3c5df2f8b..91cd3ac0cf266dabda77d379286305385ca43db7 100644 --- a/gtk/gtkfilechoosernativeportal.c +++ b/gtk/gtkfilechoosernativeportal.c @@ -46,7 +46,7 @@ typedef struct { GtkFileChooserNative *self; - GtkWidget *grab_widget; + GtkLabel *grab_widget; GDBusConnection *connection; char *portal_handle; @@ -72,8 +72,8 @@ filechooser_portal_data_free (FilechooserPortalData *data) if (data->grab_widget) { - gtk_grab_remove (data->grab_widget); - gtk_widget_destroy (data->grab_widget); + gtk_grab_remove (GTK_WIDGET (data->grab_widget)); + gtk_widget_destroy (GTK_WIDGET (data->grab_widget)); } g_clear_object (&data->self); diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 4aecc911c7d2d38c962c42e90203c1ce487b4537..36c72f4264ad36301bfca5d669eab531c97ca545 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -297,9 +297,9 @@ struct _GtkFileChooserWidgetPrivate { GtkWidget *extra_and_filters; GtkWidget *filter_combo_hbox; - GtkWidget *filter_combo; + GtkComboBoxText *filter_combo; GtkWidget *preview_box; - GtkWidget *preview_label; + GtkLabel *preview_label; GtkWidget *preview_widget; GtkWidget *extra_align; GtkWidget *extra_widget; @@ -962,15 +962,15 @@ update_preview_widget_visibility (GtkFileChooserWidget *impl) if (!priv->preview_label) { priv->preview_label = gtk_label_new (priv->preview_display_name); - gtk_box_insert_child_after (GTK_BOX (priv->preview_box), priv->preview_label, NULL); - gtk_label_set_ellipsize (GTK_LABEL (priv->preview_label), PANGO_ELLIPSIZE_MIDDLE); + gtk_box_insert_child_after (GTK_BOX (priv->preview_box), GTK_WIDGET (priv->preview_label), NULL); + gtk_label_set_ellipsize (priv->preview_label, PANGO_ELLIPSIZE_MIDDLE); } } else { if (priv->preview_label) { - gtk_widget_destroy (priv->preview_label); + gtk_widget_destroy (GTK_WIDGET (priv->preview_label)); priv->preview_label = NULL; } } @@ -2590,7 +2590,7 @@ save_widgets_create (GtkFileChooserWidget *impl) { GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl); GtkWidget *vbox; - GtkWidget *widget; + GtkLabel *widget; if (priv->save_widgets != NULL || (priv->external_entry && priv->location_entry == priv->external_entry)) @@ -2623,9 +2623,9 @@ save_widgets_create (GtkFileChooserWidget *impl) /* Label */ widget = gtk_label_new_with_mnemonic (_("_Name:")); - gtk_widget_set_halign (widget, GTK_ALIGN_START); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - gtk_grid_attach (GTK_GRID (priv->save_widgets_table), widget, 0, 0, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (widget), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (widget), GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (priv->save_widgets_table), GTK_WIDGET (widget), 0, 0, 1, 1); /* Location entry */ @@ -3043,7 +3043,7 @@ operation_mode_set_enter_location (GtkFileChooserWidget *impl) gtk_stack_set_visible_child_name (GTK_STACK (priv->browse_header_stack), "location"); gtk_revealer_set_reveal_child (GTK_REVEALER (priv->browse_header_revealer), TRUE); location_bar_update (impl); - gtk_widget_set_sensitive (priv->filter_combo, TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (priv->filter_combo), TRUE); location_mode_set (impl, LOCATION_MODE_FILENAME_ENTRY); } @@ -3065,7 +3065,7 @@ operation_mode_set_browse (GtkFileChooserWidget *impl) gtk_revealer_set_transition_type (GTK_REVEALER (priv->browse_header_revealer), old_revealer_transition_type); - gtk_widget_set_sensitive (priv->filter_combo, TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (priv->filter_combo), TRUE); g_object_notify (G_OBJECT (impl), "subtitle"); } @@ -3090,7 +3090,7 @@ operation_mode_set_search (GtkFileChooserWidget *impl) gtk_revealer_set_reveal_child (GTK_REVEALER (priv->browse_header_revealer), TRUE); location_bar_update (impl); search_setup_widgets (impl); - gtk_widget_set_sensitive (priv->filter_combo, FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (priv->filter_combo), FALSE); } static void @@ -3120,7 +3120,7 @@ operation_mode_set_recent (GtkFileChooserWidget *impl) gtk_places_sidebar_set_location (GTK_PLACES_SIDEBAR (priv->places_sidebar), file); g_object_notify (G_OBJECT (impl), "subtitle"); g_object_unref (file); - gtk_widget_set_sensitive (priv->filter_combo, TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (priv->filter_combo), TRUE); } static void @@ -3136,7 +3136,7 @@ operation_mode_set_other_locations (GtkFileChooserWidget *impl) search_stop_searching (impl, TRUE); recent_clear_model (impl, TRUE); search_clear_model (impl, TRUE); - gtk_widget_set_sensitive (priv->filter_combo, FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (priv->filter_combo), FALSE); } static void @@ -6081,7 +6081,7 @@ gtk_file_chooser_widget_add_filter (GtkFileChooser *chooser, if (!name) name = "Untitled filter"; /* Place-holder, doesn't need to be marked for translation */ - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->filter_combo), name); + gtk_combo_box_text_append_text (priv->filter_combo, name); if (!g_slist_find (priv->filters, priv->current_filter)) set_current_filter (impl, filter); @@ -8667,30 +8667,30 @@ gtk_file_chooser_widget_add_choice (GtkFileChooser *chooser, if (options) { GtkWidget *box; - GtkWidget *combo; + GtkComboBoxText *combo; int i; box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new (label))); combo = gtk_combo_box_text_new (); g_hash_table_insert (priv->choices, g_strdup (id), combo); - gtk_container_add (GTK_CONTAINER (box), combo); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo)); for (i = 0; options[i]; i++) - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), + gtk_combo_box_text_append (combo, options[i], option_labels[i]); widget = box; } else { - GtkWidget *check; + GtkCheckButton *check; check = gtk_check_button_new_with_label (label); g_hash_table_insert (priv->choices, g_strdup (id), check); - widget = check; + widget = GTK_WIDGET (check); } gtk_container_add (GTK_CONTAINER (priv->choice_box), widget); diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index 79ac0c31ed79b4f8411bc4e37eeb16f85b2a4b00..faa95a88018dfbd2d96f87a5d5bbb842c06f5359 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -86,9 +86,9 @@ typedef struct guint show_preview_entry : 1; GtkWidget *button; - GtkWidget *font_dialog; - GtkWidget *font_label; - GtkWidget *size_label; + GtkFontChooserDialog *font_dialog; + GtkLabel *font_label; + GtkLabel *size_label; GtkWidget *font_size_box; PangoFontDescription *font_desc; @@ -445,7 +445,7 @@ gtk_font_button_font_chooser_set_font_map (GtkFontChooser *chooser, if (!font_map) font_map = pango_cairo_font_map_get_default (); - context = gtk_widget_get_pango_context (priv->font_label); + context = gtk_widget_get_pango_context (GTK_WIDGET (priv->font_label)); pango_context_set_font_map (context, font_map); } } @@ -562,15 +562,15 @@ gtk_font_button_init (GtkFontButton *font_button) priv->button = gtk_button_new (); g_signal_connect (priv->button, "clicked", G_CALLBACK (gtk_font_button_clicked), font_button); priv->font_label = gtk_label_new (_("Font")); - gtk_widget_set_hexpand (priv->font_label, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (priv->font_label), TRUE); priv->size_label = gtk_label_new ("14"); priv->font_size_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_container_add (GTK_CONTAINER (box), priv->font_label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (priv->font_label)); - gtk_container_add (GTK_CONTAINER (priv->font_size_box), gtk_separator_new (GTK_ORIENTATION_VERTICAL)); - gtk_container_add (GTK_CONTAINER (priv->font_size_box), priv->size_label); + gtk_container_add (GTK_CONTAINER (priv->font_size_box), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_VERTICAL))); + gtk_container_add (GTK_CONTAINER (priv->font_size_box), GTK_WIDGET (priv->size_label)); gtk_container_add (GTK_CONTAINER (box), priv->font_size_box); gtk_container_add (GTK_CONTAINER (priv->button), box); @@ -603,7 +603,7 @@ gtk_font_button_finalize (GObject *object) GtkFontButtonPrivate *priv = gtk_font_button_get_instance_private (font_button); if (priv->font_dialog != NULL) - gtk_widget_destroy (priv->font_dialog); + gtk_widget_destroy (GTK_WIDGET (priv->font_dialog)); g_free (priv->title); @@ -952,7 +952,7 @@ gtk_font_button_clicked (GtkButton *button, G_CALLBACK (dialog_destroy), font_button); } - if (!gtk_widget_get_visible (priv->font_dialog)) + if (!gtk_widget_get_visible (GTK_WIDGET (priv->font_dialog))) { font_dialog = GTK_FONT_CHOOSER (priv->font_dialog); gtk_font_chooser_set_font_desc (font_dialog, priv->font_desc); @@ -974,7 +974,7 @@ response_cb (GtkDialog *dialog, GtkFontChooser *font_chooser; GObject *object; - gtk_widget_hide (priv->font_dialog); + gtk_widget_hide (GTK_WIDGET (priv->font_dialog)); if (response_id != GTK_RESPONSE_OK) return; @@ -1230,7 +1230,7 @@ gtk_font_button_label_use_font (GtkFontButton *font_button) GtkFontButtonPrivate *priv = gtk_font_button_get_instance_private (font_button); GtkStyleContext *context; - context = gtk_widget_get_style_context (priv->font_label); + context = gtk_widget_get_style_context (GTK_WIDGET (priv->font_label)); if (!priv->use_font) { @@ -1290,7 +1290,7 @@ gtk_font_button_update_font_info (GtkFontButton *font_button) else family_style = g_strdup (fam_name); - gtk_label_set_text (GTK_LABEL (priv->font_label), family_style); + gtk_label_set_text (priv->font_label, family_style); g_free (family_style); if ((priv->level & GTK_FONT_CHOOSER_LEVEL_SIZE) != 0) @@ -1300,7 +1300,7 @@ gtk_font_button_update_font_info (GtkFontButton *font_button) pango_font_description_get_size (priv->font_desc) / (double)PANGO_SCALE, pango_font_description_get_size_is_absolute (priv->font_desc) ? "px" : ""); - gtk_label_set_text (GTK_LABEL (priv->size_label), size); + gtk_label_set_text (priv->size_label, size); g_free (size); diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c index f3cb5e11cbfbbe19032cf6aa7e28be0419e4e12f..ff7d83318006bdd3f1327def1f79492bda4fed80 100644 --- a/gtk/gtkfontchooserdialog.c +++ b/gtk/gtkfontchooserdialog.c @@ -60,7 +60,7 @@ struct _GtkFontChooserDialogPrivate GtkWidget *select_button; GtkWidget *cancel_button; - GtkWidget *tweak_button; + GtkToggleButton *tweak_button; }; /** @@ -161,9 +161,9 @@ update_tweak_button (GtkFontChooserDialog *dialog) g_object_get (priv->fontchooser, "level", &level, NULL); if ((level & (GTK_FONT_CHOOSER_LEVEL_FEATURES | GTK_FONT_CHOOSER_LEVEL_VARIATIONS)) != 0) - gtk_widget_show (priv->tweak_button); + gtk_widget_show (GTK_WIDGET (priv->tweak_button)); else - gtk_widget_hide (priv->tweak_button); + gtk_widget_hide (GTK_WIDGET (priv->tweak_button)); } static void @@ -178,7 +178,7 @@ setup_tweak_button (GtkFontChooserDialog *dialog) g_object_get (dialog, "use-header-bar", &use_header, NULL); if (use_header) { - GtkWidget *button; + GtkToggleButton *button; GtkWidget *header; GActionGroup *actions; @@ -189,12 +189,12 @@ setup_tweak_button (GtkFontChooserDialog *dialog) button = gtk_toggle_button_new (); gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "font.tweak"); - gtk_widget_set_focus_on_click (button, FALSE); - gtk_widget_set_valign (button, GTK_ALIGN_CENTER); + gtk_widget_set_focus_on_click (GTK_WIDGET (button), FALSE); + gtk_widget_set_valign (GTK_WIDGET (button), GTK_ALIGN_CENTER); gtk_button_set_icon_name (GTK_BUTTON (button), "emblem-system-symbolic"); header = gtk_dialog_get_header_bar (GTK_DIALOG (dialog)); - gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button); + gtk_header_bar_pack_end (GTK_HEADER_BAR (header), GTK_WIDGET (button)); priv->tweak_button = button; } @@ -277,7 +277,7 @@ gtk_font_chooser_dialog_init (GtkFontChooserDialog *fontchooserdiag) * * Returns: a new #GtkFontChooserDialog */ -GtkWidget* +GtkFontChooserDialog* gtk_font_chooser_dialog_new (const gchar *title, GtkWindow *parent) { @@ -288,7 +288,7 @@ gtk_font_chooser_dialog_new (const gchar *title, "transient-for", parent, NULL); - return GTK_WIDGET (dialog); + return dialog; } static void diff --git a/gtk/gtkfontchooserdialog.h b/gtk/gtkfontchooserdialog.h index 4452dbd068c2eab890e7a39a696fe60aaf942c90..51b0f748c59af3c7cf81df2faafdfbc3f1e7b803 100644 --- a/gtk/gtkfontchooserdialog.h +++ b/gtk/gtkfontchooserdialog.h @@ -33,10 +33,10 @@ G_BEGIN_DECLS typedef struct _GtkFontChooserDialog GtkFontChooserDialog; GDK_AVAILABLE_IN_ALL -GType gtk_font_chooser_dialog_get_type (void) G_GNUC_CONST; +GType gtk_font_chooser_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_font_chooser_dialog_new (const gchar *title, - GtkWindow *parent); +GtkFontChooserDialog* gtk_font_chooser_dialog_new (const gchar *title, + GtkWindow *parent); G_END_DECLS diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index 0ad56e8318393a2986ab56dc4b85c00339492171..de08f108692a67f2927ed21a76b18ee51b2a12fe 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -117,7 +117,7 @@ struct _GtkFontChooserWidgetPrivate GtkWidget *preview; GtkWidget *preview2; - GtkWidget *font_name_label; + GtkLabel *font_name_label; gchar *preview_text; gboolean show_preview_entry; @@ -827,7 +827,7 @@ change_tweak (GSimpleAction *action, typedef struct { guint32 tag; GtkAdjustment *adjustment; - GtkWidget *label; + GtkLabel *label; GtkWidget *scale; GtkWidget *spin; GtkWidget *fontchooser; @@ -857,7 +857,7 @@ axis_remove (gpointer key, { Axis *a = value; - gtk_widget_destroy (a->label); + gtk_widget_destroy (GTK_WIDGET (a->label)); gtk_widget_destroy (a->scale); gtk_widget_destroy (a->spin); } @@ -1409,10 +1409,10 @@ gtk_font_chooser_widget_update_font_name (GtkFontChooserWidget *fontchooser, title = g_strdup (fam_name); attrs = gtk_font_chooser_widget_get_preview_attributes (fontchooser, font_desc); - gtk_label_set_attributes (GTK_LABEL (priv->font_name_label), attrs); + gtk_label_set_attributes (priv->font_name_label, attrs); pango_attr_list_unref (attrs); - gtk_label_set_label (GTK_LABEL (priv->font_name_label), title); + gtk_label_set_label (priv->font_name_label, title); g_free (title); } @@ -1582,9 +1582,9 @@ add_axis (GtkFontChooserWidget *fontchooser, axis->label = gtk_label_new (name); - gtk_widget_set_halign (axis->label, GTK_ALIGN_START); - gtk_widget_set_valign (axis->label, GTK_ALIGN_BASELINE); - gtk_grid_attach (GTK_GRID (priv->axis_grid), axis->label, 0, row, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (axis->label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (axis->label), GTK_ALIGN_BASELINE); + gtk_grid_attach (GTK_GRID (priv->axis_grid), GTK_WIDGET (axis->label), 0, row, 1, 1); axis->adjustment = gtk_adjustment_new ((double)value, (double)ax->min_value, (double)ax->max_value, @@ -1607,7 +1607,7 @@ add_axis (GtkFontChooserWidget *fontchooser, g_signal_connect (axis->adjustment, "value-changed", G_CALLBACK (adjustment_changed), axis); if (is_named_instance (hb_font) || !should_show_axis (ax)) { - gtk_widget_hide (axis->label); + gtk_widget_hide (GTK_WIDGET (axis->label)); gtk_widget_hide (axis->scale); gtk_widget_hide (axis->spin); @@ -1749,7 +1749,7 @@ typedef struct { const char *name; GtkWidget *top; GtkWidget *feat; - GtkWidget *example; + GtkLabel *example; } FeatureItem; static const char * @@ -1917,8 +1917,8 @@ update_feature_example (FeatureItem *item, attr = pango_attr_font_features_new (str); pango_attr_list_insert (attrs, attr); - gtk_label_set_text (GTK_LABEL (item->example), "0123456789"); - gtk_label_set_attributes (GTK_LABEL (item->example), attrs); + gtk_label_set_text (item->example, "0123456789"); + gtk_label_set_attributes (item->example, attrs); pango_attr_list_unref (attrs); } @@ -1968,14 +1968,14 @@ update_feature_example (FeatureItem *item, attr->end_index = attr->start_index + strlen (input); pango_attr_list_insert (attrs, attr); - gtk_label_set_text (GTK_LABEL (item->example), text); - gtk_label_set_attributes (GTK_LABEL (item->example), attrs); + gtk_label_set_text (item->example, text); + gtk_label_set_attributes (item->example, attrs); g_free (text); pango_attr_list_unref (attrs); } else - gtk_label_set_markup (GTK_LABEL (item->example), ""); + gtk_label_set_markup (item->example, ""); g_free (input); } } @@ -1986,7 +1986,7 @@ add_check_group (GtkFontChooserWidget *fontchooser, const char **tags) { GtkFontChooserWidgetPrivate *priv = gtk_font_chooser_widget_get_instance_private (fontchooser); - GtkWidget *label; + GtkLabel *label; GtkWidget *group; PangoAttrList *attrs; int i; @@ -1995,28 +1995,28 @@ add_check_group (GtkFontChooserWidget *fontchooser, gtk_widget_set_halign (group, GTK_ALIGN_FILL); label = gtk_label_new (title); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_label_set_xalign (label, 0.0); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); g_object_set (label, "margin-top", 10, "margin-bottom", 10, NULL); attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); + gtk_label_set_attributes (label, attrs); pango_attr_list_unref (attrs); - gtk_container_add (GTK_CONTAINER (group), label); + gtk_container_add (GTK_CONTAINER (group), GTK_WIDGET (label)); for (i = 0; tags[i]; i++) { hb_tag_t tag; - GtkWidget *feat; + GtkCheckButton *feat; FeatureItem *item; GtkGesture *gesture; GtkWidget *box; - GtkWidget *example; + GtkLabel *example; tag = hb_tag_from_string (tags[i], -1); feat = gtk_check_button_new_with_label (get_feature_display_name (tag)); - set_inconsistent (GTK_CHECK_BUTTON (feat), TRUE); + set_inconsistent (feat, TRUE); g_signal_connect_swapped (feat, "notify::active", G_CALLBACK (update_font_features), fontchooser); g_signal_connect_swapped (feat, "notify::inconsistent", G_CALLBACK (update_font_features), fontchooser); g_signal_connect (feat, "clicked", G_CALLBACK (feat_clicked), NULL); @@ -2024,23 +2024,23 @@ add_check_group (GtkFontChooserWidget *fontchooser, gesture = gtk_gesture_click_new (); gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY); g_signal_connect (gesture, "pressed", G_CALLBACK (feat_pressed), feat); - gtk_widget_add_controller (feat, GTK_EVENT_CONTROLLER (gesture)); + gtk_widget_add_controller (GTK_WIDGET (feat), GTK_EVENT_CONTROLLER (gesture)); example = gtk_label_new (""); - gtk_label_set_selectable (GTK_LABEL (example), TRUE); - gtk_widget_set_halign (example, GTK_ALIGN_START); + gtk_label_set_selectable (example, TRUE); + gtk_widget_set_halign (GTK_WIDGET (example), GTK_ALIGN_START); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_box_set_homogeneous (GTK_BOX (box), TRUE); - gtk_container_add (GTK_CONTAINER (box), feat); - gtk_container_add (GTK_CONTAINER (box), example); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (feat)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (example)); gtk_container_add (GTK_CONTAINER (group), box); item = g_new (FeatureItem, 1); item->name = tags[i]; item->tag = tag; item->top = box; - item->feat = feat; + item->feat = GTK_WIDGET (feat); item->example = example; priv->feature_items = g_list_prepend (priv->feature_items, item); @@ -2055,7 +2055,7 @@ add_radio_group (GtkFontChooserWidget *fontchooser, const char **tags) { GtkFontChooserWidgetPrivate *priv = gtk_font_chooser_widget_get_instance_private (fontchooser); - GtkWidget *label; + GtkLabel *label; GtkWidget *group; int i; GtkWidget *group_button = NULL; @@ -2065,14 +2065,14 @@ add_radio_group (GtkFontChooserWidget *fontchooser, gtk_widget_set_halign (group, GTK_ALIGN_FILL); label = gtk_label_new (title); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_label_set_xalign (label, 0.0); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); g_object_set (label, "margin-top", 10, "margin-bottom", 10, NULL); attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); + gtk_label_set_attributes (label, attrs); pango_attr_list_unref (attrs); - gtk_container_add (GTK_CONTAINER (group), label); + gtk_container_add (GTK_CONTAINER (group), GTK_WIDGET (label)); for (i = 0; tags[i]; i++) { @@ -2081,7 +2081,7 @@ add_radio_group (GtkFontChooserWidget *fontchooser, FeatureItem *item; const char *name; GtkWidget *box; - GtkWidget *example; + GtkLabel *example; tag = hb_tag_from_string (tags[i], -1); name = get_feature_display_name (tag); @@ -2095,13 +2095,13 @@ add_radio_group (GtkFontChooserWidget *fontchooser, g_object_set_data (G_OBJECT (feat), "default", group_button); example = gtk_label_new (""); - gtk_label_set_selectable (GTK_LABEL (example), TRUE); - gtk_widget_set_halign (example, GTK_ALIGN_START); + gtk_label_set_selectable (example, TRUE); + gtk_widget_set_halign (GTK_WIDGET (example), GTK_ALIGN_START); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_box_set_homogeneous (GTK_BOX (box), TRUE); gtk_container_add (GTK_CONTAINER (box), feat); - gtk_container_add (GTK_CONTAINER (box), example); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (example)); gtk_container_add (GTK_CONTAINER (group), box); item = g_new (FeatureItem, 1); diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index b5a2aa8a6ebf5f06250a958754eb27a1bb13f902..3772f75fd60dd86643f915f22edd5cc47b0b5465 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -364,10 +364,10 @@ gtk_frame_set_label (GtkFrame *frame, } else { - GtkWidget *child = gtk_label_new (label); - gtk_widget_show (child); + GtkLabel *child = gtk_label_new (label); + gtk_widget_show (GTK_WIDGET (child)); - gtk_frame_set_label_widget (frame, child); + gtk_frame_set_label_widget (frame, GTK_WIDGET (child)); } } diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c index 0c8100872d3cb7c87134a1452eea8ea493a94257..76bb7380cfe18b71f774e25d347b04aae575dddd 100644 --- a/gtk/gtkheaderbar.c +++ b/gtk/gtkheaderbar.c @@ -111,11 +111,11 @@ struct _GtkHeaderBarPrivate gchar *title; gchar *subtitle; - GtkWidget *title_label; - GtkWidget *subtitle_label; + GtkLabel *title_label; + GtkLabel *subtitle_label; GtkWidget *label_box; GtkWidget *label_sizing_box; - GtkWidget *subtitle_sizing_label; + GtkLabel *subtitle_sizing_label; GtkWidget *custom_title; gboolean has_subtitle; @@ -127,8 +127,8 @@ struct _GtkHeaderBarPrivate GtkWidget *titlebar_start_box; GtkWidget *titlebar_end_box; - GtkWidget *titlebar_start_separator; - GtkWidget *titlebar_end_separator; + GtkSeparator *titlebar_start_separator; + GtkSeparator *titlebar_end_separator; GtkWidget *titlebar_icon; @@ -163,6 +163,7 @@ init_sizing_box (GtkHeaderBar *bar) { GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar); GtkWidget *w; + GtkLabel *label; GtkStyleContext *context; /* We use this box to always request size for the two labels (title @@ -173,57 +174,57 @@ init_sizing_box (GtkHeaderBar *bar) w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); priv->label_sizing_box = g_object_ref_sink (w); - w = gtk_label_new (NULL); - context = gtk_widget_get_style_context (w); + label = gtk_label_new (NULL); + context = gtk_widget_get_style_context (GTK_WIDGET (label)); gtk_style_context_add_class (context, GTK_STYLE_CLASS_TITLE); - gtk_container_add (GTK_CONTAINER (priv->label_sizing_box), w); - gtk_label_set_wrap (GTK_LABEL (w), FALSE); - gtk_label_set_single_line_mode (GTK_LABEL (w), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END); - gtk_label_set_width_chars (GTK_LABEL (w), MIN_TITLE_CHARS); - - w = gtk_label_new (NULL); - context = gtk_widget_get_style_context (w); + gtk_container_add (GTK_CONTAINER (priv->label_sizing_box), GTK_WIDGET (label)); + gtk_label_set_wrap (label, FALSE); + gtk_label_set_single_line_mode (label, TRUE); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); + gtk_label_set_width_chars (label, MIN_TITLE_CHARS); + + label = gtk_label_new (NULL); + context = gtk_widget_get_style_context (GTK_WIDGET (label)); gtk_style_context_add_class (context, GTK_STYLE_CLASS_SUBTITLE); - gtk_container_add (GTK_CONTAINER (priv->label_sizing_box), w); - gtk_label_set_wrap (GTK_LABEL (w), FALSE); - gtk_label_set_single_line_mode (GTK_LABEL (w), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END); - gtk_widget_set_visible (w, priv->has_subtitle || (priv->subtitle && priv->subtitle[0])); - priv->subtitle_sizing_label = w; + gtk_container_add (GTK_CONTAINER (priv->label_sizing_box), GTK_WIDGET (label)); + gtk_label_set_wrap (label, FALSE); + gtk_label_set_single_line_mode (label, TRUE); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); + gtk_widget_set_visible (GTK_WIDGET (label), priv->has_subtitle || (priv->subtitle && priv->subtitle[0])); + priv->subtitle_sizing_label = label; } static GtkWidget * create_title_box (const char *title, const char *subtitle, - GtkWidget **ret_title_label, - GtkWidget **ret_subtitle_label) + GtkLabel **ret_title_label, + GtkLabel **ret_subtitle_label) { GtkWidget *label_box; - GtkWidget *title_label; - GtkWidget *subtitle_label; + GtkLabel *title_label; + GtkLabel *subtitle_label; GtkStyleContext *context; label_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_set_valign (label_box, GTK_ALIGN_CENTER); title_label = gtk_label_new (title); - context = gtk_widget_get_style_context (title_label); + context = gtk_widget_get_style_context (GTK_WIDGET (title_label)); gtk_style_context_add_class (context, GTK_STYLE_CLASS_TITLE); - gtk_label_set_wrap (GTK_LABEL (title_label), FALSE); - gtk_label_set_single_line_mode (GTK_LABEL (title_label), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (title_label), PANGO_ELLIPSIZE_END); - gtk_container_add (GTK_CONTAINER (label_box), title_label); - gtk_label_set_width_chars (GTK_LABEL (title_label), MIN_TITLE_CHARS); + gtk_label_set_wrap (title_label, FALSE); + gtk_label_set_single_line_mode (title_label, TRUE); + gtk_label_set_ellipsize (title_label, PANGO_ELLIPSIZE_END); + gtk_container_add (GTK_CONTAINER (label_box), GTK_WIDGET (title_label)); + gtk_label_set_width_chars (title_label, MIN_TITLE_CHARS); subtitle_label = gtk_label_new (subtitle); - context = gtk_widget_get_style_context (subtitle_label); + context = gtk_widget_get_style_context (GTK_WIDGET (subtitle_label)); gtk_style_context_add_class (context, GTK_STYLE_CLASS_SUBTITLE); - gtk_label_set_wrap (GTK_LABEL (subtitle_label), FALSE); - gtk_label_set_single_line_mode (GTK_LABEL (subtitle_label), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (subtitle_label), PANGO_ELLIPSIZE_END); - gtk_container_add (GTK_CONTAINER (label_box), subtitle_label); - gtk_widget_set_visible (subtitle_label, subtitle && subtitle[0]); + gtk_label_set_wrap (subtitle_label, FALSE); + gtk_label_set_single_line_mode (subtitle_label, TRUE); + gtk_label_set_ellipsize (subtitle_label, PANGO_ELLIPSIZE_END); + gtk_container_add (GTK_CONTAINER (label_box), GTK_WIDGET (subtitle_label)); + gtk_widget_set_visible (GTK_WIDGET (subtitle_label), subtitle && subtitle[0]); if (ret_title_label) *ret_title_label = title_label; @@ -288,10 +289,10 @@ _gtk_header_bar_update_separator_visibility (GtkHeaderBar *bar) g_list_free (children); if (priv->titlebar_start_separator != NULL) - gtk_widget_set_visible (priv->titlebar_start_separator, have_visible_at_start); + gtk_widget_set_visible (GTK_WIDGET (priv->titlebar_start_separator), have_visible_at_start); if (priv->titlebar_end_separator != NULL) - gtk_widget_set_visible (priv->titlebar_end_separator, have_visible_at_end); + gtk_widget_set_visible (GTK_WIDGET (priv->titlebar_end_separator), have_visible_at_end); } void @@ -362,7 +363,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) for (i = 0; i < 2; i++) { GtkWidget *box; - GtkWidget *separator; + GtkSeparator *separator; int n_children = 0; if (tokens[i] == NULL) @@ -371,20 +372,20 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) t = g_strsplit (tokens[i], ",", -1); separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL); - gtk_style_context_add_class (gtk_widget_get_style_context (separator), "titlebutton"); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (separator)), "titlebutton"); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); for (j = 0; t[j]; j++) { GtkWidget *button = NULL; - GtkWidget *image = NULL; + GtkImage *image = NULL; AtkObject *accessible; if (strcmp (t[j], "icon") == 0 && is_sovereign_window) { - button = gtk_image_new (); + button = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); priv->titlebar_icon = button; gtk_style_context_add_class (gtk_widget_get_style_context (button), "titlebutton"); @@ -408,14 +409,14 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) gtk_style_context_add_class (gtk_widget_get_style_context (button), "titlebutton"); gtk_style_context_add_class (gtk_widget_get_style_context (button), "menu"); image = gtk_image_new (); - gtk_menu_button_add_child (GTK_MENU_BUTTON (button), image); + gtk_menu_button_add_child (GTK_MENU_BUTTON (button), GTK_WIDGET (image)); gtk_widget_set_can_focus (button, FALSE); accessible = gtk_widget_get_accessible (button); if (GTK_IS_ACCESSIBLE (accessible)) atk_object_set_name (accessible, _("Application menu")); - priv->titlebar_icon = image; + priv->titlebar_icon = GTK_WIDGET (image); if (!_gtk_header_bar_update_window_icon (bar, window)) gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon), "application-x-executable-symbolic"); @@ -430,7 +431,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) gtk_style_context_add_class (gtk_widget_get_style_context (button), "minimize"); image = gtk_image_new_from_icon_name ("window-minimize-symbolic"); g_object_set (image, "use-fallback", TRUE, NULL); - gtk_container_add (GTK_CONTAINER (button), image); + gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (image)); gtk_widget_set_can_focus (button, FALSE); g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_minimize), window); @@ -453,7 +454,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) gtk_style_context_add_class (gtk_widget_get_style_context (button), "maximize"); image = gtk_image_new_from_icon_name (icon_name); g_object_set (image, "use-fallback", TRUE, NULL); - gtk_container_add (GTK_CONTAINER (button), image); + gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (image)); gtk_widget_set_can_focus (button, FALSE); g_signal_connect_swapped (button, "clicked", G_CALLBACK (_gtk_window_toggle_maximized), window); @@ -471,7 +472,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) gtk_style_context_add_class (gtk_widget_get_style_context (button), "titlebutton"); gtk_style_context_add_class (gtk_widget_get_style_context (button), "close"); g_object_set (image, "use-fallback", TRUE, NULL); - gtk_container_add (GTK_CONTAINER (button), image); + gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (image)); gtk_widget_set_can_focus (button, FALSE); g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_close), window); @@ -498,9 +499,9 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) continue; } - gtk_container_add (GTK_CONTAINER (box), separator); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (separator)); if (i == 1) - gtk_box_reorder_child_after (GTK_BOX (box), separator, NULL); + gtk_box_reorder_child_after (GTK_BOX (box), GTK_WIDGET (separator), NULL); if (i == 0) gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_LEFT); @@ -634,7 +635,7 @@ gtk_header_bar_set_title (GtkHeaderBar *bar, if (priv->title_label != NULL) { - gtk_label_set_label (GTK_LABEL (priv->title_label), priv->title); + gtk_label_set_label (priv->title_label, priv->title); gtk_widget_queue_resize (GTK_WIDGET (bar)); } @@ -688,12 +689,12 @@ gtk_header_bar_set_subtitle (GtkHeaderBar *bar, if (priv->subtitle_label != NULL) { - gtk_label_set_label (GTK_LABEL (priv->subtitle_label), priv->subtitle); - gtk_widget_set_visible (priv->subtitle_label, priv->subtitle && priv->subtitle[0]); + gtk_label_set_label (priv->subtitle_label, priv->subtitle); + gtk_widget_set_visible (GTK_WIDGET (priv->subtitle_label), priv->subtitle && priv->subtitle[0]); gtk_widget_queue_resize (GTK_WIDGET (bar)); } - gtk_widget_set_visible (priv->subtitle_sizing_label, priv->has_subtitle || (priv->subtitle && priv->subtitle[0])); + gtk_widget_set_visible (GTK_WIDGET (priv->subtitle_sizing_label), priv->has_subtitle || (priv->subtitle && priv->subtitle[0])); g_object_notify_by_pspec (G_OBJECT (bar), header_bar_props[PROP_SUBTITLE]); } @@ -1396,7 +1397,7 @@ gtk_header_bar_set_has_subtitle (GtkHeaderBar *bar, return; priv->has_subtitle = setting; - gtk_widget_set_visible (priv->subtitle_sizing_label, setting || (priv->subtitle && priv->subtitle[0])); + gtk_widget_set_visible (GTK_WIDGET (priv->subtitle_sizing_label), setting || (priv->subtitle && priv->subtitle[0])); gtk_widget_queue_resize (GTK_WIDGET (bar)); diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 8a415750e93605f2ecb507201eb898ff7191a917..5eda3a38357069ffbd2837b724fe85fe4c82c7ef 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -54,7 +54,7 @@ * There’s a convenience function to do this, gtk_image_new_from_file(), * used as follows: * |[ - * GtkWidget *image; + * GtkImage *image; * image = gtk_image_new_from_file ("myfile.png"); * ]| * If the file isn’t loaded successfully, the image will contain a @@ -400,7 +400,7 @@ gtk_image_get_property (GObject *object, * * Returns: a new #GtkImage **/ -GtkWidget* +GtkImage* gtk_image_new_from_file (const gchar *filename) { GtkImage *image; @@ -409,7 +409,7 @@ gtk_image_new_from_file (const gchar *filename) gtk_image_set_from_file (image, filename); - return GTK_WIDGET (image); + return image; } /** @@ -431,7 +431,7 @@ gtk_image_new_from_file (const gchar *filename) * * Returns: a new #GtkImage **/ -GtkWidget* +GtkImage* gtk_image_new_from_resource (const gchar *resource_path) { GtkImage *image; @@ -440,7 +440,7 @@ gtk_image_new_from_resource (const gchar *resource_path) gtk_image_set_from_resource (image, resource_path); - return GTK_WIDGET (image); + return image; } /** @@ -461,7 +461,7 @@ gtk_image_new_from_resource (const gchar *resource_path) * * Returns: a new #GtkImage **/ -GtkWidget* +GtkImage* gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf) { GtkImage *image; @@ -470,7 +470,7 @@ gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf) gtk_image_set_from_pixbuf (image, pixbuf); - return GTK_WIDGET (image); + return image; } /** @@ -487,7 +487,7 @@ gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf) * * Returns: a new #GtkImage **/ -GtkWidget* +GtkImage* gtk_image_new_from_paintable (GdkPaintable *paintable) { GtkImage *image; @@ -496,7 +496,7 @@ gtk_image_new_from_paintable (GdkPaintable *paintable) gtk_image_set_from_paintable (image, paintable); - return GTK_WIDGET (image); + return image; } /** @@ -514,7 +514,7 @@ gtk_image_new_from_paintable (GdkPaintable *paintable) * * Returns: a new #GtkImage displaying the themed icon **/ -GtkWidget* +GtkImage* gtk_image_new_from_icon_name (const gchar *icon_name) { GtkImage *image; @@ -523,7 +523,7 @@ gtk_image_new_from_icon_name (const gchar *icon_name) gtk_image_set_from_icon_name (image, icon_name); - return GTK_WIDGET (image); + return image; } /** @@ -541,7 +541,7 @@ gtk_image_new_from_icon_name (const gchar *icon_name) * * Returns: a new #GtkImage displaying the themed icon **/ -GtkWidget* +GtkImage* gtk_image_new_from_gicon (GIcon *icon) { GtkImage *image; @@ -550,7 +550,7 @@ gtk_image_new_from_gicon (GIcon *icon) gtk_image_set_from_gicon (image, icon); - return GTK_WIDGET (image); + return image; } typedef struct { @@ -1054,7 +1054,7 @@ gtk_image_get_gicon (GtkImage *image) * * Returns: a newly created #GtkImage widget. **/ -GtkWidget* +GtkImage* gtk_image_new (void) { return g_object_new (GTK_TYPE_IMAGE, NULL); diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 722d40c0bc7236d3826bdf66bd00b75579bbbab8..2ea35b231bfe0f94c8baf348dbb8b50def75879e 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -72,19 +72,19 @@ GDK_AVAILABLE_IN_ALL GType gtk_image_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new (void); +GtkImage* gtk_image_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_file (const gchar *filename); +GtkImage* gtk_image_new_from_file (const gchar *filename); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_resource (const gchar *resource_path); +GtkImage* gtk_image_new_from_resource (const gchar *resource_path); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf); +GtkImage* gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_paintable (GdkPaintable *paintable); +GtkImage* gtk_image_new_from_paintable (GdkPaintable *paintable); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_icon_name (const gchar *icon_name); +GtkImage* gtk_image_new_from_icon_name (const gchar *icon_name); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_gicon (GIcon *icon); +GtkImage* gtk_image_new_from_gicon (GIcon *icon); GDK_AVAILABLE_IN_ALL void gtk_image_clear (GtkImage *image); diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index a7b902cf175b3653f6078a08f69616205f006c1d..92cea763547d9ea764f50a19e840196ad7bdd2dc 100644 --- a/gtk/gtkinfobar.c +++ b/gtk/gtkinfobar.c @@ -77,7 +77,8 @@ * * A simple example for using a #GtkInfoBar: * |[ - * GtkWidget *widget, *message_label, *content_area; + * GtkWidget *widget, *content_area; + * GtkLabel *message_label; * GtkWidget *grid; * GtkInfoBar *bar; * @@ -89,7 +90,7 @@ * message_label = gtk_label_new (""); * content_area = gtk_info_bar_get_content_area (bar); * gtk_container_add (GTK_CONTAINER (content_area), - * message_label); + * GTK_WIDGET (message_label)); * gtk_info_bar_add_button (bar, * _("_OK"), * GTK_RESPONSE_OK); @@ -104,7 +105,7 @@ * // ... * * // show an error message - * gtk_label_set_text (GTK_LABEL (message_label), "An error occurred!"); + * gtk_label_set_text (message_label, "An error occurred!"); * gtk_info_bar_set_message_type (bar, * GTK_MESSAGE_ERROR); * gtk_widget_show (bar); diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index d9c04fe2928469de2883c42b11d95c89e15842f8..0094efe94d2b7767e914de041d3a77659d48539d 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -136,8 +136,8 @@ * |[ * // Pressing Alt+H will activate this button * GtkWidget *button = gtk_button_new (); - * GtkWidget *label = gtk_label_new_with_mnemonic ("_Hello"); - * gtk_container_add (GTK_CONTAINER (button), label); + * GtkLabel *label = gtk_label_new_with_mnemonic ("_Hello"); + * gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (label)); * ]| * * There’s a convenience function to create buttons with a mnemonic label @@ -154,9 +154,9 @@ * * |[ * // Pressing Alt+H will focus the entry - * GtkWidget *entry = gtk_entry_new (); - * GtkWidget *label = gtk_label_new_with_mnemonic ("_Hello"); - * gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); + * GtkEntry *entry = gtk_entry_new (); + * GtkLabel *label = gtk_label_new_with_mnemonic ("_Hello"); + * gtk_label_set_mnemonic_widget (label, GTK_WIDGET (entry)); * ]| * * # Markup (styled text) @@ -167,8 +167,8 @@ * * Here’s how to create a label with a small font: * |[ - * GtkWidget *label = gtk_label_new (NULL); - * gtk_label_set_markup (GTK_LABEL (label), "Small text"); + * GtkLabel *label = gtk_label_new (NULL); + * gtk_label_set_markup (label, "Small text"); * ]| * * (See [complete documentation][PangoMarkupFormat] of available @@ -240,8 +240,8 @@ * "Go to the" * "" * "GTK+ website for more..."; - * GtkWidget *label = gtk_label_new (NULL); - * gtk_label_set_markup (GTK_LABEL (label), text); + * GtkLabel *label = gtk_label_new (NULL); + * gtk_label_set_markup (label, text); * ]| * * It is possible to implement custom handling for links and their tooltips with @@ -1732,7 +1732,7 @@ gtk_label_buildable_custom_finished (GtkBuildable *buildable, * * Returns: the new #GtkLabel **/ -GtkWidget* +GtkLabel* gtk_label_new (const gchar *str) { GtkLabel *label; @@ -1742,7 +1742,7 @@ gtk_label_new (const gchar *str) if (str && *str) gtk_label_set_text (label, str); - return GTK_WIDGET (label); + return label; } /** @@ -1767,7 +1767,7 @@ gtk_label_new (const gchar *str) * * Returns: the new #GtkLabel **/ -GtkWidget* +GtkLabel* gtk_label_new_with_mnemonic (const gchar *str) { GtkLabel *label; @@ -1777,7 +1777,7 @@ gtk_label_new_with_mnemonic (const gchar *str) if (str && *str) gtk_label_set_text_with_mnemonic (label, str); - return GTK_WIDGET (label); + return label; } static gboolean diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index b00e8cc0add64a349e500ad2518c73a560397cd4..8564dd76b8a40149b2e7081f8a316f4d663d2d78 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -43,9 +43,9 @@ typedef struct _GtkLabel GtkLabel; GDK_AVAILABLE_IN_ALL GType gtk_label_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_label_new (const gchar *str); +GtkLabel* gtk_label_new (const gchar *str); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_label_new_with_mnemonic (const gchar *str); +GtkLabel* gtk_label_new_with_mnemonic (const gchar *str); GDK_AVAILABLE_IN_ALL void gtk_label_set_text (GtkLabel *label, const gchar *str); diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c index f22670110acde12bf2b926f83388210b225d0174..8443f425ca63a2eaace6dd6f663e4831a9cd1f8a 100644 --- a/gtk/gtklockbutton.c +++ b/gtk/gtklockbutton.c @@ -93,8 +93,8 @@ struct _GtkLockButtonPrivate GtkWidget *box; GtkWidget *image; GtkWidget *stack; - GtkWidget *label_lock; - GtkWidget *label_unlock; + GtkLabel *label_lock; + GtkLabel *label_unlock; }; enum @@ -163,11 +163,11 @@ gtk_lock_button_get_property (GObject *object, break; case PROP_TEXT_LOCK: - g_value_set_string (value, gtk_label_get_text (GTK_LABEL (priv->label_lock))); + g_value_set_string (value, gtk_label_get_text (priv->label_lock)); break; case PROP_TEXT_UNLOCK: - g_value_set_string (value, gtk_label_get_text (GTK_LABEL (priv->label_unlock))); + g_value_set_string (value, gtk_label_get_text (priv->label_unlock)); break; case PROP_TOOLTIP_LOCK: @@ -204,12 +204,12 @@ gtk_lock_button_set_property (GObject *object, break; case PROP_TEXT_LOCK: - gtk_label_set_text (GTK_LABEL (priv->label_lock), g_value_get_string (value)); + gtk_label_set_text (priv->label_lock, g_value_get_string (value)); _gtk_lock_button_accessible_name_changed (button); break; case PROP_TEXT_UNLOCK: - gtk_label_set_text (GTK_LABEL (priv->label_unlock), g_value_get_string (value)); + gtk_label_set_text (priv->label_unlock, g_value_get_string (value)); _gtk_lock_button_accessible_name_changed (button); break; @@ -400,7 +400,7 @@ update_state (GtkLockButton *button) gtk_image_set_from_gicon (GTK_IMAGE (priv->image), icon); gtk_stack_set_visible_child (GTK_STACK (priv->stack), - allowed ? priv->label_lock : priv->label_unlock); + allowed ? GTK_WIDGET (priv->label_lock) : GTK_WIDGET (priv->label_unlock)); _gtk_lock_button_accessible_name_changed (button); gtk_widget_set_tooltip_markup (GTK_WIDGET (button), tooltip); gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive); @@ -577,12 +577,12 @@ const char * _gtk_lock_button_get_current_text (GtkLockButton *button) { GtkLockButtonPrivate *priv = gtk_lock_button_get_instance_private (button); - GtkWidget *label; + GtkLabel *label; g_return_val_if_fail (GTK_IS_LOCK_BUTTON (button), NULL); - label = gtk_stack_get_visible_child (GTK_STACK (priv->stack)); + label = GTK_LABEL (gtk_stack_get_visible_child (GTK_STACK (priv->stack))); - return gtk_label_get_text (GTK_LABEL (label)); + return gtk_label_get_text (label); } diff --git a/gtk/gtkmediacontrols.c b/gtk/gtkmediacontrols.c index a350e6c366695093ddf11716c88cd5c2204a155b..9339655a527e5eecb60331f96ca043fcf786b10e 100644 --- a/gtk/gtkmediacontrols.c +++ b/gtk/gtkmediacontrols.c @@ -47,9 +47,9 @@ struct _GtkMediaControls GtkWidget *box; GtkWidget *play_button; GtkWidget *time_box; - GtkWidget *time_label; + GtkLabel *time_label; GtkWidget *seek_scale; - GtkWidget *duration_label; + GtkLabel *duration_label; }; enum @@ -352,13 +352,13 @@ update_timestamp (GtkMediaControls *controls) } time_string = totem_time_to_string (timestamp, FALSE, FALSE); - gtk_label_set_text (GTK_LABEL (controls->time_label), time_string); + gtk_label_set_text (controls->time_label, time_string); g_free (time_string); if (duration > 0) { time_string = totem_time_to_string (duration > timestamp ? duration - timestamp : 0, TRUE, FALSE); - gtk_label_set_text (GTK_LABEL (controls->duration_label), time_string); + gtk_label_set_text (controls->duration_label, time_string); g_free (time_string); gtk_adjustment_set_value (controls->time_adjustment, (double) timestamp / G_USEC_PER_SEC); @@ -383,8 +383,8 @@ update_duration (GtkMediaControls *controls) } time_string = totem_time_to_string (duration > timestamp ? duration - timestamp : 0, TRUE, FALSE); - gtk_label_set_text (GTK_LABEL (controls->duration_label), time_string); - gtk_widget_set_visible (controls->duration_label, duration > 0); + gtk_label_set_text (controls->duration_label, time_string); + gtk_widget_set_visible (GTK_WIDGET (controls->duration_label), duration > 0); g_free (time_string); gtk_adjustment_set_upper (controls->time_adjustment, diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c index 3e0a31a391815aa9f566ed7c7e1396bffca6386a..a35c7fd23549d12e5d089897dab5f3f62c16c7f4 100644 --- a/gtk/gtkmenubutton.c +++ b/gtk/gtkmenubutton.c @@ -145,7 +145,7 @@ struct _GtkMenuButtonClass struct _GtkMenuButtonPrivate { - GtkWidget *button; + GtkToggleButton *button; GtkWidget *popover; /* Only one at a time can be set */ GMenuModel *model; @@ -154,7 +154,7 @@ struct _GtkMenuButtonPrivate GDestroyNotify create_popup_destroy_notify; GtkWidget *align_widget; - GtkWidget *arrow_widget; + GtkImage *arrow_widget; GtkArrowType arrow_type; }; @@ -267,7 +267,7 @@ static void gtk_menu_button_toggled (GtkMenuButton *menu_button) { GtkMenuButtonPrivate *priv = gtk_menu_button_get_instance_private (menu_button); - const gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->button)); + const gboolean active = gtk_toggle_button_get_active (priv->button); /* Might set a new menu/popover */ if (active && priv->create_popup_func) @@ -296,7 +296,7 @@ gtk_menu_button_measure (GtkWidget *widget, GtkMenuButton *menu_button = GTK_MENU_BUTTON (widget); GtkMenuButtonPrivate *priv = gtk_menu_button_get_instance_private (menu_button); - gtk_widget_measure (priv->button, + gtk_widget_measure (GTK_WIDGET (priv->button), orientation, for_size, minimum, natural, @@ -312,7 +312,7 @@ gtk_menu_button_size_allocate (GtkWidget *widget, GtkMenuButton *button = GTK_MENU_BUTTON (widget); GtkMenuButtonPrivate *priv = gtk_menu_button_get_instance_private (button); - gtk_widget_size_allocate (priv->button, + gtk_widget_size_allocate (GTK_WIDGET (priv->button), &(GtkAllocation) { 0, 0, width, height }, baseline); @@ -458,12 +458,12 @@ set_arrow_type (GtkImage *image, static void add_arrow (GtkMenuButton *menu_button) { - GtkWidget *arrow; + GtkImage *arrow; GtkMenuButtonPrivate *priv = gtk_menu_button_get_instance_private (menu_button); arrow = gtk_image_new (); - set_arrow_type (GTK_IMAGE (arrow), priv->arrow_type); - gtk_container_add (GTK_CONTAINER (priv->button), arrow); + set_arrow_type (arrow, priv->arrow_type); + gtk_container_add (GTK_CONTAINER (priv->button), GTK_WIDGET (arrow)); priv->arrow_widget = arrow; } @@ -476,11 +476,11 @@ gtk_menu_button_init (GtkMenuButton *menu_button) priv->arrow_type = GTK_ARROW_DOWN; priv->button = gtk_toggle_button_new (); - gtk_widget_set_parent (priv->button, GTK_WIDGET (menu_button)); + gtk_widget_set_parent (GTK_WIDGET (priv->button), GTK_WIDGET (menu_button)); g_signal_connect_swapped (priv->button, "toggled", G_CALLBACK (gtk_menu_button_toggled), menu_button); add_arrow (menu_button); - gtk_widget_set_sensitive (priv->button, FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (priv->button), FALSE); context = gtk_widget_get_style_context (GTK_WIDGET (menu_button)); gtk_style_context_add_class (context, "popup"); @@ -506,7 +506,7 @@ update_sensitivity (GtkMenuButton *menu_button) { GtkMenuButtonPrivate *priv = gtk_menu_button_get_instance_private (menu_button); - gtk_widget_set_sensitive (priv->button, + gtk_widget_set_sensitive (GTK_WIDGET (priv->button), priv->popover != NULL || priv->create_popup_func != NULL); } @@ -516,7 +516,7 @@ menu_deactivate_cb (GtkMenuButton *menu_button) { GtkMenuButtonPrivate *priv = gtk_menu_button_get_instance_private (menu_button); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->button), FALSE); + gtk_toggle_button_set_active (priv->button, FALSE); return TRUE; } @@ -716,7 +716,7 @@ gtk_menu_button_set_direction (GtkMenuButton *menu_button, /* Is it custom content? We don't change that */ child = gtk_bin_get_child (GTK_BIN (priv->button)); - if (priv->arrow_widget != child) + if (GTK_WIDGET (priv->arrow_widget) != child) return; set_arrow_type (GTK_IMAGE (child), priv->arrow_type); @@ -761,7 +761,7 @@ gtk_menu_button_dispose (GObject *object) set_align_widget_pointer (GTK_MENU_BUTTON (object), NULL); g_clear_object (&priv->model); - g_clear_pointer (&priv->button, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->button, gtk_widget_unparent); if (priv->create_popup_destroy_notify) priv->create_popup_destroy_notify (priv->create_popup_user_data); @@ -906,8 +906,8 @@ gtk_menu_button_set_label (GtkMenuButton *menu_button, gtk_container_remove (GTK_CONTAINER (priv->button), child); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new (label)); - gtk_container_add (GTK_CONTAINER (box), gtk_image_new_from_icon_name ("pan-down-symbolic")); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new (label))); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_image_new_from_icon_name ("pan-down-symbolic"))); gtk_container_add (GTK_CONTAINER (priv->button), box); g_object_notify_by_pspec (G_OBJECT (menu_button), menu_button_props[PROP_LABEL]); @@ -996,7 +996,7 @@ gtk_menu_button_popup (GtkMenuButton *menu_button) g_return_if_fail (GTK_IS_MENU_BUTTON (menu_button)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->button), TRUE); + gtk_toggle_button_set_active (priv->button, TRUE); } /** @@ -1012,7 +1012,7 @@ gtk_menu_button_popdown (GtkMenuButton *menu_button) g_return_if_fail (GTK_IS_MENU_BUTTON (menu_button)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->button), FALSE); + gtk_toggle_button_set_active (priv->button, FALSE); } void diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c index eee0659e0e4aba08a25a37989308231502acf9aa..08071d28ef65979730b7465dd4663c220f9fa805 100644 --- a/gtk/gtkmenusectionbox.c +++ b/gtk/gtkmenusectionbox.c @@ -118,7 +118,7 @@ gtk_menu_section_box_sync_separators (GtkMenuSectionBox *box, if (box->separator == NULL) return; - has_separator = gtk_widget_get_parent (box->separator) != NULL; + has_separator = gtk_widget_get_parent (GTK_WIDGET (box->separator)) != NULL; has_label = !GTK_IS_SEPARATOR (box->separator); separator_condition = has_label ? TRUE : n_items_before > 0 && @@ -139,9 +139,9 @@ gtk_menu_section_box_sync_separators (GtkMenuSectionBox *box, return; if (should_have_separator) - gtk_box_insert_child_after (GTK_BOX (box), box->separator, NULL); + gtk_box_insert_child_after (GTK_BOX (box), GTK_WIDGET (box->separator), NULL); else - gtk_container_remove (GTK_CONTAINER (box), box->separator); + gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (box->separator)); } static gboolean @@ -588,13 +588,13 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item, if (label != NULL) { - GtkWidget *title; + GtkLabel *title; title = gtk_label_new (label); - gtk_widget_set_hexpand (title, TRUE); - gtk_widget_set_halign (title, GTK_ALIGN_START); + gtk_widget_set_hexpand (GTK_WIDGET (title), TRUE); + gtk_widget_set_halign (GTK_WIDGET (title), GTK_ALIGN_START); g_object_bind_property (item, "label", title, "label", G_BINDING_SYNC_CREATE); - gtk_container_add (GTK_CONTAINER (box->item_box), title); + gtk_container_add (GTK_CONTAINER (box->item_box), GTK_WIDGET (title)); } item_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); @@ -611,29 +611,29 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item, if (label != NULL && !box->inline_buttons) { - GtkWidget *separator; - GtkWidget *title; + GtkSeparator *separator; + GtkLabel *title; box->separator = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_ref_sink (box->separator); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_widget_set_valign (separator, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (box->separator), separator); + gtk_widget_set_valign (GTK_WIDGET (separator), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (box->separator), GTK_WIDGET (separator)); title = gtk_label_new (label); g_object_bind_property (item, "label", title, "label", G_BINDING_SYNC_CREATE); - gtk_style_context_add_class (gtk_widget_get_style_context (title), GTK_STYLE_CLASS_SEPARATOR); - gtk_widget_set_halign (title, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (box->separator), title); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (title)), GTK_STYLE_CLASS_SEPARATOR); + gtk_widget_set_halign (GTK_WIDGET (title), GTK_ALIGN_START); + gtk_container_add (GTK_CONTAINER (box->separator), GTK_WIDGET (title)); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_widget_set_valign (separator, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (box->separator), separator); + gtk_widget_set_valign (GTK_WIDGET (separator), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (box->separator), GTK_WIDGET (separator)); } else { - box->separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + box->separator = GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); g_object_ref_sink (box->separator); } diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index b7e3161092dc4d0859dfbc3b58627001db69c41b..7c5449f095617125c679ebe518575fa32965a9ad 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -97,9 +97,9 @@ typedef struct { - GtkWidget *label; + GtkLabel *label; GtkWidget *message_area; /* vbox for the primary and secondary labels, and any extra content from the caller */ - GtkWidget *secondary_label; + GtkLabel *secondary_label; guint has_primary_markup : 1; guint has_secondary_text : 1; @@ -274,8 +274,8 @@ gtk_message_dialog_init (GtkMessageDialog *dialog) settings = gtk_widget_get_settings (GTK_WIDGET (dialog)); g_object_get (settings, "gtk-keynav-use-caret", &use_caret, NULL); - gtk_label_set_selectable (GTK_LABEL (priv->label), use_caret); - gtk_label_set_selectable (GTK_LABEL (priv->secondary_label), use_caret); + gtk_label_set_selectable (priv->label, use_caret); + gtk_label_set_selectable (priv->secondary_label, use_caret); } static void @@ -331,13 +331,13 @@ setup_type (GtkMessageDialog *dialog, static void update_title (GObject *dialog, GParamSpec *pspec, - GtkWidget *label) + GtkLabel *label) { const gchar *title; title = gtk_window_get_title (GTK_WINDOW (dialog)); - gtk_label_set_label (GTK_LABEL (label), title); - gtk_widget_set_visible (label, title && title[0]); + gtk_label_set_label (label, title); + gtk_widget_set_visible (GTK_WIDGET (label), title && title[0]); } static void @@ -355,19 +355,19 @@ gtk_message_dialog_constructed (GObject *object) if (use_header) { GtkWidget *box; - GtkWidget *label; + GtkLabel *label; box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (box); gtk_widget_set_size_request (box, -1, 16); label = gtk_label_new (""); - gtk_widget_hide (label); - gtk_widget_set_margin_top (label, 6); - gtk_widget_set_margin_bottom (label, 6); - gtk_widget_set_halign (label, GTK_ALIGN_CENTER); - gtk_widget_set_hexpand (label, TRUE); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "title"); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_widget_hide (GTK_WIDGET (label)); + gtk_widget_set_margin_top (GTK_WIDGET (label), 6); + gtk_widget_set_margin_bottom (GTK_WIDGET (label), 6); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "title"); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); g_signal_connect_object (dialog, "notify::title", G_CALLBACK (update_title), label, 0); gtk_window_set_titlebar (GTK_WINDOW (dialog), box); @@ -393,17 +393,17 @@ gtk_message_dialog_set_property (GObject *object, break; case PROP_TEXT: if (priv->has_primary_markup) - gtk_label_set_markup (GTK_LABEL (priv->label), + gtk_label_set_markup (priv->label, g_value_get_string (value)); else - gtk_label_set_text (GTK_LABEL (priv->label), + gtk_label_set_text (priv->label, g_value_get_string (value)); break; case PROP_USE_MARKUP: if (priv->has_primary_markup != g_value_get_boolean (value)) { priv->has_primary_markup = g_value_get_boolean (value); - gtk_label_set_use_markup (GTK_LABEL (priv->label), priv->has_primary_markup); + gtk_label_set_use_markup (priv->label, priv->has_primary_markup); g_object_notify_by_pspec (object, pspec); } break; @@ -411,27 +411,27 @@ gtk_message_dialog_set_property (GObject *object, { const gchar *txt = g_value_get_string (value); - if (gtk_label_get_use_markup (GTK_LABEL (priv->secondary_label))) - gtk_label_set_markup (GTK_LABEL (priv->secondary_label), txt); + if (gtk_label_get_use_markup (priv->secondary_label)) + gtk_label_set_markup (priv->secondary_label, txt); else - gtk_label_set_text (GTK_LABEL (priv->secondary_label), txt); + gtk_label_set_text (priv->secondary_label, txt); if (txt) { priv->has_secondary_text = TRUE; - gtk_widget_show (priv->secondary_label); + gtk_widget_show (GTK_WIDGET (priv->secondary_label)); } else { priv->has_secondary_text = FALSE; - gtk_widget_hide (priv->secondary_label); + gtk_widget_hide (GTK_WIDGET (priv->secondary_label)); } } break; case PROP_SECONDARY_USE_MARKUP: - if (gtk_label_get_use_markup (GTK_LABEL (priv->secondary_label)) != g_value_get_boolean (value)) + if (gtk_label_get_use_markup (priv->secondary_label) != g_value_get_boolean (value)) { - gtk_label_set_use_markup (GTK_LABEL (priv->secondary_label), g_value_get_boolean (value)); + gtk_label_set_use_markup (priv->secondary_label, g_value_get_boolean (value)); g_object_notify_by_pspec (object, pspec); } break; @@ -457,7 +457,7 @@ gtk_message_dialog_get_property (GObject *object, g_value_set_enum (value, (GtkMessageType) priv->message_type); break; case PROP_TEXT: - g_value_set_string (value, gtk_label_get_label (GTK_LABEL (priv->label))); + g_value_set_string (value, gtk_label_get_label (priv->label)); break; case PROP_USE_MARKUP: g_value_set_boolean (value, priv->has_primary_markup); @@ -465,14 +465,14 @@ gtk_message_dialog_get_property (GObject *object, case PROP_SECONDARY_TEXT: if (priv->has_secondary_text) g_value_set_string (value, - gtk_label_get_label (GTK_LABEL (priv->secondary_label))); + gtk_label_get_label (priv->secondary_label)); else g_value_set_string (value, NULL); break; case PROP_SECONDARY_USE_MARKUP: if (priv->has_secondary_text) g_value_set_boolean (value, - gtk_label_get_use_markup (GTK_LABEL (priv->secondary_label))); + gtk_label_get_use_markup (priv->secondary_label)); else g_value_set_boolean (value, FALSE); break; @@ -530,7 +530,7 @@ gtk_message_dialog_new (GtkWindow *parent, msg = g_strdup_vprintf (message_format, args); va_end (args); - gtk_label_set_text (GTK_LABEL (priv->label), msg); + gtk_label_set_text (priv->label, msg); g_free (msg); } @@ -631,7 +631,7 @@ gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog, g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog)); priv->has_primary_markup = TRUE; - gtk_label_set_markup (GTK_LABEL (priv->label), str); + gtk_label_set_markup (priv->label, str); } /** @@ -662,15 +662,15 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog, msg = g_strdup_vprintf (message_format, args); va_end (args); - gtk_widget_show (priv->secondary_label); - gtk_label_set_text (GTK_LABEL (priv->secondary_label), msg); + gtk_widget_show (GTK_WIDGET (priv->secondary_label)); + gtk_label_set_text (priv->secondary_label, msg); g_free (msg); } else { priv->has_secondary_text = FALSE; - gtk_widget_hide (priv->secondary_label); + gtk_widget_hide (GTK_WIDGET (priv->secondary_label)); } } @@ -718,15 +718,15 @@ gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog, msg = g_strdup_vprintf (message_format, args); va_end (args); - gtk_widget_show (priv->secondary_label); - gtk_label_set_markup (GTK_LABEL (priv->secondary_label), msg); + gtk_widget_show (GTK_WIDGET (priv->secondary_label)); + gtk_label_set_markup (priv->secondary_label, msg); g_free (msg); } else { priv->has_secondary_text = FALSE; - gtk_widget_hide (priv->secondary_label); + gtk_widget_hide (GTK_WIDGET (priv->secondary_label)); } } diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c index 6cd10e13bfd47e0678b7fdab8082e19c5d218cc4..4cc988c50c9399bcdd5c7e6be4f867f20c1663ad 100644 --- a/gtk/gtkmodelbutton.c +++ b/gtk/gtkmodelbutton.c @@ -157,9 +157,9 @@ struct _GtkModelButton GtkWidget parent_instance; GtkWidget *box; - GtkWidget *image; - GtkWidget *label; - GtkWidget *accel_label; + GtkImage *image; + GtkLabel *label; + GtkLabel *accel_label; GtkWidget *start_box; GtkWidget *start_indicator; GtkWidget *end_indicator; @@ -539,12 +539,12 @@ gtk_model_button_set_role (GtkModelButton *self, if (role == GTK_BUTTON_ROLE_TITLE) { gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self)), "title"); - gtk_widget_set_halign (self->label, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (self->label), GTK_ALIGN_CENTER); } else { gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (self)), "title"); - gtk_widget_set_halign (self->label, GTK_ALIGN_START); + gtk_widget_set_halign (GTK_WIDGET (self->label), GTK_ALIGN_START); } update_node_name (self); @@ -559,18 +559,18 @@ update_visibility (GtkModelButton *self) gboolean has_icon; gboolean has_text; - has_icon = self->image && gtk_image_get_storage_type (GTK_IMAGE (self->image)) != GTK_IMAGE_EMPTY; - has_text = gtk_label_get_text (GTK_LABEL (self->label))[0] != '\0'; + has_icon = self->image && gtk_image_get_storage_type (self->image) != GTK_IMAGE_EMPTY; + has_text = gtk_label_get_text (self->label)[0] != '\0'; - gtk_widget_set_visible (self->label, has_text && (!self->iconic || !has_icon)); - gtk_widget_set_hexpand (self->label, - gtk_widget_get_visible (self->label) && !has_icon); + gtk_widget_set_visible (GTK_WIDGET (self->label), has_text && (!self->iconic || !has_icon)); + gtk_widget_set_hexpand (GTK_WIDGET (self->label), + gtk_widget_get_visible (GTK_WIDGET (self->label)) && !has_icon); if (self->image) { - gtk_widget_set_visible (self->image, has_icon && (self->iconic || !has_text)); - gtk_widget_set_hexpand (self->image, - has_icon && (!has_text || !gtk_widget_get_visible (self->label))); + gtk_widget_set_visible (GTK_WIDGET (self->image), has_icon && (self->iconic || !has_text)); + gtk_widget_set_hexpand (GTK_WIDGET (self->image), + has_icon && (!has_text || !gtk_widget_get_visible (GTK_WIDGET (self->label)))); } } @@ -581,15 +581,15 @@ gtk_model_button_set_icon (GtkModelButton *self, if (!self->image && icon) { self->image = gtk_image_new_from_gicon (icon); - gtk_widget_insert_before (self->image, GTK_WIDGET (self), self->label); + gtk_widget_insert_before (GTK_WIDGET (self->image), GTK_WIDGET (self), GTK_WIDGET (self->label)); } else if (self->image && !icon) { - g_clear_pointer (&self->image, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &self->image, gtk_widget_unparent); } else if (icon) { - gtk_image_set_from_gicon (GTK_IMAGE (self->image), icon); + gtk_image_set_from_gicon (self->image, icon); } update_visibility (self); @@ -600,7 +600,7 @@ static void gtk_model_button_set_text (GtkModelButton *button, const gchar *text) { - gtk_label_set_text_with_mnemonic (GTK_LABEL (button->label), + gtk_label_set_text_with_mnemonic (button->label, text ? text : ""); update_visibility (button); g_object_notify_by_pspec (G_OBJECT (button), properties[PROP_TEXT]); @@ -611,10 +611,10 @@ gtk_model_button_set_use_markup (GtkModelButton *button, gboolean use_markup) { use_markup = !!use_markup; - if (gtk_label_get_use_markup (GTK_LABEL (button->label)) == use_markup) + if (gtk_label_get_use_markup (button->label) == use_markup) return; - gtk_label_set_use_markup (GTK_LABEL (button->label), use_markup); + gtk_label_set_use_markup (button->label, use_markup); update_visibility (button); g_object_notify_by_pspec (G_OBJECT (button), properties[PROP_USE_MARKUP]); } @@ -734,20 +734,20 @@ update_accel (GtkModelButton *self, self->accel_label = g_object_new (GTK_TYPE_LABEL, "css-name", "accelerator", NULL); - gtk_widget_insert_before (self->accel_label, GTK_WIDGET (self), NULL); + gtk_widget_insert_before (GTK_WIDGET (self->accel_label), GTK_WIDGET (self), NULL); } gtk_accelerator_parse (accel, &key, &mods); accel_class = g_type_class_ref (GTK_TYPE_ACCEL_LABEL); str = _gtk_accel_label_class_get_accelerator_label (accel_class, key, mods); - gtk_label_set_label (GTK_LABEL (self->accel_label), str); + gtk_label_set_label (self->accel_label, str); g_free (str); g_type_class_unref (accel_class); } else { - g_clear_pointer (&self->accel_label, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &self->accel_label, gtk_widget_unparent); } } @@ -777,15 +777,15 @@ gtk_model_button_get_property (GObject *object, break; case PROP_ICON: - g_value_set_object (value, self->image ? gtk_image_get_gicon (GTK_IMAGE (self->image)) : NULL); + g_value_set_object (value, self->image ? gtk_image_get_gicon (self->image) : NULL); break; case PROP_TEXT: - g_value_set_string (value, gtk_label_get_text (GTK_LABEL (self->label))); + g_value_set_string (value, gtk_label_get_text (self->label)); break; case PROP_USE_MARKUP: - g_value_set_boolean (value, gtk_label_get_use_markup (GTK_LABEL (self->label))); + g_value_set_boolean (value, gtk_label_get_use_markup (self->label)); break; case PROP_ACTIVE: @@ -968,10 +968,10 @@ gtk_model_button_finalize (GObject *object) { GtkModelButton *button = GTK_MODEL_BUTTON (object); - g_clear_pointer (&button->image, gtk_widget_unparent); - g_clear_pointer (&button->label, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &button->image, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &button->label, gtk_widget_unparent); g_clear_pointer (&button->start_box, gtk_widget_unparent); - g_clear_pointer (&button->accel_label, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &button->accel_label, gtk_widget_unparent); g_clear_pointer (&button->end_indicator, gtk_widget_unparent); g_clear_object (&button->action_helper); g_free (button->accel); @@ -1367,8 +1367,8 @@ gtk_model_button_init (GtkModelButton *self) self->role = GTK_BUTTON_ROLE_NORMAL; self->label = gtk_label_new (""); - gtk_widget_set_halign (self->label, GTK_ALIGN_START); - gtk_widget_set_parent (self->label, GTK_WIDGET (self)); + gtk_widget_set_halign (GTK_WIDGET (self->label), GTK_ALIGN_START); + gtk_widget_set_parent (GTK_WIDGET (self->label), GTK_WIDGET (self)); self->start_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_insert_after (self->start_box, GTK_WIDGET (self), NULL); diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index ebcdba0f2b4d4cb530d35d149a115ffcba015f22..d43288fcb4c38f4eb319c134a873d9db83ccdd50 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -121,13 +121,13 @@ struct _GtkMountOperationPrivate { /* for the ask-password dialog */ GtkWidget *grid; - GtkWidget *username_entry; - GtkWidget *domain_entry; - GtkWidget *password_entry; - GtkWidget *pim_entry; + GtkEntry *username_entry; + GtkEntry *domain_entry; + GtkEntry *password_entry; + GtkEntry *pim_entry; GtkWidget *anonymous_toggle; - GtkWidget *tcrypt_hidden_toggle; - GtkWidget *tcrypt_system_toggle; + GtkCheckButton *tcrypt_hidden_toggle; + GtkCheckButton *tcrypt_system_toggle; GList *user_widgets; GAskPasswordFlags ask_flags; @@ -393,7 +393,7 @@ pw_dialog_got_response (GtkDialog *dialog, } static gboolean -entry_has_input (GtkWidget *entry_widget) +entry_has_input (GtkEntry *entry_widget) { const char *text; @@ -406,7 +406,7 @@ entry_has_input (GtkWidget *entry_widget) } static gboolean -pim_entry_is_valid (GtkWidget *entry_widget) +pim_entry_is_valid (GtkEntry *entry_widget) { const char *text; gchar *end = NULL; @@ -495,15 +495,15 @@ pw_dialog_cycle_focus (GtkWidget *widget, priv = operation->priv; - if (widget == priv->username_entry) + if (widget == GTK_WIDGET (priv->username_entry)) { if (priv->domain_entry != NULL) - next_widget = priv->domain_entry; + next_widget = GTK_WIDGET (priv->domain_entry); else if (priv->password_entry != NULL) - next_widget = priv->password_entry; + next_widget = GTK_WIDGET (priv->password_entry); } - else if (widget == priv->domain_entry && priv->password_entry) - next_widget = priv->password_entry; + else if (widget == GTK_WIDGET (priv->domain_entry) && priv->password_entry) + next_widget = GTK_WIDGET (priv->password_entry); if (next_widget) gtk_widget_grab_focus (next_widget); @@ -511,31 +511,31 @@ pw_dialog_cycle_focus (GtkWidget *widget, gtk_widget_activate_default (widget); } -static GtkWidget * +static GtkEntry * table_add_entry (GtkMountOperation *operation, int row, const char *label_text, const char *value, gpointer user_data) { - GtkWidget *entry; - GtkWidget *label; + GtkEntry *entry; + GtkLabel *label; label = gtk_label_new_with_mnemonic (label_text); - gtk_widget_set_halign (label, GTK_ALIGN_END); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_widget_set_hexpand (label, FALSE); - operation->priv->user_widgets = g_list_prepend (operation->priv->user_widgets, label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (GTK_WIDGET (label), FALSE); + operation->priv->user_widgets = g_list_prepend (operation->priv->user_widgets, GTK_WIDGET (label)); entry = gtk_entry_new (); - gtk_widget_set_hexpand (entry, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (entry), TRUE); if (value) gtk_editable_set_text (GTK_EDITABLE (entry), value); - gtk_grid_attach (GTK_GRID (operation->priv->grid), label, 0, row, 1, 1); - gtk_grid_attach (GTK_GRID (operation->priv->grid), entry, 1, row, 1, 1); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); + gtk_grid_attach (GTK_GRID (operation->priv->grid), GTK_WIDGET (label), 0, row, 1, 1); + gtk_grid_attach (GTK_GRID (operation->priv->grid), GTK_WIDGET (entry), 1, row, 1, 1); + gtk_label_set_mnemonic_widget (label, GTK_WIDGET (entry)); operation->priv->user_widgets = g_list_prepend (operation->priv->user_widgets, entry); g_signal_connect (entry, "changed", @@ -557,9 +557,10 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, GtkWidget *widget; GtkDialog *dialog; GtkWindow *window; - GtkWidget *hbox, *main_vbox, *icon; + GtkWidget *hbox, *main_vbox; + GtkImage *icon; GtkWidget *grid; - GtkWidget *label; + GtkLabel *label; GtkWidget *content_area, *action_area; gboolean can_anonymous; guint rows; @@ -604,11 +605,11 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, gtk_container_add (GTK_CONTAINER (content_area), hbox); icon = gtk_image_new_from_icon_name ("dialog-password"); - gtk_image_set_icon_size (GTK_IMAGE (icon), GTK_ICON_SIZE_LARGE); + gtk_image_set_icon_size (icon, GTK_ICON_SIZE_LARGE); - gtk_widget_set_halign (icon, GTK_ALIGN_CENTER); - gtk_widget_set_valign (icon, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (hbox), icon); + gtk_widget_set_halign (GTK_WIDGET (icon), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (icon), GTK_ALIGN_START); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (icon)); main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18); gtk_container_add (GTK_CONTAINER (hbox), main_vbox); @@ -624,22 +625,22 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, } label = gtk_label_new (primary); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_label_set_wrap (label, TRUE); gtk_container_add (GTK_CONTAINER (main_vbox), GTK_WIDGET (label)); g_free (primary); attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); + gtk_label_set_attributes (label, attrs); pango_attr_list_unref (attrs); if (secondary != NULL) { label = gtk_label_new (secondary); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_label_set_wrap (label, TRUE); gtk_container_add (GTK_CONTAINER (main_vbox), GTK_WIDGET (label)); } @@ -662,10 +663,10 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, GSList *group; label = gtk_label_new (_("Connect As")); - gtk_widget_set_halign (label, GTK_ALIGN_END); - gtk_widget_set_valign (label, GTK_ALIGN_START); - gtk_widget_set_hexpand (label, FALSE); - gtk_grid_attach (GTK_GRID (grid), label, 0, rows, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_hexpand (GTK_WIDGET (label), FALSE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, rows, 1, 1); anon_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_grid_attach (GTK_GRID (grid), anon_box, 1, rows++, 1, 1); @@ -699,13 +700,13 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, priv->pim_entry = NULL; if (priv->ask_flags & G_ASK_PASSWORD_TCRYPT) { - GtkWidget *volume_type_label; + GtkLabel *volume_type_label; GtkWidget *volume_type_box; volume_type_label = gtk_label_new (_("Volume type")); - gtk_widget_set_halign (volume_type_label, GTK_ALIGN_END); - gtk_widget_set_hexpand (volume_type_label, FALSE); - gtk_grid_attach (GTK_GRID (grid), volume_type_label, 0, rows, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (volume_type_label), GTK_ALIGN_END); + gtk_widget_set_hexpand (GTK_WIDGET (volume_type_label), FALSE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (volume_type_label), 0, rows, 1, 1); priv->user_widgets = g_list_prepend (priv->user_widgets, volume_type_label); volume_type_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); @@ -713,10 +714,10 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, priv->user_widgets = g_list_prepend (priv->user_widgets, volume_type_box); priv->tcrypt_hidden_toggle = gtk_check_button_new_with_mnemonic (_("_Hidden")); - gtk_container_add (GTK_CONTAINER (volume_type_box), priv->tcrypt_hidden_toggle); + gtk_container_add (GTK_CONTAINER (volume_type_box), GTK_WIDGET (priv->tcrypt_hidden_toggle)); priv->tcrypt_system_toggle = gtk_check_button_new_with_mnemonic (_("_Windows system")); - gtk_container_add (GTK_CONTAINER (volume_type_box), priv->tcrypt_system_toggle); + gtk_container_add (GTK_CONTAINER (volume_type_box), GTK_WIDGET (priv->tcrypt_system_toggle)); priv->pim_entry = table_add_entry (operation, rows++, _("_PIM"), NULL, operation); } @@ -726,7 +727,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, { priv->password_entry = table_add_entry (operation, rows++, _("_Password"), NULL, operation); - gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), FALSE); + gtk_entry_set_visibility (priv->password_entry, FALSE); } if (priv->ask_flags & G_ASK_PASSWORD_SAVING_SUPPORTED) @@ -741,7 +742,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, priv->user_widgets = g_list_prepend (priv->user_widgets, remember_box); label = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (remember_box), label); + gtk_container_add (GTK_CONTAINER (remember_box), GTK_WIDGET (label)); password_save = g_mount_operation_get_password_save (G_MOUNT_OPERATION (operation)); priv->password_save = password_save; @@ -1455,7 +1456,7 @@ create_show_processes_dialog (GtkMountOperation *op, const char *secondary = NULL; char *primary; int count, len = 0; - GtkWidget *label; + GtkLabel *label; GtkWidget *tree_view; GtkWidget *scrolled_window; GtkWidget *vbox; @@ -1498,9 +1499,9 @@ create_show_processes_dialog (GtkMountOperation *op, g_free (primary); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), s); + gtk_label_set_markup (label, s); g_free (s); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); /* First count the items in the list then * add the buttons in reverse order diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index c8fa3c94fd6208f29dbeb42834c7684aa4f3e427..3862e8998fa46a34f8ce80116d1ddf46b007a90a 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -4334,7 +4334,7 @@ gtk_notebook_update_labels (GtkNotebook *notebook) { if (!page->tab_label) { - page->tab_label = gtk_label_new (""); + page->tab_label = GTK_WIDGET (gtk_label_new ("")); g_object_ref_sink (page->tab_label); g_object_set_data (G_OBJECT (page->tab_label), "notebook", notebook); gtk_widget_set_parent (page->tab_label, page->tab_widget); @@ -5585,9 +5585,9 @@ gtk_notebook_menu_item_create (GtkNotebook *notebook, if (page->default_menu) { if (GTK_IS_LABEL (page->tab_label)) - page->menu_label = gtk_label_new (gtk_label_get_text (GTK_LABEL (page->tab_label))); + page->menu_label = GTK_WIDGET (gtk_label_new (gtk_label_get_text (GTK_LABEL (page->tab_label)))); else - page->menu_label = gtk_label_new (""); + page->menu_label = GTK_WIDGET (gtk_label_new ("")); g_object_ref_sink (page->menu_label); gtk_widget_set_halign (page->menu_label, GTK_ALIGN_START); gtk_widget_set_valign (page->menu_label, GTK_ALIGN_CENTER); @@ -6609,7 +6609,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook, g_snprintf (string, sizeof(string), _("Page %u"), g_list_position (priv->children, list)); - page->tab_label = gtk_label_new (string); + page->tab_label = GTK_WIDGET (gtk_label_new (string)); gtk_widget_set_parent (page->tab_label, page->tab_widget); g_object_set_data (G_OBJECT (page->tab_label), "notebook", notebook); } @@ -6653,7 +6653,7 @@ gtk_notebook_set_tab_label_text (GtkNotebook *notebook, g_return_if_fail (GTK_IS_NOTEBOOK (notebook)); if (tab_text) - tab_label = gtk_label_new (tab_text); + tab_label = GTK_WIDGET (gtk_label_new (tab_text)); gtk_notebook_set_tab_label (notebook, child, tab_label); } @@ -6783,7 +6783,7 @@ gtk_notebook_set_menu_label_text (GtkNotebook *notebook, if (menu_text) { - menu_label = gtk_label_new (menu_text); + menu_label = GTK_WIDGET (gtk_label_new (menu_text)); gtk_widget_set_halign (menu_label, GTK_ALIGN_START); gtk_widget_set_valign (menu_label, GTK_ALIGN_CENTER); } diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index 030b5a9b4b7519c8daf9aaa9a4dfb157ef091983..1ca1abfbb3b277567f3eaebbcafa63a5710e20bf 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/gtkpagesetupunixdialog.c @@ -83,7 +83,7 @@ struct _GtkPageSetupUnixDialogPrivate GtkWidget *printer_combo; GtkWidget *paper_size_combo; - GtkWidget *paper_size_label; + GtkLabel *paper_size_label; GtkCellRenderer *paper_size_cell; GtkWidget *portrait_radio; @@ -778,7 +778,7 @@ paper_size_changed (GtkComboBox *combo_box, GtkLabel *label; const gchar *unit_str; - label = GTK_LABEL (priv->paper_size_label); + label = priv->paper_size_label; if (gtk_combo_box_get_active_iter (combo_box, &iter)) { @@ -787,7 +787,7 @@ paper_size_changed (GtkComboBox *combo_box, if (page_setup == NULL) { - GtkWidget *custom_paper_dialog; + GtkCustomPaperUnixDialog *custom_paper_dialog; /* Change from "manage" menu item to last value */ if (priv->last_setup) @@ -850,7 +850,7 @@ paper_size_changed (GtkComboBox *combo_box, g_free (left); g_free (right); - gtk_widget_set_tooltip_text (priv->paper_size_label, str); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->paper_size_label), str); g_free (str); g_object_unref (page_setup); @@ -858,7 +858,7 @@ paper_size_changed (GtkComboBox *combo_box, else { gtk_label_set_text (label, ""); - gtk_widget_set_tooltip_text (priv->paper_size_label, NULL); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->paper_size_label), NULL); if (priv->last_setup) g_object_unref (priv->last_setup); priv->last_setup = NULL; @@ -897,11 +897,11 @@ page_name_func (GtkCellLayout *cell_layout, * * Returns: the new #GtkPageSetupUnixDialog */ -GtkWidget * +GtkPageSetupUnixDialog * gtk_page_setup_unix_dialog_new (const gchar *title, GtkWindow *parent) { - GtkWidget *result; + GtkPageSetupUnixDialog *result; if (title == NULL) title = _("Page Setup"); diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h index 06cee9dc32484a12e65b421b1f60824e80ac682b..4620c2561731f17a9707f7b164fb4a71f071347a 100644 --- a/gtk/gtkpagesetupunixdialog.h +++ b/gtk/gtkpagesetupunixdialog.h @@ -35,20 +35,20 @@ typedef struct _GtkPageSetupUnixDialog GtkPageSetupUnixDialog; GDK_AVAILABLE_IN_ALL -GType gtk_page_setup_unix_dialog_get_type (void) G_GNUC_CONST; +GType gtk_page_setup_unix_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_page_setup_unix_dialog_new (const gchar *title, - GtkWindow *parent); +GtkPageSetupUnixDialog * gtk_page_setup_unix_dialog_new (const gchar *title, + GtkWindow *parent); GDK_AVAILABLE_IN_ALL -void gtk_page_setup_unix_dialog_set_page_setup (GtkPageSetupUnixDialog *dialog, - GtkPageSetup *page_setup); +void gtk_page_setup_unix_dialog_set_page_setup (GtkPageSetupUnixDialog *dialog, + GtkPageSetup *page_setup); GDK_AVAILABLE_IN_ALL -GtkPageSetup * gtk_page_setup_unix_dialog_get_page_setup (GtkPageSetupUnixDialog *dialog); +GtkPageSetup * gtk_page_setup_unix_dialog_get_page_setup (GtkPageSetupUnixDialog *dialog); GDK_AVAILABLE_IN_ALL -void gtk_page_setup_unix_dialog_set_print_settings (GtkPageSetupUnixDialog *dialog, - GtkPrintSettings *print_settings); +void gtk_page_setup_unix_dialog_set_print_settings (GtkPageSetupUnixDialog *dialog, + GtkPrintSettings *print_settings); GDK_AVAILABLE_IN_ALL -GtkPrintSettings *gtk_page_setup_unix_dialog_get_print_settings (GtkPageSetupUnixDialog *dialog); +GtkPrintSettings * gtk_page_setup_unix_dialog_get_print_settings (GtkPageSetupUnixDialog *dialog); G_END_DECLS diff --git a/gtk/gtkpasswordentry.c b/gtk/gtkpasswordentry.c index a2eeda7900eb9bf15d493de5f1775690b3782044..bedf1e9ab4ff7aee2e5034619001aa0efc4907c6 100644 --- a/gtk/gtkpasswordentry.c +++ b/gtk/gtkpasswordentry.c @@ -53,9 +53,9 @@ */ typedef struct { - GtkWidget *entry; - GtkWidget *icon; - GtkWidget *peek_icon; + GtkText *entry; + GtkImage *icon; + GtkImage *peek_icon; GdkKeymap *keymap; GMenuModel *extra_menu; } GtkPasswordEntryPrivate; @@ -89,12 +89,12 @@ keymap_state_changed (GdkKeymap *keymap, GtkPasswordEntryPrivate *priv = gtk_password_entry_get_instance_private (entry); if (gtk_editable_get_editable (GTK_EDITABLE (entry)) && - gtk_widget_has_focus (priv->entry) && + gtk_widget_has_focus (GTK_WIDGET (priv->entry)) && gdk_keymap_get_caps_lock_state (priv->keymap) && !priv->peek_icon) - gtk_widget_show (priv->icon); + gtk_widget_show (GTK_WIDGET (priv->icon)); else - gtk_widget_hide (priv->icon); + gtk_widget_hide (GTK_WIDGET (priv->icon)); } static void @@ -113,8 +113,8 @@ gtk_password_entry_toggle_peek (GtkPasswordEntry *entry) GtkPasswordEntryPrivate *priv = gtk_password_entry_get_instance_private (entry); gboolean visibility; - visibility = gtk_text_get_visibility (GTK_TEXT (priv->entry)); - gtk_text_set_visibility (GTK_TEXT (priv->entry), !visibility); + visibility = gtk_text_get_visibility (priv->entry); + gtk_text_set_visibility (priv->entry, !visibility); } static void @@ -124,15 +124,15 @@ visibility_toggled (GObject *object, { GtkPasswordEntryPrivate *priv = gtk_password_entry_get_instance_private (entry); - if (gtk_text_get_visibility (GTK_TEXT (priv->entry))) + if (gtk_text_get_visibility (priv->entry)) { - gtk_image_set_from_icon_name (GTK_IMAGE (priv->peek_icon), "eye-open-negative-filled-symbolic"); - gtk_widget_set_tooltip_text (priv->peek_icon, _("Hide text")); + gtk_image_set_from_icon_name (priv->peek_icon, "eye-open-negative-filled-symbolic"); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->peek_icon), _("Hide text")); } else { - gtk_image_set_from_icon_name (GTK_IMAGE (priv->peek_icon), "eye-not-looking-symbolic"); - gtk_widget_set_tooltip_text (priv->peek_icon, _("Show text")); + gtk_image_set_from_icon_name (priv->peek_icon, "eye-not-looking-symbolic"); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->peek_icon), _("Show text")); } } @@ -142,16 +142,16 @@ gtk_password_entry_init (GtkPasswordEntry *entry) GtkPasswordEntryPrivate *priv = gtk_password_entry_get_instance_private (entry); priv->entry = gtk_text_new (); - gtk_text_set_visibility (GTK_TEXT (priv->entry), FALSE); - gtk_widget_set_parent (priv->entry, GTK_WIDGET (entry)); + gtk_text_set_visibility (priv->entry, FALSE); + gtk_widget_set_parent (GTK_WIDGET (priv->entry), GTK_WIDGET (entry)); gtk_editable_init_delegate (GTK_EDITABLE (entry)); g_signal_connect_swapped (priv->entry, "notify::has-focus", G_CALLBACK (focus_changed), entry); priv->icon = gtk_image_new_from_icon_name ("caps-lock-symbolic"); - gtk_widget_set_tooltip_text (priv->icon, _("Caps Lock is on")); - gtk_style_context_add_class (gtk_widget_get_style_context (priv->icon), "caps-lock-indicator"); - gtk_widget_set_cursor (priv->icon, gtk_widget_get_cursor (priv->entry)); - gtk_widget_set_parent (priv->icon, GTK_WIDGET (entry)); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->icon), _("Caps Lock is on")); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (priv->icon)), "caps-lock-indicator"); + gtk_widget_set_cursor (GTK_WIDGET (priv->icon), gtk_widget_get_cursor (GTK_WIDGET (priv->entry))); + gtk_widget_set_parent (GTK_WIDGET (priv->icon), GTK_WIDGET (entry)); gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (entry)), I_("password")); @@ -183,9 +183,9 @@ gtk_password_entry_dispose (GObject *object) if (priv->entry) gtk_editable_finish_delegate (GTK_EDITABLE (entry)); - g_clear_pointer (&priv->entry, gtk_widget_unparent); - g_clear_pointer (&priv->icon, gtk_widget_unparent); - g_clear_pointer (&priv->peek_icon, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->entry, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->icon, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->peek_icon, gtk_widget_unparent); g_clear_object (&priv->extra_menu); G_OBJECT_CLASS (gtk_password_entry_parent_class)->dispose (object); @@ -206,13 +206,13 @@ gtk_password_entry_set_property (GObject *object, switch (prop_id) { case PROP_PLACEHOLDER_TEXT: - gtk_text_set_placeholder_text (GTK_TEXT (priv->entry), g_value_get_string (value)); + gtk_text_set_placeholder_text (priv->entry, g_value_get_string (value)); break; case PROP_ACTIVATES_DEFAULT: - if (gtk_text_get_activates_default (GTK_TEXT (priv->entry)) != g_value_get_boolean (value)) + if (gtk_text_get_activates_default (priv->entry) != g_value_get_boolean (value)) { - gtk_text_set_activates_default (GTK_TEXT (priv->entry), g_value_get_boolean (value)); + gtk_text_set_activates_default (priv->entry, g_value_get_boolean (value)); g_object_notify_by_pspec (object, pspec); } break; @@ -246,11 +246,11 @@ gtk_password_entry_get_property (GObject *object, switch (prop_id) { case PROP_PLACEHOLDER_TEXT: - g_value_set_string (value, gtk_text_get_placeholder_text (GTK_TEXT (priv->entry))); + g_value_set_string (value, gtk_text_get_placeholder_text (priv->entry)); break; case PROP_ACTIVATES_DEFAULT: - g_value_set_boolean (value, gtk_text_get_activates_default (GTK_TEXT (priv->entry))); + g_value_set_boolean (value, gtk_text_get_activates_default (priv->entry)); break; case PROP_SHOW_PEEK_ICON: @@ -280,17 +280,17 @@ gtk_password_entry_measure (GtkWidget *widget, GtkPasswordEntryPrivate *priv = gtk_password_entry_get_instance_private (entry); int icon_min = 0, icon_nat = 0; - gtk_widget_measure (priv->entry, orientation, for_size, + gtk_widget_measure (GTK_WIDGET (priv->entry), orientation, for_size, minimum, natural, minimum_baseline, natural_baseline); - if (priv->icon && gtk_widget_get_visible (priv->icon)) - gtk_widget_measure (priv->icon, orientation, for_size, + if (priv->icon && gtk_widget_get_visible (GTK_WIDGET (priv->icon))) + gtk_widget_measure (GTK_WIDGET (priv->icon), orientation, for_size, &icon_min, &icon_nat, NULL, NULL); - if (priv->peek_icon && gtk_widget_get_visible (priv->peek_icon)) - gtk_widget_measure (priv->peek_icon, orientation, for_size, + if (priv->peek_icon && gtk_widget_get_visible (GTK_WIDGET (priv->peek_icon))) + gtk_widget_measure (GTK_WIDGET (priv->peek_icon), orientation, for_size, &icon_min, &icon_nat, NULL, NULL); } @@ -307,29 +307,29 @@ gtk_password_entry_size_allocate (GtkWidget *widget, int peek_min = 0, peek_nat = 0; int text_width; - if (priv->icon && gtk_widget_get_visible (priv->icon)) - gtk_widget_measure (priv->icon, GTK_ORIENTATION_HORIZONTAL, -1, + if (priv->icon && gtk_widget_get_visible (GTK_WIDGET (priv->icon))) + gtk_widget_measure (GTK_WIDGET (priv->icon), GTK_ORIENTATION_HORIZONTAL, -1, &icon_min, &icon_nat, NULL, NULL); - if (priv->peek_icon && gtk_widget_get_visible (priv->peek_icon)) - gtk_widget_measure (priv->peek_icon, GTK_ORIENTATION_HORIZONTAL, -1, + if (priv->peek_icon && gtk_widget_get_visible (GTK_WIDGET (priv->peek_icon))) + gtk_widget_measure (GTK_WIDGET (priv->peek_icon), GTK_ORIENTATION_HORIZONTAL, -1, &peek_min, &peek_nat, NULL, NULL); text_width = width - icon_nat - peek_nat; - gtk_widget_size_allocate (priv->entry, + gtk_widget_size_allocate (GTK_WIDGET (priv->entry), &(GtkAllocation) { 0, 0, text_width, height }, baseline); - if (priv->icon && gtk_widget_get_visible (priv->icon)) - gtk_widget_size_allocate (priv->icon, + if (priv->icon && gtk_widget_get_visible (GTK_WIDGET (priv->icon))) + gtk_widget_size_allocate (GTK_WIDGET (priv->icon), &(GtkAllocation) { text_width, 0, icon_nat, height }, baseline); - if (priv->peek_icon && gtk_widget_get_visible (priv->peek_icon)) - gtk_widget_size_allocate (priv->peek_icon, + if (priv->peek_icon && gtk_widget_get_visible (GTK_WIDGET (priv->peek_icon))) + gtk_widget_size_allocate (GTK_WIDGET (priv->peek_icon), &(GtkAllocation) { text_width + icon_nat, 0, peek_nat, height }, baseline); } @@ -351,7 +351,7 @@ gtk_password_entry_grab_focus (GtkWidget *widget) GtkPasswordEntry *entry = GTK_PASSWORD_ENTRY (widget); GtkPasswordEntryPrivate *priv = gtk_password_entry_get_instance_private (entry); - return gtk_widget_grab_focus (priv->entry); + return gtk_widget_grab_focus (GTK_WIDGET (priv->entry)); } static gboolean @@ -361,7 +361,7 @@ gtk_password_entry_mnemonic_activate (GtkWidget *widget, GtkPasswordEntry *entry = GTK_PASSWORD_ENTRY (widget); GtkPasswordEntryPrivate *priv = gtk_password_entry_get_instance_private (entry); - gtk_widget_grab_focus (priv->entry); + gtk_widget_grab_focus (GTK_WIDGET (priv->entry)); return TRUE; } @@ -479,13 +479,13 @@ gtk_password_entry_set_show_peek_icon (GtkPasswordEntry *entry, GtkGesture *press; priv->peek_icon = gtk_image_new_from_icon_name ("eye-not-looking-symbolic"); - gtk_widget_set_tooltip_text (priv->peek_icon, _("Show text")); - gtk_widget_set_parent (priv->peek_icon, GTK_WIDGET (entry)); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->peek_icon), _("Show text")); + gtk_widget_set_parent (GTK_WIDGET (priv->peek_icon), GTK_WIDGET (entry)); press = gtk_gesture_click_new (); g_signal_connect_swapped (press, "released", G_CALLBACK (gtk_password_entry_toggle_peek), entry); - gtk_widget_add_controller (priv->peek_icon, GTK_EVENT_CONTROLLER (press)); + gtk_widget_add_controller (GTK_WIDGET (priv->peek_icon), GTK_EVENT_CONTROLLER (press)); g_signal_connect (priv->entry, "notify::visibility", G_CALLBACK (visibility_toggled), entry); @@ -493,8 +493,8 @@ gtk_password_entry_set_show_peek_icon (GtkPasswordEntry *entry, } else { - g_clear_pointer (&priv->peek_icon, gtk_widget_unparent); - gtk_text_set_visibility (GTK_TEXT (priv->entry), FALSE); + g_clear_pointer ((GtkWidget **) &priv->peek_icon, gtk_widget_unparent); + gtk_text_set_visibility (priv->entry, FALSE); g_signal_handlers_disconnect_by_func (priv->entry, visibility_toggled, entry); @@ -564,7 +564,7 @@ gtk_password_entry_set_extra_menu (GtkPasswordEntry *entry, if (model) g_menu_append_section (menu, NULL, model); - gtk_text_set_extra_menu (GTK_TEXT (priv->entry), G_MENU_MODEL (menu)); + gtk_text_set_extra_menu (priv->entry, G_MENU_MODEL (menu)); g_object_unref (menu); diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index d5d89a12b9315cab94c177807d439a7ee9887109..1e92e065bfe4024c58519c6d3d3cb176c7f1e214 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -104,12 +104,12 @@ typedef struct _ButtonData ButtonData; struct _ButtonData { - GtkWidget *button; + GtkToggleButton *button; ButtonType type; char *dir_name; GFile *file; - GtkWidget *image; - GtkWidget *label; + GtkImage *image; + GtkLabel *label; GCancellable *cancellable; guint ignore_changes : 1; guint file_is_hidden : 1; @@ -394,9 +394,9 @@ gtk_path_bar_measure (GtkWidget *widget, for (list = priv->button_list; list; list = list->next) { button_data = BUTTON_DATA (list->data); - gtk_widget_measure (button_data->button, GTK_ORIENTATION_HORIZONTAL, -1, + gtk_widget_measure (GTK_WIDGET (button_data->button), GTK_ORIENTATION_HORIZONTAL, -1, &child_min, &child_nat, NULL, NULL); - gtk_widget_measure (button_data->button, GTK_ORIENTATION_VERTICAL, -1, + gtk_widget_measure (GTK_WIDGET (button_data->button), GTK_ORIENTATION_VERTICAL, -1, &child_size, NULL, NULL, NULL); size = MAX (size, child_size); @@ -441,7 +441,7 @@ gtk_path_bar_measure (GtkWidget *widget, for (list = priv->button_list; list; list = list->next) { button_data = BUTTON_DATA (list->data); - gtk_widget_measure (button_data->button, GTK_ORIENTATION_VERTICAL, -1, + gtk_widget_measure (GTK_WIDGET (button_data->button), GTK_ORIENTATION_VERTICAL, -1, &child_min, &child_nat, NULL, NULL); *minimum = MAX (*minimum, child_min); @@ -467,16 +467,16 @@ gtk_path_bar_update_slider_buttons (GtkPathBar *path_bar) if (priv->button_list) { - GtkWidget *button; + GtkToggleButton *button; button = BUTTON_DATA (priv->button_list->data)->button; - if (gtk_widget_get_child_visible (button)) + if (gtk_widget_get_child_visible (GTK_WIDGET (button))) gtk_widget_set_sensitive (priv->down_slider_button, FALSE); else gtk_widget_set_sensitive (priv->down_slider_button, TRUE); button = BUTTON_DATA (g_list_last (priv->button_list)->data)->button; - if (gtk_widget_get_child_visible (button)) + if (gtk_widget_get_child_visible (GTK_WIDGET (button))) gtk_widget_set_sensitive (priv->up_slider_button, FALSE); else gtk_widget_set_sensitive (priv->up_slider_button, TRUE); @@ -493,7 +493,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, { GtkPathBar *path_bar = GTK_PATH_BAR (widget); GtkPathBarPrivate *priv = gtk_path_bar_get_instance_private (path_bar); - GtkWidget *child; + GtkToggleButton *child; GtkTextDirection direction; GtkAllocation child_allocation; GList *list, *first_button; @@ -521,7 +521,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, { child = BUTTON_DATA (list->data)->button; - gtk_widget_get_preferred_size (child, &child_requisition, NULL); + gtk_widget_get_preferred_size (GTK_WIDGET (child), &child_requisition, NULL); width += child_requisition.width; if (list == priv->fake_root) @@ -551,7 +551,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, * button, then count backwards. */ /* Count down the path chain towards the end. */ - gtk_widget_get_preferred_size (BUTTON_DATA (first_button->data)->button, + gtk_widget_get_preferred_size (GTK_WIDGET (BUTTON_DATA (first_button->data)->button), &child_requisition, NULL); width = child_requisition.width; @@ -560,7 +560,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, { child = BUTTON_DATA (list->data)->button; - gtk_widget_get_preferred_size (child, &child_requisition, NULL); + gtk_widget_get_preferred_size (GTK_WIDGET (child), &child_requisition, NULL); if (width + child_requisition.width + slider_space > allocation_width) reached_end = TRUE; @@ -578,7 +578,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, { child = BUTTON_DATA (first_button->next->data)->button; - gtk_widget_get_preferred_size (child, &child_requisition, NULL); + gtk_widget_get_preferred_size (GTK_WIDGET (child), &child_requisition, NULL); if (width + child_requisition.width + slider_space > allocation_width) { @@ -625,7 +625,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, button_data = BUTTON_DATA (list->data); child = button_data->button; - gtk_widget_get_preferred_size (child, &child_requisition, NULL); + gtk_widget_get_preferred_size (GTK_WIDGET (child), &child_requisition, NULL); child_allocation.width = MIN (child_requisition.width, allocation_width - 2 * priv->slider_width); @@ -650,14 +650,14 @@ gtk_path_bar_size_allocate (GtkWidget *widget, if (child_allocation.width < child_requisition.width) { - if (!gtk_widget_get_has_tooltip (child)) - gtk_widget_set_tooltip_text (child, button_data->dir_name); + if (!gtk_widget_get_has_tooltip (GTK_WIDGET (child))) + gtk_widget_set_tooltip_text (GTK_WIDGET (child), button_data->dir_name); } - else if (gtk_widget_get_has_tooltip (child)) - gtk_widget_set_tooltip_text (child, NULL); + else if (gtk_widget_get_has_tooltip (GTK_WIDGET (child))) + gtk_widget_set_tooltip_text (GTK_WIDGET (child), NULL); - gtk_widget_set_child_visible (child, TRUE); - gtk_widget_size_allocate (child, &child_allocation, baseline); + gtk_widget_set_child_visible (GTK_WIDGET (child), TRUE); + gtk_widget_size_allocate (GTK_WIDGET (child), &child_allocation, baseline); if (direction == GTK_TEXT_DIR_RTL) { @@ -673,13 +673,13 @@ gtk_path_bar_size_allocate (GtkWidget *widget, while (list) { child = BUTTON_DATA (list->data)->button; - gtk_widget_set_child_visible (child, FALSE); + gtk_widget_set_child_visible (GTK_WIDGET (child), FALSE); list = list->prev; } for (list = first_button->next; list; list = list->next) { child = BUTTON_DATA (list->data)->button; - gtk_widget_set_child_visible (child, FALSE); + gtk_widget_set_child_visible (GTK_WIDGET (child), FALSE); } if (need_sliders || priv->fake_root) @@ -801,7 +801,7 @@ gtk_path_bar_remove (GtkContainer *container, children = priv->button_list; while (children) { - if (widget == BUTTON_DATA (children->data)->button) + if (widget == GTK_WIDGET (BUTTON_DATA (children->data)->button)) { gtk_path_bar_remove_1 (container, widget); priv->button_list = g_list_remove_link (priv->button_list, children); @@ -827,11 +827,11 @@ gtk_path_bar_forall (GtkContainer *container, children = priv->button_list; while (children) { - GtkWidget *child; + GtkToggleButton *child; child = BUTTON_DATA (children->data)->button; children = children->next; - (* callback) (child, callback_data); + (* callback) (GTK_WIDGET (child), callback_data); } if (priv->up_slider_button) @@ -850,7 +850,7 @@ gtk_path_bar_scroll_down (GtkPathBar *path_bar) GList *down_button = NULL; gint space_available; - if (gtk_widget_get_child_visible (BUTTON_DATA (priv->button_list->data)->button)) + if (gtk_widget_get_child_visible (GTK_WIDGET (BUTTON_DATA (priv->button_list->data)->button))) { /* Return if the last button is already visible */ return; @@ -862,7 +862,7 @@ gtk_path_bar_scroll_down (GtkPathBar *path_bar) * visible */ for (list = priv->button_list; list; list = list->next) { - if (list->next && gtk_widget_get_child_visible (BUTTON_DATA (list->next->data)->button)) + if (list->next && gtk_widget_get_child_visible (GTK_WIDGET (BUTTON_DATA (list->next->data)->button))) { down_button = list; break; @@ -870,7 +870,7 @@ gtk_path_bar_scroll_down (GtkPathBar *path_bar) } gtk_widget_get_allocation (GTK_WIDGET (path_bar), &allocation); - gtk_widget_get_allocation (BUTTON_DATA (down_button->data)->button, &button_allocation); + gtk_widget_get_allocation (GTK_WIDGET (BUTTON_DATA (down_button->data)->button), &button_allocation); space_available = (allocation.width - 2 * priv->slider_width @@ -898,7 +898,7 @@ gtk_path_bar_scroll_up (GtkPathBar *path_bar) list = g_list_last (priv->button_list); - if (gtk_widget_get_child_visible (BUTTON_DATA (list->data)->button)) + if (gtk_widget_get_child_visible (GTK_WIDGET (BUTTON_DATA (list->data)->button))) { /* Return if the first button is already visible */ return; @@ -908,7 +908,7 @@ gtk_path_bar_scroll_up (GtkPathBar *path_bar) for ( ; list; list = list->prev) { - if (list->prev && gtk_widget_get_child_visible (BUTTON_DATA (list->prev->data)->button)) + if (list->prev && gtk_widget_get_child_visible (GTK_WIDGET (BUTTON_DATA (list->prev->data)->button))) { if (list->prev == priv->fake_root) priv->fake_root = NULL; @@ -932,7 +932,7 @@ gtk_path_bar_slider_up_defocus (GtkWidget *widget, for (list = g_list_last (priv->button_list); list; list = list->prev) { - if (gtk_widget_get_child_visible (BUTTON_DATA (list->data)->button)) + if (gtk_widget_get_child_visible (GTK_WIDGET (BUTTON_DATA (list->data)->button))) { up_button = list; break; @@ -942,7 +942,7 @@ gtk_path_bar_slider_up_defocus (GtkWidget *widget, /* don't let the focus vanish */ if ((!gtk_widget_is_sensitive (priv->up_slider_button)) || (!gtk_widget_get_child_visible (priv->up_slider_button))) - gtk_widget_grab_focus (BUTTON_DATA (up_button->data)->button); + gtk_widget_grab_focus (GTK_WIDGET (BUTTON_DATA (up_button->data)->button)); return FALSE; } @@ -961,7 +961,7 @@ gtk_path_bar_slider_down_defocus (GtkWidget *widget, for (list = priv->button_list; list; list = list->next) { - if (gtk_widget_get_child_visible (BUTTON_DATA (list->data)->button)) + if (gtk_widget_get_child_visible (GTK_WIDGET (BUTTON_DATA (list->data)->button))) { down_button = list; break; @@ -971,7 +971,7 @@ gtk_path_bar_slider_down_defocus (GtkWidget *widget, /* don't let the focus vanish */ if ((!gtk_widget_is_sensitive (priv->down_slider_button)) || (!gtk_widget_get_child_visible (priv->down_slider_button))) - gtk_widget_grab_focus (BUTTON_DATA (down_button->data)->button); + gtk_widget_grab_focus (GTK_WIDGET (BUTTON_DATA (down_button->data)->button)); return FALSE; } @@ -995,7 +995,7 @@ reload_icons (GtkPathBar *path_bar) button_data = BUTTON_DATA (list->data); if (button_data->type != NORMAL_BUTTON) { - current_dir = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_data->button)); + current_dir = gtk_toggle_button_get_active (button_data->button); gtk_path_bar_update_button_appearance (path_bar, button_data, current_dir); } } @@ -1046,14 +1046,14 @@ gtk_path_bar_clear_buttons (GtkPathBar *path_bar) while (priv->button_list != NULL) { - gtk_container_remove (GTK_CONTAINER (path_bar), BUTTON_DATA (priv->button_list->data)->button); + gtk_container_remove (GTK_CONTAINER (path_bar), GTK_WIDGET (BUTTON_DATA (priv->button_list->data)->button)); } priv->first_scrolled_button = NULL; priv->fake_root = NULL; } static void -button_clicked_cb (GtkWidget *button, +button_clicked_cb (GtkToggleButton *button, gpointer data) { GtkPathBar *path_bar; @@ -1067,7 +1067,7 @@ button_clicked_cb (GtkWidget *button, if (button_data->ignore_changes) return; - path_bar = GTK_PATH_BAR (gtk_widget_get_parent (button)); + path_bar = GTK_PATH_BAR (gtk_widget_get_parent (GTK_WIDGET (button))); priv = gtk_path_bar_get_instance_private (path_bar); button_list = g_list_find (priv->button_list, button_data); @@ -1075,7 +1075,7 @@ button_clicked_cb (GtkWidget *button, g_signal_handlers_block_by_func (button, G_CALLBACK (button_clicked_cb), data); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); + gtk_toggle_button_set_active (button, TRUE); g_signal_handlers_unblock_by_func (button, G_CALLBACK (button_clicked_cb), data); @@ -1132,7 +1132,7 @@ set_button_image_get_info_cb (GCancellable *cancellable, goto out; icon = g_file_info_get_symbolic_icon (info); - gtk_image_set_from_gicon (GTK_IMAGE (data->button_data->image), icon); + gtk_image_set_from_gicon (data->button_data->image, icon); switch (data->button_data->type) { @@ -1168,7 +1168,7 @@ set_button_image (GtkPathBar *path_bar, if (priv->root_icon != NULL) { - gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), priv->root_icon); + gtk_image_set_from_gicon (button_data->image, priv->root_icon); break; } @@ -1178,14 +1178,14 @@ set_button_image (GtkPathBar *path_bar, priv->root_icon = _gtk_file_system_volume_get_symbolic_icon (volume); _gtk_file_system_volume_unref (volume); - gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), priv->root_icon); + gtk_image_set_from_gicon (button_data->image, priv->root_icon); break; case HOME_BUTTON: if (priv->home_icon != NULL) { - gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), priv->home_icon); + gtk_image_set_from_gicon (button_data->image, priv->home_icon); break; } @@ -1210,7 +1210,7 @@ set_button_image (GtkPathBar *path_bar, case DESKTOP_BUTTON: if (priv->desktop_icon != NULL) { - gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), priv->desktop_icon); + gtk_image_set_from_gicon (button_data->image, priv->desktop_icon); break; } @@ -1260,14 +1260,14 @@ gtk_path_bar_update_button_appearance (GtkPathBar *path_bar, const gchar *dir_name = get_dir_name (button_data); GtkStyleContext *context; - context = gtk_widget_get_style_context (button_data->button); + context = gtk_widget_get_style_context (GTK_WIDGET (button_data->button)); gtk_style_context_remove_class (context, "text-button"); gtk_style_context_remove_class (context, "image-button"); if (button_data->label != NULL) { - gtk_label_set_text (GTK_LABEL (button_data->label), dir_name); + gtk_label_set_text (button_data->label, dir_name); if (button_data->image == NULL) gtk_style_context_add_class (context, "text-button"); } @@ -1279,10 +1279,10 @@ gtk_path_bar_update_button_appearance (GtkPathBar *path_bar, gtk_style_context_add_class (context, "image-button"); } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_data->button)) != current_dir) + if (gtk_toggle_button_get_active (button_data->button) != current_dir) { button_data->ignore_changes = TRUE; - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button_data->button), current_dir); + gtk_toggle_button_set_active (button_data->button, current_dir); button_data->ignore_changes = FALSE; } } @@ -1325,14 +1325,14 @@ make_directory_button (GtkPathBar *path_bar, button_data = g_new0 (ButtonData, 1); button_data->type = find_button_type (path_bar, file); button_data->button = gtk_toggle_button_new (); - atk_obj = gtk_widget_get_accessible (button_data->button); - gtk_widget_set_focus_on_click (button_data->button, FALSE); + atk_obj = gtk_widget_get_accessible (GTK_WIDGET (button_data->button)); + gtk_widget_set_focus_on_click (GTK_WIDGET (button_data->button), FALSE); switch (button_data->type) { case ROOT_BUTTON: button_data->image = gtk_image_new (); - child = button_data->image; + child = GTK_WIDGET (button_data->image); button_data->label = NULL; atk_object_set_name (atk_obj, _("File System Root")); break; @@ -1341,13 +1341,13 @@ make_directory_button (GtkPathBar *path_bar, button_data->image = gtk_image_new (); button_data->label = gtk_label_new (NULL); child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_container_add (GTK_CONTAINER (child), button_data->image); - gtk_container_add (GTK_CONTAINER (child), button_data->label); + gtk_container_add (GTK_CONTAINER (child), GTK_WIDGET (button_data->image)); + gtk_container_add (GTK_CONTAINER (child), GTK_WIDGET (button_data->label)); break; case NORMAL_BUTTON: default: button_data->label = gtk_label_new (NULL); - child = button_data->label; + child = GTK_WIDGET (button_data->label); button_data->image = NULL; } @@ -1371,7 +1371,7 @@ make_directory_button (GtkPathBar *path_bar, content = gdk_content_provider_new_for_value (&value); gtk_drag_source_set_content (source, content); g_object_unref (content); - gtk_widget_add_controller (button_data->button, GTK_EVENT_CONTROLLER (source)); + gtk_widget_add_controller (GTK_WIDGET (button_data->button), GTK_EVENT_CONTROLLER (source)); g_value_unset (&value); return button_data; @@ -1425,7 +1425,7 @@ gtk_path_bar_check_parent_path (GtkPathBar *path_bar, (list == current_path) ? TRUE : FALSE); } - if (!gtk_widget_get_child_visible (BUTTON_DATA (current_path->data)->button)) + if (!gtk_widget_get_child_visible (GTK_WIDGET (BUTTON_DATA (current_path->data)->button))) { priv->first_scrolled_button = current_path; gtk_widget_queue_resize (GTK_WIDGET (path_bar)); @@ -1465,13 +1465,13 @@ gtk_path_bar_set_file_finish (struct SetFileInfo *info, for (l = priv->button_list; l; l = l->next) { - GtkWidget *button = BUTTON_DATA (l->data)->button; - GtkCssNode *node = gtk_widget_get_css_node (button); + GtkToggleButton *button = BUTTON_DATA (l->data)->button; + GtkCssNode *node = gtk_widget_get_css_node (GTK_WIDGET (button)); gtk_css_node_insert_before (gtk_widget_get_css_node (GTK_WIDGET (info->path_bar)), node, prev); - gtk_container_add (GTK_CONTAINER (info->path_bar), button); + gtk_container_add (GTK_CONTAINER (info->path_bar), GTK_WIDGET (button)); prev = node; } } @@ -1484,7 +1484,7 @@ gtk_path_bar_set_file_finish (struct SetFileInfo *info, ButtonData *button_data; button_data = BUTTON_DATA (l->data); - gtk_widget_destroy (button_data->button); + gtk_widget_destroy (GTK_WIDGET (button_data->button)); } g_list_free (info->new_buttons); @@ -1660,12 +1660,12 @@ _gtk_path_bar_up (GtkPathBar *path_bar) for (l = priv->button_list; l; l = l->next) { - GtkWidget *button = BUTTON_DATA (l->data)->button; - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) + GtkToggleButton *button = BUTTON_DATA (l->data)->button; + if (gtk_toggle_button_get_active (button)) { if (l->next) { - GtkWidget *next_button = BUTTON_DATA (l->next->data)->button; + GtkToggleButton *next_button = BUTTON_DATA (l->next->data)->button; button_clicked_cb (next_button, l->next->data); } break; @@ -1688,12 +1688,12 @@ _gtk_path_bar_down (GtkPathBar *path_bar) for (l = priv->button_list; l; l = l->next) { - GtkWidget *button = BUTTON_DATA (l->data)->button; - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) + GtkToggleButton *button = BUTTON_DATA (l->data)->button; + if (gtk_toggle_button_get_active (button)) { if (l->prev) { - GtkWidget *prev_button = BUTTON_DATA (l->prev->data)->button; + GtkToggleButton *prev_button = BUTTON_DATA (l->prev->data)->button; button_clicked_cb (prev_button, l->prev->data); } break; diff --git a/gtk/gtkpicture.c b/gtk/gtkpicture.c index 125d37c60b2c28d4ca606f1b1eadaa0877beadd9..368f069194c06dc8ec3c321b9262a766bcb9708b 100644 --- a/gtk/gtkpicture.c +++ b/gtk/gtkpicture.c @@ -43,7 +43,7 @@ * an image from a file, and then display that, there’s a convenience function * to do this: * |[ - * GtkWidget *widget; + * GtkPicture *widget; * widget = gtk_picture_new_for_filename ("myfile.png"); * ]| * If the file isn’t loaded successfully, the picture will contain a @@ -381,7 +381,7 @@ gtk_picture_init (GtkPicture *self) * * Returns: a newly created #GtkPicture widget. **/ -GtkWidget* +GtkPicture* gtk_picture_new (void) { return g_object_new (GTK_TYPE_PICTURE, NULL); @@ -398,7 +398,7 @@ gtk_picture_new (void) * * Returns: a new #GtkPicture **/ -GtkWidget* +GtkPicture* gtk_picture_new_for_paintable (GdkPaintable *paintable) { g_return_val_if_fail (paintable == NULL || GDK_IS_PAINTABLE (paintable), NULL); @@ -421,10 +421,10 @@ gtk_picture_new_for_paintable (GdkPaintable *paintable) * * Returns: a new #GtkPicture **/ -GtkWidget* +GtkPicture* gtk_picture_new_for_pixbuf (GdkPixbuf *pixbuf) { - GtkWidget *result; + GtkPicture *result; GdkPaintable *paintable; g_return_val_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf), NULL); @@ -455,7 +455,7 @@ gtk_picture_new_for_pixbuf (GdkPixbuf *pixbuf) * * Returns: a new #GtkPicture **/ -GtkWidget* +GtkPicture* gtk_picture_new_for_file (GFile *file) { g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL); @@ -476,10 +476,10 @@ gtk_picture_new_for_file (GFile *file) * * Returns: a new #GtkPicture **/ -GtkWidget* +GtkPicture* gtk_picture_new_for_filename (const char *filename) { - GtkWidget *result; + GtkPicture *result; GFile *file; if (filename) @@ -506,10 +506,10 @@ gtk_picture_new_for_filename (const char *filename) * * Returns: a new #GtkPicture **/ -GtkWidget * +GtkPicture * gtk_picture_new_for_resource (const char *resource_path) { - GtkWidget *result; + GtkPicture *result; GFile *file; if (resource_path) diff --git a/gtk/gtkpicture.h b/gtk/gtkpicture.h index b4076365c665a5d88dbdbd74dae06cf196e1e518..d581fb659f480c53852e000a5a0263db288ebc63 100644 --- a/gtk/gtkpicture.h +++ b/gtk/gtkpicture.h @@ -37,17 +37,17 @@ GDK_AVAILABLE_IN_ALL G_DECLARE_FINAL_TYPE (GtkPicture, gtk_picture, GTK, PICTURE, GtkWidget) GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_picture_new (void); +GtkPicture* gtk_picture_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_picture_new_for_paintable (GdkPaintable *paintable); +GtkPicture* gtk_picture_new_for_paintable (GdkPaintable *paintable); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_picture_new_for_pixbuf (GdkPixbuf *pixbuf); +GtkPicture* gtk_picture_new_for_pixbuf (GdkPixbuf *pixbuf); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_picture_new_for_file (GFile *file); +GtkPicture* gtk_picture_new_for_file (GFile *file); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_picture_new_for_filename (const gchar *filename); +GtkPicture* gtk_picture_new_for_filename (const gchar *filename); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_picture_new_for_resource (const gchar *resource_path); +GtkPicture* gtk_picture_new_for_resource (const gchar *resource_path); GDK_AVAILABLE_IN_ALL void gtk_picture_set_paintable (GtkPicture *self, diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index 82c6ddad83b84ec98df7333fc615357445988485..b3d22388c7349f8a7b7b27eb53e58611d3622eb2 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -142,9 +142,9 @@ struct _GtkPlacesSidebar { GFile *current_location; GtkWidget *rename_popover; - GtkWidget *rename_entry; + GtkEntry *rename_entry; GtkWidget *rename_button; - GtkWidget *rename_error; + GtkLabel *rename_error; gchar *rename_uri; gulong trash_monitor_changed_id; @@ -414,7 +414,7 @@ list_box_header_func (GtkListBoxRow *row, { GtkPlacesSidebarSectionType row_section_type; GtkPlacesSidebarSectionType before_section_type; - GtkWidget *separator; + GtkSeparator *separator; gtk_list_box_row_set_header (row, NULL); @@ -432,9 +432,9 @@ list_box_header_func (GtkListBoxRow *row, if (before && before_section_type != row_section_type) { separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_widget_set_margin_top (separator, 4); - gtk_widget_set_margin_bottom (separator, 4); - gtk_list_box_row_set_header (row, separator); + gtk_widget_set_margin_top (GTK_WIDGET (separator), 4); + gtk_widget_set_margin_bottom (GTK_WIDGET (separator), 4); + gtk_list_box_row_set_header (row, GTK_WIDGET (separator)); } } @@ -2544,7 +2544,7 @@ rename_entry_changed (GtkEntry *entry, if (strcmp (new_name, "") == 0) { gtk_widget_set_sensitive (sidebar->rename_button, FALSE); - gtk_label_set_label (GTK_LABEL (sidebar->rename_error), ""); + gtk_label_set_label (sidebar->rename_error, ""); return; } @@ -2568,7 +2568,7 @@ rename_entry_changed (GtkEntry *entry, g_list_free (rows); gtk_widget_set_sensitive (sidebar->rename_button, !found); - gtk_label_set_label (GTK_LABEL (sidebar->rename_error), + gtk_label_set_label (sidebar->rename_error, found ? _("This name is already taken") : ""); } @@ -2614,10 +2614,10 @@ create_rename_popover (GtkPlacesSidebar *sidebar) { GtkWidget *popover; GtkWidget *grid; - GtkWidget *label; - GtkWidget *entry; + GtkLabel *label; + GtkEntry *entry; GtkWidget *button; - GtkWidget *error; + GtkLabel *error; gchar *str; if (sidebar->rename_popover) @@ -2636,23 +2636,23 @@ create_rename_popover (GtkPlacesSidebar *sidebar) "column-spacing", 6, NULL); entry = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + gtk_entry_set_activates_default (entry, TRUE); g_signal_connect (entry, "changed", G_CALLBACK (rename_entry_changed), sidebar); str = g_strdup_printf ("%s", _("Name")); label = gtk_label_new (str); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_label_set_use_markup (label, TRUE); + gtk_label_set_mnemonic_widget (label, GTK_WIDGET (entry)); g_free (str); button = gtk_button_new_with_mnemonic (_("_Rename")); gtk_style_context_add_class (gtk_widget_get_style_context (button), "suggested-action"); g_signal_connect (button, "clicked", G_CALLBACK (do_rename), sidebar); error = gtk_label_new (""); - gtk_widget_set_halign (error, GTK_ALIGN_START); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 2, 1); - gtk_grid_attach (GTK_GRID (grid), entry, 0, 1, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (error), GTK_ALIGN_START); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 2, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (entry), 0, 1, 1, 1); gtk_grid_attach (GTK_GRID (grid), button,1, 1, 1, 1); - gtk_grid_attach (GTK_GRID (grid), error, 0, 2, 2, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (error), 0, 2, 2, 1); gtk_popover_set_default_widget (GTK_POPOVER (popover), button); sidebar->rename_popover = popover; @@ -2732,7 +2732,7 @@ show_rename_popover (GtkSidebarRow *row) setup_popover_shadowing (sidebar->rename_popover); gtk_popover_popup (GTK_POPOVER (sidebar->rename_popover)); - gtk_widget_grab_focus (sidebar->rename_entry); + gtk_widget_grab_focus (GTK_WIDGET (sidebar->rename_entry)); g_free (name); g_free (uri); diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c index c6915d1d55b30a3311a2d392535a0d89a67d2672..eb4cea7cf975df19644060f6f6e79055cd7e1137 100644 --- a/gtk/gtkplacesview.c +++ b/gtk/gtkplacesview.c @@ -77,7 +77,7 @@ struct _GtkPlacesViewPrivate GtkWidget *server_adresses_popover; GtkWidget *available_protocols_grid; GtkWidget *network_placeholder; - GtkWidget *network_placeholder_label; + GtkLabel *network_placeholder_label; GtkSizeGroup *path_size_group; GtkSizeGroup *space_size_group; @@ -571,7 +571,7 @@ populate_servers (GtkPlacesView *view) GtkWidget *row; GtkWidget *grid; GtkWidget *button; - GtkWidget *label; + GtkLabel *label; gchar *name; gchar *dup_uri; @@ -595,18 +595,18 @@ populate_servers (GtkPlacesView *view) /* name of the connected uri, if any */ label = gtk_label_new (name); - gtk_widget_set_hexpand (label, TRUE); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_container_add (GTK_CONTAINER (grid), label); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_label_set_xalign (label, 0.0); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); + gtk_container_add (GTK_CONTAINER (grid), GTK_WIDGET (label)); /* the uri itself */ label = gtk_label_new (uris[i]); - gtk_widget_set_hexpand (label, TRUE); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "dim-label"); - gtk_container_add (GTK_CONTAINER (grid), label); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_label_set_xalign (label, 0.0); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "dim-label"); + gtk_container_add (GTK_CONTAINER (grid), GTK_WIDGET (label)); /* remove button */ button = gtk_button_new_from_icon_name ("window-close-symbolic"); @@ -872,15 +872,15 @@ update_network_state (GtkPlacesView *view) { priv->network_placeholder = gtk_list_box_row_new (); priv->network_placeholder_label = gtk_label_new (""); - gtk_label_set_xalign (GTK_LABEL (priv->network_placeholder_label), 0.0); - gtk_widget_set_margin_start (priv->network_placeholder_label, 12); - gtk_widget_set_margin_end (priv->network_placeholder_label, 12); - gtk_widget_set_margin_top (priv->network_placeholder_label, 6); - gtk_widget_set_margin_bottom (priv->network_placeholder_label, 6); - gtk_widget_set_hexpand (priv->network_placeholder_label, TRUE); + gtk_label_set_xalign (priv->network_placeholder_label, 0.0); + gtk_widget_set_margin_start (GTK_WIDGET (priv->network_placeholder_label), 12); + gtk_widget_set_margin_end (GTK_WIDGET (priv->network_placeholder_label), 12); + gtk_widget_set_margin_top (GTK_WIDGET (priv->network_placeholder_label), 6); + gtk_widget_set_margin_bottom (GTK_WIDGET (priv->network_placeholder_label), 6); + gtk_widget_set_hexpand (GTK_WIDGET (GTK_WIDGET (priv->network_placeholder_label)), TRUE); gtk_widget_set_sensitive (priv->network_placeholder, FALSE); gtk_container_add (GTK_CONTAINER (priv->network_placeholder), - priv->network_placeholder_label); + GTK_WIDGET (priv->network_placeholder_label)); g_object_set_data (G_OBJECT (priv->network_placeholder), "is-network", GINT_TO_POINTER (TRUE)); /* mark the row as placeholder, so it always goes first */ @@ -896,14 +896,14 @@ update_network_state (GtkPlacesView *view) if (!has_networks (view)) { gtk_widget_show (priv->network_placeholder); - gtk_label_set_text (GTK_LABEL (priv->network_placeholder_label), + gtk_label_set_text (priv->network_placeholder_label, _("Searching for network locations")); } } else if (!has_networks (view)) { gtk_widget_show (priv->network_placeholder); - gtk_label_set_text (GTK_LABEL (priv->network_placeholder_label), + gtk_label_set_text (priv->network_placeholder_label, _("No network locations found")); } else @@ -1614,16 +1614,16 @@ attach_protocol_row_to_grid (GtkGrid *grid, const gchar *protocol_name, const gchar *protocol_prefix) { - GtkWidget *name_label; - GtkWidget *prefix_label; + GtkLabel *name_label; + GtkLabel *prefix_label; name_label = gtk_label_new (protocol_name); - gtk_widget_set_halign (name_label, GTK_ALIGN_START); - gtk_grid_attach_next_to (grid, name_label, NULL, GTK_POS_BOTTOM, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (name_label), GTK_ALIGN_START); + gtk_grid_attach_next_to (grid, GTK_WIDGET (name_label), NULL, GTK_POS_BOTTOM, 1, 1); prefix_label = gtk_label_new (protocol_prefix); - gtk_widget_set_halign (prefix_label, GTK_ALIGN_START); - gtk_grid_attach_next_to (grid, prefix_label, name_label, GTK_POS_RIGHT, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (prefix_label), GTK_ALIGN_START); + gtk_grid_attach_next_to (grid, GTK_WIDGET (prefix_label), GTK_WIDGET (name_label), GTK_POS_RIGHT, 1, 1); } static void @@ -2078,8 +2078,8 @@ listbox_header_func (GtkListBoxRow *row, if (text) { GtkWidget *header; - GtkWidget *label; - GtkWidget *separator; + GtkLabel *label; + GtkSeparator *separator; header = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_set_margin_top (header, 6); @@ -2097,7 +2097,7 @@ listbox_header_func (GtkListBoxRow *row, GtkWidget *header_name; GtkWidget *network_header_spinner; - gtk_widget_set_margin_end (label, 6); + gtk_widget_set_margin_end (GTK_WIDGET (label), 6); header_name = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); network_header_spinner = gtk_spinner_new (); @@ -2108,18 +2108,18 @@ listbox_header_func (GtkListBoxRow *row, "active", G_BINDING_SYNC_CREATE); - gtk_container_add (GTK_CONTAINER (header_name), label); + gtk_container_add (GTK_CONTAINER (header_name), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (header_name), network_header_spinner); gtk_container_add (GTK_CONTAINER (header), header_name); } else { - gtk_widget_set_hexpand (label, TRUE); - gtk_widget_set_margin_end (label, 12); - gtk_container_add (GTK_CONTAINER (header), label); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_set_margin_end (GTK_WIDGET (label), 12); + gtk_container_add (GTK_CONTAINER (header), GTK_WIDGET (label)); } - gtk_container_add (GTK_CONTAINER (header), separator); + gtk_container_add (GTK_CONTAINER (header), GTK_WIDGET (separator)); gtk_list_box_row_set_header (row, header); diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c index cc2a733af1ff0ac7496682bdfda6e2a4471b6139..0554e4da1f128daee4858152f53332981f8ba7c4 100644 --- a/gtk/gtkprintbackend.c +++ b/gtk/gtkprintbackend.c @@ -637,7 +637,11 @@ request_password (GtkPrintBackend *backend, gboolean can_store_auth_info) { GtkPrintBackendPrivate *priv = backend->priv; - GtkWidget *dialog, *box, *main_box, *label, *icon, *vbox, *entry, *chkbtn; + GtkWidget *dialog, *box, *main_box, *vbox; + GtkCheckButton *chkbtn; + GtkEntry *entry; + GtkImage *icon; + GtkLabel *label; GtkWidget *focus = NULL; GtkWidget *content_area; gchar *markup; @@ -664,9 +668,9 @@ request_password (GtkPrintBackend *backend, /* Left */ icon = gtk_image_new_from_icon_name ("dialog-password-symbolic"); - gtk_image_set_icon_size (GTK_IMAGE (icon), GTK_ICON_SIZE_LARGE); - gtk_widget_set_halign (icon, GTK_ALIGN_CENTER); - gtk_widget_set_valign (icon, GTK_ALIGN_START); + gtk_image_set_icon_size (icon, GTK_ICON_SIZE_LARGE); + gtk_widget_set_halign (GTK_WIDGET (icon), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (icon), GTK_ALIGN_START); g_object_set (icon, "margin", 12, NULL); /* Right */ @@ -676,8 +680,8 @@ request_password (GtkPrintBackend *backend, /* Right - 1. */ label = gtk_label_new (NULL); markup = g_markup_printf_escaped ("%s", prompt); - gtk_label_set_markup (GTK_LABEL (label), markup); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); + gtk_label_set_markup (label, markup); + gtk_label_set_wrap (label, TRUE); gtk_widget_set_size_request (GTK_WIDGET (label), 320, -1); g_free (markup); @@ -686,10 +690,10 @@ request_password (GtkPrintBackend *backend, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_container_add (GTK_CONTAINER (content_area), main_box); - gtk_container_add (GTK_CONTAINER (main_box), icon); + gtk_container_add (GTK_CONTAINER (main_box), GTK_WIDGET (icon)); gtk_container_add (GTK_CONTAINER (main_box), vbox); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); /* Right - 2. */ for (i = 0; i < length; i++) @@ -703,22 +707,22 @@ request_password (GtkPrintBackend *backend, gtk_widget_set_margin_bottom (box, 6); label = gtk_label_new (ai_display[i]); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); entry = gtk_entry_new (); - focus = entry; + focus = GTK_WIDGET (entry); if (ai_default[i] != NULL) gtk_editable_set_text (GTK_EDITABLE (entry), ai_default[i]); - gtk_entry_set_visibility (GTK_ENTRY (entry), ai_visible[i]); - gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + gtk_entry_set_visibility (entry, ai_visible[i]); + gtk_entry_set_activates_default (entry, TRUE); gtk_container_add (GTK_CONTAINER (vbox), box); - gtk_container_add (GTK_CONTAINER (box), label); - gtk_container_add (GTK_CONTAINER (box), entry); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (entry)); g_signal_connect (entry, "changed", G_CALLBACK (store_entry), &(priv->auth_info[i])); @@ -728,10 +732,10 @@ request_password (GtkPrintBackend *backend, if (can_store_auth_info) { chkbtn = gtk_check_button_new_with_mnemonic (_("_Remember password")); - gtk_widget_set_margin_top (chkbtn, 6); - gtk_widget_set_margin_bottom (chkbtn, 6); + gtk_widget_set_margin_top (GTK_WIDGET (chkbtn), 6); + gtk_widget_set_margin_bottom (GTK_WIDGET (chkbtn), 6); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkbtn), FALSE); - gtk_container_add (GTK_CONTAINER (vbox), chkbtn); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (chkbtn)); g_signal_connect (chkbtn, "toggled", G_CALLBACK (store_auth_info_toggled), &(priv->store_auth_info)); diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c index 13e8558beb0508a6e4b4189e2428da1b04b3bb44..770a9c49e276307d38c5f2bb0d5ce4c57dfc7fe9 100644 --- a/gtk/gtkprinteroptionwidget.c +++ b/gtk/gtkprinteroptionwidget.c @@ -58,12 +58,12 @@ struct GtkPrinterOptionWidgetPrivate GtkPrinterOption *source; gulong source_changed_handler; - GtkWidget *check; - GtkWidget *combo; - GtkWidget *entry; - GtkWidget *image; - GtkWidget *label; - GtkWidget *info_label; + GtkCheckButton *check; + GtkComboBox *combo; + GtkEntry *entry; + GtkImage *image; + GtkLabel *label; + GtkLabel *info_label; GtkWidget *box; GtkWidget *button; @@ -204,11 +204,11 @@ gtk_printer_option_widget_mnemonic_activate (GtkWidget *widget, GtkPrinterOptionWidgetPrivate *priv = powidget->priv; if (priv->check) - return gtk_widget_mnemonic_activate (priv->check, group_cycling); + return gtk_widget_mnemonic_activate (GTK_WIDGET (priv->check), group_cycling); if (priv->combo) - return gtk_widget_mnemonic_activate (priv->combo, group_cycling); + return gtk_widget_mnemonic_activate (GTK_WIDGET (priv->combo), group_cycling); if (priv->entry) - return gtk_widget_mnemonic_activate (priv->entry, group_cycling); + return gtk_widget_mnemonic_activate (GTK_WIDGET (priv->entry), group_cycling); if (priv->button) return gtk_widget_mnemonic_activate (priv->button, group_cycling); @@ -270,17 +270,17 @@ enum { }; static void -combo_box_set_model (GtkWidget *combo_box) +combo_box_set_model (GtkComboBox *combo_box) { GtkListStore *store; store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING); - gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store)); + gtk_combo_box_set_model (combo_box, GTK_TREE_MODEL (store)); g_object_unref (store); } static void -combo_box_set_view (GtkWidget *combo_box) +combo_box_set_view (GtkComboBox *combo_box) { GtkCellRenderer *cell; @@ -291,23 +291,23 @@ combo_box_set_view (GtkWidget *combo_box) NULL); } -static GtkWidget * +static GtkComboBox * combo_box_entry_new (void) { - GtkWidget *combo_box; + GtkComboBox *combo_box; combo_box = g_object_new (GTK_TYPE_COMBO_BOX, "has-entry", TRUE, NULL); combo_box_set_model (combo_box); - gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combo_box), NAME_COLUMN); + gtk_combo_box_set_entry_text_column (combo_box, NAME_COLUMN); return combo_box; } -static GtkWidget * +static GtkComboBox * combo_box_new (void) { - GtkWidget *combo_box; + GtkComboBox *combo_box; combo_box = gtk_combo_box_new (); combo_box_set_model (combo_box); @@ -317,7 +317,7 @@ combo_box_new (void) } static void -combo_box_append (GtkWidget *combo, +combo_box_append (GtkComboBox *combo, const gchar *display_text, const gchar *value) { @@ -325,7 +325,7 @@ combo_box_append (GtkWidget *combo, GtkListStore *store; GtkTreeIter iter; - model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); + model = gtk_combo_box_get_model (combo); store = GTK_LIST_STORE (model); gtk_list_store_append (store, &iter); @@ -361,37 +361,37 @@ set_cb (GtkTreeModel *model, } static void -combo_box_set (GtkWidget *combo, +combo_box_set (GtkComboBox *combo, const gchar *value) { GtkTreeModel *model; struct ComboSet set_data; - model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); + model = gtk_combo_box_get_model (combo); - set_data.combo = GTK_COMBO_BOX (combo); + set_data.combo = combo; set_data.value = value; gtk_tree_model_foreach (model, set_cb, &set_data); } static gchar * -combo_box_get (GtkWidget *combo, gboolean *custom) +combo_box_get (GtkComboBox *combo, gboolean *custom) { GtkTreeModel *model; gchar *value; GtkTreeIter iter; - model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); + model = gtk_combo_box_get_model (combo); value = NULL; - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) + if (gtk_combo_box_get_active_iter (combo, &iter)) { gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1); *custom = FALSE; } else { - if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (combo))) + if (gtk_combo_box_get_has_entry (combo)) { value = g_strdup (gtk_editable_get_text (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (combo))))); *custom = TRUE; @@ -432,36 +432,36 @@ deconstruct_widgets (GtkPrinterOptionWidget *widget) if (priv->check) { - gtk_widget_destroy (priv->check); + gtk_widget_destroy (GTK_WIDGET (priv->check)); priv->check = NULL; } if (priv->combo) { - gtk_widget_destroy (priv->combo); + gtk_widget_destroy (GTK_WIDGET (priv->combo)); priv->combo = NULL; } if (priv->entry) { - gtk_widget_destroy (priv->entry); + gtk_widget_destroy (GTK_WIDGET (priv->entry)); priv->entry = NULL; } if (priv->image) { - gtk_widget_destroy (priv->image); + gtk_widget_destroy (GTK_WIDGET (priv->image)); priv->image = NULL; } if (priv->label) { - gtk_widget_destroy (priv->label); + gtk_widget_destroy (GTK_WIDGET (priv->label)); priv->label = NULL; } if (priv->info_label) { - gtk_widget_destroy (priv->info_label); + gtk_widget_destroy (GTK_WIDGET (priv->info_label)); priv->info_label = NULL; } } @@ -532,7 +532,7 @@ filesave_choose_cb (GtkWidget *button, { GtkPrinterOptionWidgetPrivate *priv = widget->priv; gchar *last_location = NULL; - GtkWidget *dialog; + GtkFileChooserDialog *dialog; GtkWindow *toplevel; /* this will be unblocked in the dialog_response_callback function */ @@ -623,7 +623,7 @@ filter_numeric (const gchar *val, } static void -combo_changed_cb (GtkWidget *combo, +combo_changed_cb (GtkComboBox *combo, GtkPrinterOptionWidget *widget) { GtkPrinterOptionWidgetPrivate *priv = widget->priv; @@ -775,18 +775,18 @@ construct_widgets (GtkPrinterOptionWidget *widget) { priv->combo = combo_box_new (); combo_box_append (priv->combo,_("Not available"), "None"); - gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combo), 0); + gtk_combo_box_set_active (priv->combo, 0); gtk_widget_set_sensitive (GTK_WIDGET (widget), FALSE); - gtk_widget_show (priv->combo); - gtk_container_add (GTK_CONTAINER (widget), priv->combo); + gtk_widget_show (GTK_WIDGET (priv->combo)); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->combo)); } else switch (source->type) { case GTK_PRINTER_OPTION_TYPE_BOOLEAN: priv->check = gtk_check_button_new_with_mnemonic (source->display_text); g_signal_connect (priv->check, "toggled", G_CALLBACK (check_toggled_cb), widget); - gtk_widget_show (priv->check); - gtk_container_add (GTK_CONTAINER (widget), priv->check); + gtk_widget_show (GTK_WIDGET (priv->check)); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->check)); break; case GTK_PRINTER_OPTION_TYPE_PICKONE: case GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD: @@ -817,14 +817,14 @@ construct_widgets (GtkPrinterOptionWidget *widget) combo_box_append (priv->combo, source->choices_display[i], source->choices[i]); - gtk_widget_show (priv->combo); - gtk_container_add (GTK_CONTAINER (widget), priv->combo); + gtk_widget_show (GTK_WIDGET (priv->combo)); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->combo)); g_signal_connect (priv->combo, "changed", G_CALLBACK (combo_changed_cb), widget); text = g_strdup_printf ("%s:", source->display_text); priv->label = gtk_label_new_with_mnemonic (text); g_free (text); - gtk_widget_show (priv->label); + gtk_widget_show (GTK_WIDGET (priv->label)); break; case GTK_PRINTER_OPTION_TYPE_ALTERNATIVE: @@ -849,24 +849,24 @@ construct_widgets (GtkPrinterOptionWidget *widget) { text = g_strdup_printf ("%s:", source->display_text); priv->label = gtk_label_new_with_mnemonic (text); - gtk_widget_set_valign (priv->label, GTK_ALIGN_BASELINE); + gtk_widget_set_valign (GTK_WIDGET (priv->label), GTK_ALIGN_BASELINE); g_free (text); - gtk_widget_show (priv->label); + gtk_widget_show (GTK_WIDGET (priv->label)); } break; case GTK_PRINTER_OPTION_TYPE_STRING: priv->entry = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (priv->entry), + gtk_entry_set_activates_default (priv->entry, gtk_printer_option_get_activates_default (source)); - gtk_widget_show (priv->entry); - gtk_container_add (GTK_CONTAINER (widget), priv->entry); + gtk_widget_show (GTK_WIDGET (priv->entry)); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->entry)); g_signal_connect (priv->entry, "changed", G_CALLBACK (entry_changed_cb), widget); text = g_strdup_printf ("%s:", source->display_text); priv->label = gtk_label_new_with_mnemonic (text); g_free (text); - gtk_widget_show (priv->label); + gtk_widget_show (GTK_WIDGET (priv->label)); break; @@ -879,14 +879,14 @@ construct_widgets (GtkPrinterOptionWidget *widget) text = g_strdup_printf ("%s:", source->display_text); priv->label = gtk_label_new_with_mnemonic (text); g_free (text); - gtk_widget_show (priv->label); + gtk_widget_show (GTK_WIDGET (priv->label)); break; case GTK_PRINTER_OPTION_TYPE_INFO: priv->info_label = gtk_label_new (NULL); - gtk_label_set_selectable (GTK_LABEL (priv->info_label), TRUE); - gtk_container_add (GTK_CONTAINER (widget), priv->info_label); + gtk_label_set_selectable (priv->info_label, TRUE); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->info_label)); text = g_strdup_printf ("%s:", source->display_text); priv->label = gtk_label_new_with_mnemonic (text); @@ -899,7 +899,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) } priv->image = gtk_image_new_from_icon_name ("dialog-warning"); - gtk_container_add (GTK_CONTAINER (widget), priv->image); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->image)); } /* @@ -951,7 +951,7 @@ update_widgets (GtkPrinterOptionWidget *widget) if (source == NULL) { - gtk_widget_hide (priv->image); + gtk_widget_hide (GTK_WIDGET (priv->image)); return; } @@ -1014,16 +1014,16 @@ update_widgets (GtkPrinterOptionWidget *widget) break; } case GTK_PRINTER_OPTION_TYPE_INFO: - gtk_label_set_text (GTK_LABEL (priv->info_label), source->value); + gtk_label_set_text (priv->info_label, source->value); break; default: break; } if (source->has_conflict) - gtk_widget_show (priv->image); + gtk_widget_show (GTK_WIDGET (priv->image)); else - gtk_widget_hide (priv->image); + gtk_widget_hide (GTK_WIDGET (priv->image)); } gboolean @@ -1035,7 +1035,7 @@ gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *widget) GtkWidget * gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *widget) { - return widget->priv->label; + return GTK_WIDGET (widget->priv->label); } const gchar * diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c index 16ca75cf1bd4c48f7621a668fea36fb3176d16b4..938d8bb0426b3e62cef4b9412bd4730b6dfafa30 100644 --- a/gtk/gtkprintoperation-unix.c +++ b/gtk/gtkprintoperation-unix.c @@ -425,12 +425,12 @@ print_setup_changed_cb (GtkPrintUnixDialog *print_dialog, print_settings); } -static GtkWidget * +static GtkPrintUnixDialog * get_print_dialog (GtkPrintOperation *op, GtkWindow *parent) { GtkPrintOperationPrivate *priv = op->priv; - GtkWidget *pd, *label; + GtkPrintUnixDialog *pd; const gchar *custom_tab_label; pd = gtk_print_unix_dialog_new (NULL, parent); @@ -446,23 +446,23 @@ get_print_dialog (GtkPrintOperation *op, GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT); if (priv->print_settings) - gtk_print_unix_dialog_set_settings (GTK_PRINT_UNIX_DIALOG (pd), + gtk_print_unix_dialog_set_settings (pd, priv->print_settings); if (priv->default_page_setup) - gtk_print_unix_dialog_set_page_setup (GTK_PRINT_UNIX_DIALOG (pd), + gtk_print_unix_dialog_set_page_setup (pd, priv->default_page_setup); - gtk_print_unix_dialog_set_embed_page_setup (GTK_PRINT_UNIX_DIALOG (pd), + gtk_print_unix_dialog_set_embed_page_setup (pd, priv->embed_page_setup); - gtk_print_unix_dialog_set_current_page (GTK_PRINT_UNIX_DIALOG (pd), + gtk_print_unix_dialog_set_current_page (pd, priv->current_page); - gtk_print_unix_dialog_set_support_selection (GTK_PRINT_UNIX_DIALOG (pd), + gtk_print_unix_dialog_set_support_selection (pd, priv->support_selection); - gtk_print_unix_dialog_set_has_selection (GTK_PRINT_UNIX_DIALOG (pd), + gtk_print_unix_dialog_set_has_selection (pd, priv->has_selection); g_signal_emit_by_name (op, "create-custom-widget", @@ -470,6 +470,8 @@ get_print_dialog (GtkPrintOperation *op, if (priv->custom_widget) { + GtkLabel *label; + custom_tab_label = priv->custom_tab_label; if (custom_tab_label == NULL) @@ -481,8 +483,8 @@ get_print_dialog (GtkPrintOperation *op, label = gtk_label_new (custom_tab_label); - gtk_print_unix_dialog_add_custom_tab (GTK_PRINT_UNIX_DIALOG (pd), - priv->custom_widget, label); + gtk_print_unix_dialog_add_custom_tab (pd, + priv->custom_widget, GTK_WIDGET (label)); g_signal_connect (pd, "notify::selected-printer", (GCallback) print_setup_changed_cb, op); g_signal_connect (pd, "notify::page-setup", (GCallback) print_setup_changed_cb, op); @@ -621,7 +623,7 @@ handle_print_response (GtkWidget *dialog, if (response == GTK_RESPONSE_OK) { - printer = gtk_print_unix_dialog_get_selected_printer (GTK_PRINT_UNIX_DIALOG (pd)); + printer = gtk_print_unix_dialog_get_selected_printer (pd); rdata->result = GTK_PRINT_OPERATION_RESULT_APPLY; rdata->do_preview = FALSE; @@ -640,9 +642,9 @@ handle_print_response (GtkWidget *dialog, if (rdata->do_print) { - settings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG (pd)); - page_setup = gtk_print_unix_dialog_get_page_setup (GTK_PRINT_UNIX_DIALOG (pd)); - page_setup_set = gtk_print_unix_dialog_get_page_setup_set (GTK_PRINT_UNIX_DIALOG (pd)); + settings = gtk_print_unix_dialog_get_settings (pd); + page_setup = gtk_print_unix_dialog_get_page_setup (pd); + page_setup_set = gtk_print_unix_dialog_get_page_setup_set (pd); /* Set new print settings now so that custom-widget options * can be added to the settings in the callback @@ -708,7 +710,7 @@ gtk_print_operation_unix_run_dialog_async (GtkPrintOperation *op, GtkWindow *parent, GtkPrintOperationPrintFunc print_cb) { - GtkWidget *pd; + GtkPrintUnixDialog *pd; PrintResponseData *rdata; const gchar *printer_name; @@ -727,7 +729,7 @@ gtk_print_operation_unix_run_dialog_async (GtkPrintOperation *op, pd = get_print_dialog (op, parent); gtk_window_set_modal (GTK_WINDOW (pd), TRUE); - g_signal_connect (pd, "response", + g_signal_connect (pd, "response", G_CALLBACK (handle_print_response), rdata); G_GNUC_BEGIN_IGNORE_DEPRECATIONS @@ -849,7 +851,7 @@ gtk_print_operation_unix_run_dialog (GtkPrintOperation *op, GtkWindow *parent, gboolean *do_print) { - GtkWidget *pd; + GtkPrintUnixDialog *pd; PrintResponseData rdata; gint response; const gchar *printer_name; @@ -868,7 +870,7 @@ gtk_print_operation_unix_run_dialog (GtkPrintOperation *op, pd = get_print_dialog (op, parent); response = gtk_dialog_run (GTK_DIALOG (pd)); - handle_print_response (pd, response, &rdata); + handle_print_response (GTK_WIDGET (pd), response, &rdata); } else { @@ -911,18 +913,16 @@ page_setup_data_free (gpointer data) } static void -handle_page_setup_response (GtkWidget *dialog, +handle_page_setup_response (GtkPageSetupUnixDialog *psd, gint response, gpointer data) { - GtkPageSetupUnixDialog *psd; PageSetupResponseData *rdata = data; - psd = GTK_PAGE_SETUP_UNIX_DIALOG (dialog); if (response == GTK_RESPONSE_OK) rdata->page_setup = gtk_page_setup_unix_dialog_get_page_setup (psd); - gtk_widget_destroy (dialog); + gtk_widget_destroy (GTK_WIDGET (psd)); if (rdata->done_cb) rdata->done_cb (rdata->page_setup, rdata->data); @@ -931,12 +931,12 @@ handle_page_setup_response (GtkWidget *dialog, rdata->destroy (rdata); } -static GtkWidget * +static GtkPageSetupUnixDialog * get_page_setup_dialog (GtkWindow *parent, GtkPageSetup *page_setup, GtkPrintSettings *settings) { - GtkWidget *dialog; + GtkPageSetupUnixDialog *dialog; dialog = gtk_page_setup_unix_dialog_new (NULL, parent); if (page_setup) @@ -970,7 +970,7 @@ gtk_print_run_page_setup_dialog (GtkWindow *parent, GtkPageSetup *page_setup, GtkPrintSettings *settings) { - GtkWidget *dialog; + GtkPageSetupUnixDialog *dialog; gint response; PageSetupResponseData rdata; @@ -1013,7 +1013,7 @@ gtk_print_run_page_setup_dialog_async (GtkWindow *parent, GtkPageSetupDoneFunc done_cb, gpointer data) { - GtkWidget *dialog; + GtkPageSetupUnixDialog *dialog; PageSetupResponseData *rdata; dialog = get_page_setup_dialog (parent, page_setup, settings); diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 4028aedde547bfec95082e0764bc23228850599c..854bf5fd2070c5d7a8cb0a8b7af5ef3d4a982d03 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -1299,20 +1299,21 @@ static GtkWidget * wrap_in_frame (const gchar *label, GtkWidget *child) { - GtkWidget *frame, *label_widget; + GtkLabel *label_widget; + GtkWidget *frame; gchar *bold_text; label_widget = gtk_label_new (NULL); - gtk_widget_set_halign (label_widget, GTK_ALIGN_START); - gtk_widget_set_valign (label_widget, GTK_ALIGN_CENTER); - gtk_widget_show (label_widget); + gtk_widget_set_halign (GTK_WIDGET (label_widget), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label_widget), GTK_ALIGN_CENTER); + gtk_widget_show (GTK_WIDGET (label_widget)); bold_text = g_markup_printf_escaped ("%s", label); - gtk_label_set_markup (GTK_LABEL (label_widget), bold_text); + gtk_label_set_markup (label_widget, bold_text); g_free (bold_text); frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - gtk_container_add (GTK_CONTAINER (frame), label_widget); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label_widget)); gtk_widget_set_margin_start (child, 12); gtk_widget_set_halign (child, GTK_ALIGN_FILL); @@ -3337,7 +3338,7 @@ paper_size_changed (GtkComboBox *combo_box, if (page_setup == NULL) { - GtkWidget *custom_paper_dialog; + GtkCustomPaperUnixDialog *custom_paper_dialog; /* Change from "manage" menu item to last value */ if (priv->page_setup) @@ -3418,11 +3419,11 @@ page_name_func (GtkCellLayout *cell_layout, * * Returns: a new #GtkPrintUnixDialog */ -GtkWidget * +GtkPrintUnixDialog * gtk_print_unix_dialog_new (const gchar *title, GtkWindow *parent) { - GtkWidget *result; + GtkPrintUnixDialog *result; result = g_object_new (GTK_TYPE_PRINT_UNIX_DIALOG, "transient-for", parent, diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h index 5addb0dc9befe2af88f769606bd392ef5ead1ddc..54f842409e7a523b6e4ae2df4114f608c13a6a3d 100644 --- a/gtk/gtkprintunixdialog.h +++ b/gtk/gtkprintunixdialog.h @@ -39,7 +39,7 @@ typedef struct _GtkPrintUnixDialog GtkPrintUnixDialog; GDK_AVAILABLE_IN_ALL GType gtk_print_unix_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_print_unix_dialog_new (const gchar *title, +GtkPrintUnixDialog * gtk_print_unix_dialog_new (const gchar *title, GtkWindow *parent); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 541dbf71a256e16ce39417b7d8c0a54ecca5186a..15221cf1db3ca571dda72de92a78a9d54ece4b8a 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -108,7 +108,7 @@ typedef struct { gchar *text; - GtkWidget *label; + GtkLabel *label; GtkWidget *trough_widget; GtkWidget *progress_widget; @@ -582,7 +582,7 @@ gtk_progress_bar_finalize (GObject *object) g_free (priv->text); - g_clear_pointer (&priv->label, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->label, gtk_widget_unparent); gtk_widget_unparent (priv->progress_widget); gtk_widget_unparent (priv->trough_widget); @@ -755,7 +755,7 @@ gtk_progress_bar_set_fraction (GtkProgressBar *pbar, if (priv->label) { char *text = get_current_text (pbar); - gtk_label_set_label (GTK_LABEL (priv->label), text); + gtk_label_set_label (priv->label, text); g_free (text); } @@ -831,7 +831,7 @@ gtk_progress_bar_set_text (GtkProgressBar *pbar, priv->text = g_strdup (text); if (priv->label) - gtk_label_set_label (GTK_LABEL (priv->label), text); + gtk_label_set_label (priv->label, text); gtk_widget_queue_resize (GTK_WIDGET (pbar)); @@ -876,13 +876,13 @@ gtk_progress_bar_set_show_text (GtkProgressBar *pbar, "label", text, "ellipsize", priv->ellipsize, NULL); - gtk_widget_insert_after (priv->label, GTK_WIDGET (pbar), NULL); + gtk_widget_insert_after (GTK_WIDGET (priv->label), GTK_WIDGET (pbar), NULL); g_free (text); } else { - g_clear_pointer (&priv->label, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->label, gtk_widget_unparent); } gtk_widget_queue_resize (GTK_WIDGET (pbar)); @@ -1104,7 +1104,7 @@ gtk_progress_bar_set_ellipsize (GtkProgressBar *pbar, priv->ellipsize = mode; if (priv->label) - gtk_label_set_ellipsize (GTK_LABEL (priv->label), mode); + gtk_label_set_ellipsize (priv->label, mode); g_object_notify_by_pspec (G_OBJECT (pbar), progress_props[PROP_ELLIPSIZE]); gtk_widget_queue_resize (GTK_WIDGET (pbar)); diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 712c49010e0f86e3cd9390aaa5ceb7b455c97a5f..d880f12ac99b69dec18657ccc2d0045aa1d1ef4f 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -96,7 +96,8 @@ * |[ * void create_radio_buttons (void) { * - * GtkWidget *window, *radio1, *radio2, *box, *entry; + * GtkWidget *window, *radio1, *radio2, *box; + * GtkEntry *entry; * window = gtk_window_new (GTK_WINDOW_TOPLEVEL); * box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); * gtk_box_set_homogeneous (GTK_BOX (box), TRUE); @@ -104,7 +105,7 @@ * // Create a radio button with a GtkEntry widget * radio1 = gtk_radio_button_new (NULL); * entry = gtk_entry_new (); - * gtk_container_add (GTK_CONTAINER (radio1), entry); + * gtk_container_add (GTK_CONTAINER (radio1), GTK_WIDGET (entry)); * * * // Create a radio button with a label diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 918ecb3bbb9b3d661450eaa98cb2952e22342317..dc577e9d9d99b73927ec1987da332959ada7e14e 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -142,7 +142,7 @@ struct _GtkScalePrivate { GSList *marks; - GtkWidget *value_widget; + GtkLabel *value_widget; GtkWidget *top_marks_widget; GtkWidget *bottom_marks_widget; @@ -253,27 +253,27 @@ update_label_request (GtkScale *scale) lowest_value = gtk_adjustment_get_lower (adjustment); highest_value = gtk_adjustment_get_upper (adjustment); - old_text = g_strdup (gtk_label_get_label (GTK_LABEL (priv->value_widget))); - gtk_widget_set_size_request (priv->value_widget, -1, -1); + old_text = g_strdup (gtk_label_get_label (priv->value_widget)); + gtk_widget_set_size_request (GTK_WIDGET (priv->value_widget), -1, -1); text = gtk_scale_format_value (scale, lowest_value); - gtk_label_set_label (GTK_LABEL (priv->value_widget), text); + gtk_label_set_label (priv->value_widget, text); - gtk_widget_measure (priv->value_widget, GTK_ORIENTATION_HORIZONTAL, -1, + gtk_widget_measure (GTK_WIDGET (priv->value_widget), GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL); size = MAX (size, min); g_free (text); text = gtk_scale_format_value (scale, highest_value); - gtk_label_set_label (GTK_LABEL (priv->value_widget), text); + gtk_label_set_label (priv->value_widget, text); - gtk_widget_measure (priv->value_widget, GTK_ORIENTATION_HORIZONTAL, -1, + gtk_widget_measure (GTK_WIDGET (priv->value_widget), GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL); size = MAX (size, min); g_free (text); - gtk_widget_set_size_request (priv->value_widget, size, -1); - gtk_label_set_label (GTK_LABEL (priv->value_widget), old_text); + gtk_widget_set_size_request (GTK_WIDGET (priv->value_widget), size, -1); + gtk_label_set_label (priv->value_widget, old_text); g_free (old_text); } @@ -341,11 +341,11 @@ gtk_scale_allocate_value (GtkScale *scale) if (!gtk_widget_compute_bounds (slider_widget, widget, &slider_bounds)) graphene_rect_init (&slider_bounds, 0, 0, gtk_widget_get_width (widget), gtk_widget_get_height (widget)); - gtk_widget_measure (priv->value_widget, + gtk_widget_measure (GTK_WIDGET (priv->value_widget), GTK_ORIENTATION_HORIZONTAL, -1, &value_alloc.width, NULL, NULL, NULL); - gtk_widget_measure (priv->value_widget, + gtk_widget_measure (GTK_WIDGET (priv->value_widget), GTK_ORIENTATION_VERTICAL, -1, &value_alloc.height, NULL, NULL, NULL); @@ -408,7 +408,7 @@ gtk_scale_allocate_value (GtkScale *scale) } } - gtk_widget_size_allocate (priv->value_widget, &value_alloc, -1); + gtk_widget_size_allocate (GTK_WIDGET (priv->value_widget), &value_alloc, -1); } static void @@ -638,7 +638,7 @@ gtk_scale_value_changed (GtkRange *range) { char *text = gtk_scale_format_value (GTK_SCALE (range), gtk_adjustment_get_value (adjustment)); - gtk_label_set_label (GTK_LABEL (priv->value_widget), text); + gtk_label_set_label (priv->value_widget, text); g_free (text); } @@ -1047,7 +1047,7 @@ update_value_position (GtkScale *scale) if (!priv->value_widget) return; - context = gtk_widget_get_style_context (priv->value_widget); + context = gtk_widget_get_style_context (GTK_WIDGET (priv->value_widget)); gtk_style_context_remove_class (context, GTK_STYLE_CLASS_TOP); gtk_style_context_remove_class (context, GTK_STYLE_CLASS_RIGHT); @@ -1104,9 +1104,9 @@ gtk_scale_set_draw_value (GtkScale *scale, g_free (txt); if (priv->value_pos == GTK_POS_TOP || priv->value_pos == GTK_POS_LEFT) - gtk_widget_insert_after (priv->value_widget, widget, NULL); + gtk_widget_insert_after (GTK_WIDGET (priv->value_widget), widget, NULL); else - gtk_widget_insert_before (priv->value_widget, widget, NULL); + gtk_widget_insert_before (GTK_WIDGET (priv->value_widget), widget, NULL); gtk_range_set_round_digits (GTK_RANGE (scale), priv->digits); update_value_position (scale); @@ -1114,7 +1114,7 @@ gtk_scale_set_draw_value (GtkScale *scale, } else if (priv->value_widget) { - g_clear_pointer (&priv->value_widget, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->value_widget, gtk_widget_unparent); gtk_range_set_round_digits (GTK_RANGE (scale), -1); } @@ -1250,7 +1250,7 @@ gtk_scale_get_range_border (GtkRange *range, else value_orientation = GTK_ORIENTATION_VERTICAL; - gtk_widget_measure (priv->value_widget, + gtk_widget_measure (GTK_WIDGET (priv->value_widget), value_orientation, -1, &value_size, NULL, NULL, NULL); @@ -1444,7 +1444,7 @@ gtk_scale_measure (GtkWidget *widget, { int min, nat; - gtk_widget_measure (priv->value_widget, orientation, -1, &min, &nat, NULL, NULL); + gtk_widget_measure (GTK_WIDGET (priv->value_widget), orientation, -1, &min, &nat, NULL, NULL); if (priv->value_pos == GTK_POS_TOP || priv->value_pos == GTK_POS_BOTTOM) @@ -1490,7 +1490,7 @@ gtk_scale_snapshot (GtkWidget *widget, gtk_widget_snapshot_child (widget, priv->bottom_marks_widget, snapshot); if (priv->value_widget) - gtk_widget_snapshot_child (widget, priv->value_widget, snapshot); + gtk_widget_snapshot_child (widget, GTK_WIDGET (priv->value_widget), snapshot); GTK_WIDGET_CLASS (gtk_scale_parent_class)->snapshot (widget, snapshot); } @@ -1504,7 +1504,7 @@ gtk_scale_real_get_layout_offsets (GtkScale *scale, graphene_rect_t value_bounds; if (!priv->value_widget || - !gtk_widget_compute_bounds (priv->value_widget, GTK_WIDGET (scale), &value_bounds)) + !gtk_widget_compute_bounds (GTK_WIDGET (priv->value_widget), GTK_WIDGET (scale), &value_bounds)) { *x = 0; *y = 0; @@ -1556,7 +1556,7 @@ gtk_scale_finalize (GObject *object) gtk_scale_clear_marks (scale); - g_clear_pointer (&priv->value_widget, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->value_widget, gtk_widget_unparent); if (priv->format_value_func_destroy_notify) priv->format_value_func_destroy_notify (priv->format_value_func_user_data); @@ -1583,7 +1583,7 @@ gtk_scale_get_layout (GtkScale *scale) g_return_val_if_fail (GTK_IS_SCALE (scale), NULL); if (priv->value_widget) - return gtk_label_get_layout (GTK_LABEL (priv->value_widget)); + return gtk_label_get_layout (priv->value_widget); return NULL; } @@ -1734,7 +1734,7 @@ gtk_scale_add_mark (GtkScale *scale, GTK_WIDGET (scale), (priv->value_widget && (priv->value_pos == GTK_POS_TOP || priv->value_pos == GTK_POS_LEFT)) ? - priv->value_widget : NULL); + GTK_WIDGET (priv->value_widget) : NULL); gtk_style_context_add_class (gtk_widget_get_style_context (priv->top_marks_widget), GTK_STYLE_CLASS_TOP); } @@ -1754,7 +1754,7 @@ gtk_scale_add_mark (GtkScale *scale, GTK_WIDGET (scale), (priv->value_widget && (priv->value_pos == GTK_POS_BOTTOM || priv->value_pos == GTK_POS_RIGHT)) ? - priv->value_widget: NULL); + GTK_WIDGET (priv->value_widget): NULL); gtk_style_context_add_class (gtk_widget_get_style_context (priv->bottom_marks_widget), GTK_STYLE_CLASS_BOTTOM); } @@ -2084,7 +2084,7 @@ gtk_scale_set_format_value_func (GtkScale *scale, adjustment = gtk_range_get_adjustment (GTK_RANGE (scale)); text = gtk_scale_format_value (scale, gtk_adjustment_get_value (adjustment)); - gtk_label_set_label (GTK_LABEL (priv->value_widget), text); + gtk_label_set_label (priv->value_widget, text); g_free (text); } diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index fa683db75fc063ddd1ff802cbf88d116033261c6..54aad9be3ff08d03dcbc8629342b4901433831b9 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -524,7 +524,7 @@ gtk_scale_button_dispose (GObject *object) * * Returns: a new #GtkScaleButton */ -GtkWidget * +GtkScaleButton * gtk_scale_button_new (gdouble min, gdouble max, gdouble step, @@ -540,7 +540,7 @@ gtk_scale_button_new (gdouble min, "icons", icons, NULL); - return GTK_WIDGET (button); + return button; } /** diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h index c9dd397594f28ecc8aeada4993d7fcbcff02212e..341925ad3d3bc7e72815262abf08e4d61cd87083 100644 --- a/gtk/gtkscalebutton.h +++ b/gtk/gtkscalebutton.h @@ -73,7 +73,7 @@ struct _GtkScaleButtonClass GDK_AVAILABLE_IN_ALL GType gtk_scale_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_scale_button_new (gdouble min, +GtkScaleButton * gtk_scale_button_new (gdouble min, gdouble max, gdouble step, const gchar **icons); diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c index 51071b3049a646bf6232668065aa0f9f58731a38..c16ab51a7b23390840c3d4e6fb8f29bba059563b 100644 --- a/gtk/gtksearchbar.c +++ b/gtk/gtksearchbar.c @@ -95,14 +95,14 @@ struct _GtkSearchBarClass }; typedef struct { - GtkWidget *revealer; - GtkWidget *box_center; - GtkWidget *close_button; + GtkWidget *revealer; + GtkCenterBox *box_center; + GtkWidget *close_button; - GtkWidget *entry; - gboolean reveal_child; + GtkWidget *entry; + gboolean reveal_child; - GtkWidget *capture_widget; + GtkWidget *capture_widget; GtkEventController *capture_widget_controller; } GtkSearchBarPrivate; @@ -169,7 +169,7 @@ gtk_search_bar_add (GtkContainer *container, GtkSearchBar *bar = GTK_SEARCH_BAR (container); GtkSearchBarPrivate *priv = gtk_search_bar_get_instance_private (bar); - gtk_center_box_set_center_widget (GTK_CENTER_BOX (priv->box_center), child); + gtk_center_box_set_center_widget (priv->box_center, child); /* If an entry is the only child, save the developer a couple of * lines of code */ @@ -189,7 +189,7 @@ gtk_search_bar_remove (GtkContainer *container, if (GTK_IS_EDITABLE (child)) gtk_search_bar_connect_entry (bar, NULL); - gtk_center_box_set_center_widget (GTK_CENTER_BOX (priv->box_center), NULL); + gtk_center_box_set_center_widget (priv->box_center, NULL); _gtk_bin_set_child (GTK_BIN (container), NULL); } @@ -249,7 +249,7 @@ gtk_search_bar_dispose (GObject *object) if (gtk_bin_get_child (GTK_BIN (bar)) != NULL) { - gtk_center_box_set_center_widget (GTK_CENTER_BOX (priv->box_center), NULL); + gtk_center_box_set_center_widget (priv->box_center, NULL); _gtk_bin_set_child (GTK_BIN (bar), NULL); } @@ -349,14 +349,14 @@ gtk_search_bar_init (GtkSearchBar *bar) gtk_widget_set_parent (priv->revealer, GTK_WIDGET (bar)); priv->box_center = gtk_center_box_new (); - gtk_widget_set_hexpand (priv->box_center, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (priv->box_center), TRUE); priv->close_button = gtk_button_new_from_icon_name ("window-close-symbolic"); gtk_style_context_add_class (gtk_widget_get_style_context (priv->close_button), "close"); - gtk_center_box_set_end_widget (GTK_CENTER_BOX (priv->box_center), priv->close_button); + gtk_center_box_set_end_widget (priv->box_center, priv->close_button); gtk_widget_hide (priv->close_button); - gtk_container_add (GTK_CONTAINER (priv->revealer), priv->box_center); + gtk_container_add (GTK_CONTAINER (priv->revealer), GTK_WIDGET (priv->box_center)); g_signal_connect (priv->revealer, "notify::reveal-child", diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c index f701ac21bec732fb41610dada013bbecdfefcca1..e5b997bfb9a91253091649a6e25eff9f3758fa92 100644 --- a/gtk/gtksearchentry.c +++ b/gtk/gtksearchentry.c @@ -119,8 +119,8 @@ typedef struct { GtkWidget *capture_widget; GtkEventController *capture_widget_controller; - GtkWidget *entry; - GtkWidget *icon; + GtkText *entry; + GtkImage *icon; guint delayed_changed_id; gboolean content_changed; @@ -153,8 +153,8 @@ gtk_search_entry_finalize (GObject *object) gtk_editable_finish_delegate (GTK_EDITABLE (entry)); - g_clear_pointer (&priv->entry, gtk_widget_unparent); - g_clear_pointer (&priv->icon, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->entry, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->icon, gtk_widget_unparent); if (priv->delayed_changed_id > 0) g_source_remove (priv->delayed_changed_id); @@ -187,13 +187,13 @@ gtk_search_entry_set_property (GObject *object, switch (prop_id) { case PROP_PLACEHOLDER_TEXT: - gtk_text_set_placeholder_text (GTK_TEXT (priv->entry), g_value_get_string (value)); + gtk_text_set_placeholder_text (priv->entry, g_value_get_string (value)); break; case PROP_ACTIVATES_DEFAULT: - if (gtk_text_get_activates_default (GTK_TEXT (priv->entry)) != g_value_get_boolean (value)) + if (gtk_text_get_activates_default (priv->entry) != g_value_get_boolean (value)) { - gtk_text_set_activates_default (GTK_TEXT (priv->entry), g_value_get_boolean (value)); + gtk_text_set_activates_default (priv->entry, g_value_get_boolean (value)); g_object_notify_by_pspec (object, pspec); } break; @@ -218,11 +218,11 @@ gtk_search_entry_get_property (GObject *object, switch (prop_id) { case PROP_PLACEHOLDER_TEXT: - g_value_set_string (value, gtk_text_get_placeholder_text (GTK_TEXT (priv->entry))); + g_value_set_string (value, gtk_text_get_placeholder_text (priv->entry)); break; case PROP_ACTIVATES_DEFAULT: - g_value_set_boolean (value, gtk_text_get_activates_default (GTK_TEXT (priv->entry))); + g_value_set_boolean (value, gtk_text_get_activates_default (priv->entry)); break; default: @@ -247,7 +247,7 @@ gtk_search_entry_grab_focus (GtkWidget *widget) GtkSearchEntry *entry = GTK_SEARCH_ENTRY (widget); GtkSearchEntryPrivate *priv = gtk_search_entry_get_instance_private (entry); - return gtk_text_grab_focus_without_selecting (GTK_TEXT (priv->entry)); + return gtk_text_grab_focus_without_selecting (priv->entry); } static gboolean @@ -257,7 +257,7 @@ gtk_search_entry_mnemonic_activate (GtkWidget *widget, GtkSearchEntry *entry = GTK_SEARCH_ENTRY (widget); GtkSearchEntryPrivate *priv = gtk_search_entry_get_instance_private (entry); - gtk_widget_grab_focus (priv->entry); + gtk_widget_grab_focus (GTK_WIDGET (priv->entry)); return TRUE; } @@ -479,7 +479,7 @@ gtk_search_entry_changed (GtkEditable *editable, if (str == NULL || *str == '\0') { - gtk_widget_set_child_visible (priv->icon, FALSE); + gtk_widget_set_child_visible (GTK_WIDGET (priv->icon), FALSE); if (priv->delayed_changed_id > 0) { @@ -490,7 +490,7 @@ gtk_search_entry_changed (GtkEditable *editable, } else { - gtk_widget_set_child_visible (priv->icon, TRUE); + gtk_widget_set_child_visible (GTK_WIDGET (priv->icon), TRUE); /* Queue up the timeout */ reset_timeout (entry); @@ -522,8 +522,8 @@ gtk_search_entry_init (GtkSearchEntry *entry) GtkGesture *press; priv->entry = gtk_text_new (); - gtk_widget_set_parent (priv->entry, GTK_WIDGET (entry)); - gtk_widget_set_hexpand (priv->entry, TRUE); + gtk_widget_set_parent (GTK_WIDGET (priv->entry), GTK_WIDGET (entry)); + gtk_widget_set_hexpand (GTK_WIDGET (priv->entry), TRUE); gtk_editable_init_delegate (GTK_EDITABLE (entry)); g_signal_connect_swapped (priv->entry, "changed", G_CALLBACK (text_changed), entry); g_signal_connect_after (priv->entry, "changed", G_CALLBACK (gtk_search_entry_changed), entry); @@ -532,13 +532,13 @@ gtk_search_entry_init (GtkSearchEntry *entry) g_signal_connect (priv->entry, "activate", G_CALLBACK (activate_cb), entry); priv->icon = gtk_image_new_from_icon_name ("edit-clear-all-symbolic"); - gtk_widget_set_tooltip_text (priv->icon, _("Clear entry")); - gtk_widget_set_parent (priv->icon, GTK_WIDGET (entry)); - gtk_widget_set_child_visible (priv->icon, FALSE); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->icon), _("Clear entry")); + gtk_widget_set_parent (GTK_WIDGET (priv->icon), GTK_WIDGET (entry)); + gtk_widget_set_child_visible (GTK_WIDGET (priv->icon), FALSE); press = gtk_gesture_click_new (); g_signal_connect (press, "released", G_CALLBACK (gtk_search_entry_icon_release), entry); - gtk_widget_add_controller (priv->icon, GTK_EVENT_CONTROLLER (press)); + gtk_widget_add_controller (GTK_WIDGET (priv->icon), GTK_EVENT_CONTROLLER (press)); gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (entry)), I_("search")); } @@ -596,9 +596,9 @@ capture_widget_key_handled (GtkEventControllerKey *controller, priv->content_changed = FALSE; priv->search_stopped = FALSE; - was_empty = (gtk_text_get_text_length (GTK_TEXT (priv->entry)) == 0); + was_empty = (gtk_text_get_text_length (priv->entry) == 0); - handled = gtk_event_controller_key_forward (controller, priv->entry); + handled = gtk_event_controller_key_forward (controller, GTK_WIDGET (priv->entry)); if (handled && priv->content_changed && !priv->search_stopped) { @@ -683,7 +683,7 @@ gtk_search_entry_get_key_controller (GtkSearchEntry *entry) { GtkSearchEntryPrivate *priv = gtk_search_entry_get_instance_private (entry); - return gtk_text_get_key_controller (GTK_TEXT (priv->entry)); + return gtk_text_get_key_controller (priv->entry); } GtkText * @@ -691,5 +691,5 @@ gtk_search_entry_get_text_widget (GtkSearchEntry *entry) { GtkSearchEntryPrivate *priv = gtk_search_entry_get_instance_private (entry); - return GTK_TEXT (priv->entry); + return priv->entry; } diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c index 97050fa653108613a64073d0532e1c4131238a35..cdf625c9d4f65c789784f1e718cd88b554f4d01f 100644 --- a/gtk/gtkseparator.c +++ b/gtk/gtkseparator.c @@ -155,7 +155,7 @@ gtk_separator_class_init (GtkSeparatorClass *class) * * Returns: a new #GtkSeparator. */ -GtkWidget * +GtkSeparator * gtk_separator_new (GtkOrientation orientation) { return g_object_new (GTK_TYPE_SEPARATOR, diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h index cdc91ecf6c13f1c25658acd289b91ae083b2ae1c..ae8b39144e60191520a7c8a5274af701bb11202c 100644 --- a/gtk/gtkseparator.h +++ b/gtk/gtkseparator.h @@ -44,7 +44,7 @@ typedef struct _GtkSeparator GtkSeparator; GDK_AVAILABLE_IN_ALL GType gtk_separator_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_separator_new (GtkOrientation orientation); +GtkSeparator* gtk_separator_new (GtkOrientation orientation); G_END_DECLS diff --git a/gtk/gtkshortcutlabel.c b/gtk/gtkshortcutlabel.c index 4afa3f901f251c20c27aa2ba82056dfd28bda57d..64ef19697657bece5aaf7e1efa853fb42003fece 100644 --- a/gtk/gtkshortcutlabel.c +++ b/gtk/gtkshortcutlabel.c @@ -252,13 +252,13 @@ get_labels (guint key, GdkModifierType modifier, guint *n_mods) return retval; } -static GtkWidget * +static GtkLabel * dim_label (const gchar *text) { - GtkWidget *label; + GtkLabel *label; label = gtk_label_new (text); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "dim-label"); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "dim-label"); return label; } @@ -275,19 +275,19 @@ display_shortcut (GtkWidget *self, keys = get_labels (key, modifier, &n_mods); for (i = 0; keys[i]; i++) { - GtkWidget *disp; + GtkLabel *disp; if (i > 0) - gtk_widget_set_parent (dim_label ("+"), self); + gtk_widget_set_parent (GTK_WIDGET (dim_label ("+")), self); disp = gtk_label_new (keys[i]); if (i < n_mods) - gtk_widget_set_size_request (disp, 50, -1); + gtk_widget_set_size_request (GTK_WIDGET (disp), 50, -1); - gtk_style_context_add_class (gtk_widget_get_style_context (disp), "keycap"); - gtk_label_set_use_markup (GTK_LABEL (disp), TRUE); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (disp)), "keycap"); + gtk_label_set_use_markup (disp, TRUE); - gtk_widget_set_parent (disp, self); + gtk_widget_set_parent (GTK_WIDGET (disp), self); } g_strfreev (keys); } @@ -312,7 +312,7 @@ parse_combination (GtkShortcutLabel *self, break; } if (k > 0) - gtk_widget_set_parent (dim_label ("+"), GTK_WIDGET (self)); + gtk_widget_set_parent (GTK_WIDGET (dim_label ("+")), GTK_WIDGET (self)); display_shortcut (GTK_WIDGET (self), key, modifier); } @@ -358,7 +358,7 @@ parse_range (GtkShortcutLabel *self, if (!parse_sequence (self, str)) return FALSE; - gtk_widget_set_parent (dim_label ("⋯"), GTK_WIDGET (self)); + gtk_widget_set_parent (GTK_WIDGET (dim_label ("⋯")), GTK_WIDGET (self)); if (!parse_sequence (self, dots + 3)) return FALSE; @@ -393,11 +393,11 @@ gtk_shortcut_label_rebuild (GtkShortcutLabel *self) if (self->accelerator == NULL || self->accelerator[0] == '\0') { - GtkWidget *label; + GtkLabel *label; label = dim_label (self->disabled_text); - gtk_widget_set_parent (label, GTK_WIDGET (self)); + gtk_widget_set_parent (GTK_WIDGET (label), GTK_WIDGET (self)); return; } @@ -405,7 +405,7 @@ gtk_shortcut_label_rebuild (GtkShortcutLabel *self) for (k = 0; accels[k]; k++) { if (k > 0) - gtk_widget_set_parent (dim_label ("/"), GTK_WIDGET (self)); + gtk_widget_set_parent (GTK_WIDGET (dim_label ("/")), GTK_WIDGET (self)); if (!parse_range (self, accels[k])) { diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c index 0bb55fee01c9c024c9d25788b0f05c779286f33b..1c61cad0c2c36672de8e930bf2d4874511e960e3 100644 --- a/gtk/gtkshortcutssection.c +++ b/gtk/gtkshortcutssection.c @@ -67,7 +67,7 @@ struct _GtkShortcutsSection GtkStack *stack; GtkStackSwitcher *switcher; GtkWidget *show_all; - GtkWidget *footer; + GtkCenterBox *footer; GList *groups; gboolean has_filtered_group; @@ -441,12 +441,12 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self) G_CALLBACK (gtk_shortcuts_section_show_all), self); self->footer = gtk_center_box_new (); - GTK_CONTAINER_CLASS (gtk_shortcuts_section_parent_class)->add (GTK_CONTAINER (self), self->footer); + GTK_CONTAINER_CLASS (gtk_shortcuts_section_parent_class)->add (GTK_CONTAINER (self), GTK_WIDGET (self->footer)); gtk_widget_set_hexpand (GTK_WIDGET (self->switcher), TRUE); gtk_widget_set_halign (GTK_WIDGET (self->switcher), GTK_ALIGN_CENTER); - gtk_center_box_set_center_widget (GTK_CENTER_BOX (self->footer), GTK_WIDGET (self->switcher)); - gtk_center_box_set_end_widget (GTK_CENTER_BOX (self->footer), self->show_all); + gtk_center_box_set_center_widget (self->footer, GTK_WIDGET (self->switcher)); + gtk_center_box_set_end_widget (self->footer, self->show_all); gtk_widget_set_halign (self->show_all, GTK_ALIGN_END); gesture = gtk_gesture_pan_new (GTK_ORIENTATION_HORIZONTAL); diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c index bea8e84122ecb565021212e4c04c3a2dbfc14a96..12bfd1cdc81fbbceb5d90edf4c1ba64a15ccf6d3 100644 --- a/gtk/gtkshortcutswindow.c +++ b/gtk/gtkshortcutswindow.c @@ -867,7 +867,7 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self) GtkWidget *search_button; GtkBox *box; GtkWidget *scroller; - GtkWidget *label; + GtkLabel *label; GtkWidget *empty; PangoAttrList *attributes; @@ -917,13 +917,13 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self) /* Translators: This is the window title for the shortcuts window in normal mode */ label = gtk_label_new (_("Shortcuts")); - gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_TITLE); - gtk_stack_add_named (priv->title_stack, label, "title"); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), GTK_STYLE_CLASS_TITLE); + gtk_stack_add_named (priv->title_stack, GTK_WIDGET (label), "title"); /* Translators: This is the window title for the shortcuts window in search mode */ label = gtk_label_new (_("Search Results")); - gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_TITLE); - gtk_stack_add_named (priv->title_stack, label, "search"); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), GTK_STYLE_CLASS_TITLE); + gtk_stack_add_named (priv->title_stack, GTK_WIDGET (label), "search"); priv->menu_button = g_object_new (GTK_TYPE_MENU_BUTTON, "focus-on-click", FALSE, @@ -1012,11 +1012,11 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self) "attributes", attributes, NULL); pango_attr_list_unref (attributes); - gtk_grid_attach (GTK_GRID (empty), label, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (empty), GTK_WIDGET (label), 0, 1, 1, 1); label = g_object_new (GTK_TYPE_LABEL, "label", _("Try a different search"), NULL); - gtk_grid_attach (GTK_GRID (empty), label, 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID (empty), GTK_WIDGET (label), 0, 2, 1, 1); gtk_stack_add_named (priv->stack, empty, "no-search-results"); diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c index 9b7fedd1ae5510d82dc4b9190aa28674a6433036..4c8151e47daa451a907abab4757e6d05845b0ed2 100644 --- a/gtk/gtksidebarrow.c +++ b/gtk/gtksidebarrow.c @@ -43,7 +43,7 @@ struct _GtkSidebarRow GtkWidget *end_icon_widget; gchar *label; gchar *tooltip; - GtkWidget *label_widget; + GtkLabel *label_widget; gboolean ejectable; GtkWidget *eject_button; gint order_index; @@ -257,7 +257,7 @@ gtk_sidebar_row_set_property (GObject *object, case PROP_LABEL: g_free (self->label); self->label = g_strdup (g_value_get_string (value)); - gtk_label_set_text (GTK_LABEL (self->label_widget), self->label); + gtk_label_set_text (self->label_widget, self->label); break; case PROP_TOOLTIP: @@ -282,9 +282,9 @@ gtk_sidebar_row_set_property (GObject *object, self->section_type = g_value_get_int (value); if (self->section_type == SECTION_COMPUTER || self->section_type == SECTION_OTHER_LOCATIONS) - gtk_label_set_ellipsize (GTK_LABEL (self->label_widget), PANGO_ELLIPSIZE_NONE); + gtk_label_set_ellipsize (self->label_widget, PANGO_ELLIPSIZE_NONE); else - gtk_label_set_ellipsize (GTK_LABEL (self->label_widget), PANGO_ELLIPSIZE_END); + gtk_label_set_ellipsize (self->label_widget, PANGO_ELLIPSIZE_END); break; case PROP_PLACE_TYPE: diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 9e16ac0d78acae222a4748b852822ef0d69a8b5d..772dcb7f232fed2feae7fd1390a2433403d7ce41 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -212,7 +212,7 @@ struct _GtkSpinButtonPrivate GtkAdjustment *adjustment; GtkWidget *box; - GtkWidget *entry; + GtkText *entry; GtkWidget *up_button; GtkWidget *down_button; @@ -330,7 +330,7 @@ gtk_spin_button_grab_focus (GtkWidget *widget) GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget); GtkSpinButtonPrivate *priv = gtk_spin_button_get_instance_private (spin_button); - return gtk_widget_grab_focus (priv->entry); + return gtk_widget_grab_focus (GTK_WIDGET (priv->entry)); } static gboolean @@ -340,7 +340,7 @@ gtk_spin_button_mnemonic_activate (GtkWidget *widget, GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget); GtkSpinButtonPrivate *priv = gtk_spin_button_get_instance_private (spin_button); - return gtk_widget_grab_focus (priv->entry); + return gtk_widget_grab_focus (GTK_WIDGET (priv->entry)); } static void @@ -960,10 +960,10 @@ gtk_spin_button_init (GtkSpinButton *spin_button) gtk_editable_init_delegate (GTK_EDITABLE (spin_button)); gtk_editable_set_width_chars (GTK_EDITABLE (priv->entry), 0); gtk_editable_set_max_width_chars (GTK_EDITABLE (priv->entry), 0); - gtk_widget_set_hexpand (priv->entry, TRUE); - gtk_widget_set_vexpand (priv->entry, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (priv->entry), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (priv->entry), TRUE); g_signal_connect (priv->entry, "activate", G_CALLBACK (gtk_spin_button_activate), spin_button); - gtk_widget_set_parent (priv->entry, GTK_WIDGET (spin_button)); + gtk_widget_set_parent (GTK_WIDGET (priv->entry), GTK_WIDGET (spin_button)); priv->down_button = gtk_button_new_from_icon_name ("value-decrease-symbolic"); gtk_style_context_add_class (gtk_widget_get_style_context (priv->down_button), "down"); @@ -1031,7 +1031,7 @@ gtk_spin_button_finalize (GObject *object) gtk_editable_finish_delegate (GTK_EDITABLE (spin_button)); - gtk_widget_unparent (priv->entry); + gtk_widget_unparent (GTK_WIDGET (priv->entry)); gtk_widget_unparent (priv->up_button); gtk_widget_unparent (priv->down_button); @@ -1144,7 +1144,7 @@ gtk_spin_button_set_orientation (GtkSpinButton *spin, else { /* Current orientation of the box is horizontal! */ - gtk_widget_insert_before (priv->up_button, GTK_WIDGET (spin), priv->entry); + gtk_widget_insert_before (priv->up_button, GTK_WIDGET (spin), GTK_WIDGET (priv->entry)); } layout_manager = GTK_BOX_LAYOUT (gtk_widget_get_layout_manager (GTK_WIDGET (spin))); diff --git a/gtk/gtkstacksidebar.c b/gtk/gtkstacksidebar.c index 31b5025de46402355639afe847b6655df5556747..e2e96c9748b1e585df15b7bfb39cc5ba23abb304 100644 --- a/gtk/gtkstacksidebar.c +++ b/gtk/gtkstacksidebar.c @@ -127,12 +127,12 @@ update_header (GtkListBoxRow *row, GtkListBoxRow *before, gpointer userdata) { - GtkWidget *ret = NULL; + GtkSeparator *ret = NULL; if (before && !gtk_list_box_row_get_header (row)) { ret = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_list_box_row_set_header (row, ret); + gtk_list_box_row_set_header (row, GTK_WIDGET (ret)); } } @@ -225,16 +225,16 @@ static void add_child (guint position, GtkStackSidebar *self) { - GtkWidget *item; + GtkLabel *item; GtkWidget *row; GtkStackPage *page; /* Make a pretty item when we add kids */ item = gtk_label_new (""); - gtk_widget_set_halign (item, GTK_ALIGN_START); - gtk_widget_set_valign (item, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (item), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (item), GTK_ALIGN_CENTER); row = gtk_list_box_row_new (); - gtk_container_add (GTK_CONTAINER (row), item); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (item)); page = g_list_model_get_item (G_LIST_MODEL (self->pages), position); update_row (self, page, row); diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c index c9d30fecf14a695f8aac80972d8b17f4e397f216..c79a7d1af08412ea621a0abf5c6fc5276bb24bc1 100644 --- a/gtk/gtkstackswitcher.c +++ b/gtk/gtkstackswitcher.c @@ -169,7 +169,7 @@ rebuild_child (GtkWidget *self, if (icon_name != NULL) { - button_child = gtk_image_new_from_icon_name (icon_name); + button_child = GTK_WIDGET (gtk_image_new_from_icon_name (icon_name)); if (title != NULL) gtk_widget_set_tooltip_text (GTK_WIDGET (self), title); @@ -178,7 +178,7 @@ rebuild_child (GtkWidget *self, } else if (title != NULL) { - button_child = gtk_label_new (title); + button_child = GTK_WIDGET (gtk_label_new (title)); gtk_widget_set_tooltip_text (GTK_WIDGET (self), NULL); @@ -327,21 +327,21 @@ add_child (guint position, GtkStackSwitcher *self) { GtkStackSwitcherPrivate *priv = gtk_stack_switcher_get_instance_private (self); - GtkWidget *button; + GtkToggleButton *button; gboolean selected; GtkStackPage *page; button = gtk_toggle_button_new (); - gtk_widget_set_focus_on_click (button, FALSE); + gtk_widget_set_focus_on_click (GTK_WIDGET (button), FALSE); page = g_list_model_get_item (G_LIST_MODEL (priv->pages), position); - update_button (self, page, button); + update_button (self, page, GTK_WIDGET (button)); - gtk_widget_set_parent (button, GTK_WIDGET (self)); + gtk_widget_set_parent (GTK_WIDGET (button), GTK_WIDGET (self)); g_object_set_data (G_OBJECT (button), "child-index", GUINT_TO_POINTER (position)); selected = gtk_selection_model_is_selected (priv->pages, position); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), selected); + gtk_toggle_button_set_active (button, selected); g_signal_connect (button, "notify::active", G_CALLBACK (on_button_toggled), self); g_signal_connect (page, "notify", G_CALLBACK (on_page_updated), self); diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index cf140118e284f47ffaadccade69e54bdaeee7858..9e59118bb6c76c94015e751d2a5f80854b5759fd 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -101,7 +101,7 @@ struct _GtkStatusbarClass typedef struct { GtkWidget *frame; - GtkWidget *label; + GtkLabel *label; GtkWidget *message_area; GSList *messages; @@ -246,7 +246,7 @@ gtk_statusbar_update (GtkStatusbar *statusbar, if (!text) text = ""; - gtk_label_set_text (GTK_LABEL (priv->label), text); + gtk_label_set_text (priv->label, text); } /** diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c index 148a94a41811acea3f472992f3ff231053f01ed3..90c18a42b9045f7742097d0564e3d9cf571e10e7 100644 --- a/gtk/gtkswitch.c +++ b/gtk/gtkswitch.c @@ -97,8 +97,8 @@ struct _GtkSwitch guint state : 1; guint is_active : 1; - GtkWidget *on_image; - GtkWidget *off_image; + GtkImage *on_image; + GtkImage *off_image; GtkWidget *slider; }; @@ -311,8 +311,8 @@ gtk_switch_measure (GtkWidget *widget, &slider_minimum, &slider_natural, NULL, NULL); - gtk_widget_measure (self->on_image, orientation, for_size, NULL, &on_nat, NULL, NULL); - gtk_widget_measure (self->off_image, orientation, for_size, NULL, &off_nat, NULL, NULL); + gtk_widget_measure (GTK_WIDGET (self->on_image), orientation, for_size, NULL, &on_nat, NULL, NULL); + gtk_widget_measure (GTK_WIDGET (self->off_image), orientation, for_size, NULL, &off_nat, NULL, NULL); if (orientation == GTK_ORIENTATION_HORIZONTAL) { @@ -345,22 +345,22 @@ gtk_switch_allocate (GtkWidget *widget, }, -1); /* Center ON icon in left half */ - gtk_widget_measure (self->on_image, GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL); + gtk_widget_measure (GTK_WIDGET (self->on_image), GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL); child_alloc.x = ((width / 2) - min) / 2; child_alloc.width = min; - gtk_widget_measure (self->on_image, GTK_ORIENTATION_VERTICAL, min, &min, NULL, NULL, NULL); + gtk_widget_measure (GTK_WIDGET (self->on_image), GTK_ORIENTATION_VERTICAL, min, &min, NULL, NULL, NULL); child_alloc.y = (height - min) / 2; child_alloc.height = min; - gtk_widget_size_allocate (self->on_image, &child_alloc, -1); + gtk_widget_size_allocate (GTK_WIDGET (self->on_image), &child_alloc, -1); /* Center OFF icon in right half */ - gtk_widget_measure (self->off_image, GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL); + gtk_widget_measure (GTK_WIDGET (self->off_image), GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL); child_alloc.x = (width / 2) + ((width / 2) - min) / 2; child_alloc.width = min; - gtk_widget_measure (self->off_image, GTK_ORIENTATION_VERTICAL, min, &min, NULL, NULL, NULL); + gtk_widget_measure (GTK_WIDGET (self->off_image), GTK_ORIENTATION_VERTICAL, min, &min, NULL, NULL, NULL); child_alloc.y = (height - min) / 2; child_alloc.height = min; - gtk_widget_size_allocate (self->off_image, &child_alloc, -1); + gtk_widget_size_allocate (GTK_WIDGET (self->off_image), &child_alloc, -1); } static void @@ -491,8 +491,8 @@ gtk_switch_finalize (GObject *object) gtk_switch_end_toggle_animation (self); - gtk_widget_unparent (self->on_image); - gtk_widget_unparent (self->off_image); + gtk_widget_unparent (GTK_WIDGET (self->on_image)); + gtk_widget_unparent (GTK_WIDGET (self->off_image)); gtk_widget_unparent (self->slider); G_OBJECT_CLASS (gtk_switch_parent_class)->finalize (object); @@ -651,10 +651,10 @@ gtk_switch_init (GtkSwitch *self) gtk_widget_set_layout_manager (GTK_WIDGET (self), layout); self->on_image = gtk_image_new_from_icon_name ("switch-on-symbolic"); - gtk_widget_set_parent (self->on_image, GTK_WIDGET (self)); + gtk_widget_set_parent (GTK_WIDGET (self->on_image), GTK_WIDGET (self)); self->off_image = gtk_image_new_from_icon_name ("switch-off-symbolic"); - gtk_widget_set_parent (self->off_image, GTK_WIDGET (self)); + gtk_widget_set_parent (GTK_WIDGET (self->off_image), GTK_WIDGET (self)); self->slider = gtk_gizmo_new ("slider", NULL, NULL, NULL, NULL); gtk_widget_set_parent (self->slider, GTK_WIDGET (self)); @@ -667,7 +667,7 @@ gtk_switch_init (GtkSwitch *self) * * Returns: the newly created #GtkSwitch instance */ -GtkWidget * +GtkSwitch * gtk_switch_new (void) { return g_object_new (GTK_TYPE_SWITCH, NULL); diff --git a/gtk/gtkswitch.h b/gtk/gtkswitch.h index ba92df0c71bb74cdb72b0d817c33119cef042da1..a1734a30f12f6f98df328ad3516f7908abc8ef7c 100644 --- a/gtk/gtkswitch.h +++ b/gtk/gtkswitch.h @@ -45,7 +45,7 @@ GDK_AVAILABLE_IN_ALL GType gtk_switch_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_switch_new (void); +GtkSwitch * gtk_switch_new (void); GDK_AVAILABLE_IN_ALL void gtk_switch_set_active (GtkSwitch *self, diff --git a/gtk/gtktext.c b/gtk/gtktext.c index 4227578b431dc9c1a84d83cd4d955a9a9bdbd5de..e453f7ec810dc5c5b2b387c471f9602d972b0c2e 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -158,7 +158,7 @@ struct _GtkTextPrivate char *im_module; - GtkWidget *emoji_completion; + GtkEmojiCompletion *emoji_completion; GtkTextHandle *text_handle; GtkWidget *selection_bubble; guint selection_bubble_timeout_id; @@ -166,7 +166,7 @@ struct _GtkTextPrivate GtkWidget *magnifier_popover; GtkWidget *magnifier; - GtkWidget *placeholder; + GtkLabel *placeholder; GtkGesture *drag_gesture; GtkEventController *key_controller; @@ -1833,7 +1833,7 @@ gtk_text_dispose (GObject *object) GtkText *self = GTK_TEXT (object); GtkTextPrivate *priv = gtk_text_get_instance_private (self); GdkKeymap *keymap; - GtkWidget *chooser; + GtkEmojiChooser *chooser; priv->current_pos = 0; @@ -1844,10 +1844,10 @@ gtk_text_dispose (GObject *object) priv->buffer = NULL; } - g_clear_pointer (&priv->emoji_completion, gtk_widget_unparent); - chooser = g_object_get_data (object, "gtk-emoji-chooser"); + g_clear_pointer ((GtkWidget **) &priv->emoji_completion, gtk_widget_unparent); + chooser = GTK_EMOJI_CHOOSER (g_object_get_data (object, "gtk-emoji-chooser")); if (chooser) - gtk_widget_unparent (chooser); + gtk_widget_unparent (GTK_WIDGET (chooser)); keymap = gdk_display_get_keymap (gtk_widget_get_display (GTK_WIDGET (object))); g_signal_handlers_disconnect_by_func (keymap, keymap_direction_changed, self); @@ -1874,7 +1874,7 @@ gtk_text_finalize (GObject *object) g_clear_object (&priv->text_handle); g_free (priv->im_module); - g_clear_pointer (&priv->placeholder, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->placeholder, gtk_widget_unparent); if (priv->tabs) pango_tab_array_free (priv->tabs); @@ -2271,7 +2271,7 @@ gtk_text_measure (GtkWidget *widget, { int pmin, pnat; - gtk_widget_measure (priv->placeholder, GTK_ORIENTATION_HORIZONTAL, -1, + gtk_widget_measure (GTK_WIDGET (priv->placeholder), GTK_ORIENTATION_HORIZONTAL, -1, &pmin, &pnat, NULL, NULL); min = MAX (min, pmin); nat = MAX (nat, pnat); @@ -2302,7 +2302,7 @@ gtk_text_measure (GtkWidget *widget, { int min, nat; - gtk_widget_measure (priv->placeholder, GTK_ORIENTATION_VERTICAL, -1, + gtk_widget_measure (GTK_WIDGET (priv->placeholder), GTK_ORIENTATION_VERTICAL, -1, &min, &nat, NULL, NULL); *minimum = MAX (*minimum, min); *natural = MAX (*natural, nat); @@ -2331,7 +2331,7 @@ gtk_text_size_allocate (GtkWidget *widget, if (priv->placeholder) { - gtk_widget_size_allocate (priv->placeholder, + gtk_widget_size_allocate (GTK_WIDGET (priv->placeholder), &(GtkAllocation) { 0, 0, width, height }, -1); } @@ -2340,7 +2340,7 @@ gtk_text_size_allocate (GtkWidget *widget, gtk_text_check_cursor_blink (self); update_im_cursor_location (self); - chooser = g_object_get_data (G_OBJECT (self), "gtk-emoji-chooser"); + chooser = GTK_EMOJI_CHOOSER (g_object_get_data (G_OBJECT (self), "gtk-emoji-chooser")); if (chooser) gtk_native_check_resize (GTK_NATIVE (chooser)); @@ -2408,7 +2408,7 @@ gtk_text_snapshot (GtkWidget *widget, gtk_text_draw_cursor (self, snapshot, CURSOR_DND); if (priv->placeholder) - gtk_widget_snapshot_child (widget, priv->placeholder, snapshot); + gtk_widget_snapshot_child (widget, GTK_WIDGET (priv->placeholder), snapshot); gtk_text_draw_text (self, snapshot); @@ -3410,7 +3410,7 @@ update_placeholder_visibility (GtkText *self) GtkTextPrivate *priv = gtk_text_get_instance_private (self); if (priv->placeholder) - gtk_widget_set_child_visible (priv->placeholder, + gtk_widget_set_child_visible (GTK_WIDGET (priv->placeholder), gtk_entry_buffer_get_length (priv->buffer) == 0); } @@ -5208,7 +5208,7 @@ gtk_text_update_primary_selection (GtkText *self) * * Returns: a new #GtkText. */ -GtkWidget * +GtkText * gtk_text_new (void) { return g_object_new (GTK_TYPE_TEXT, NULL); @@ -5222,7 +5222,7 @@ gtk_text_new (void) * * Returns: a new #GtkText */ -GtkWidget * +GtkText * gtk_text_new_with_buffer (GtkEntryBuffer *buffer) { g_return_val_if_fail (GTK_IS_ENTRY_BUFFER (buffer), NULL); @@ -5970,7 +5970,8 @@ append_bubble_item (GtkText *self, int index) { GtkActionMuxer *muxer; - GtkWidget *item, *image; + GtkWidget *item; + GtkImage *image; GVariant *att; const char *icon_name; const char *action_name; @@ -6006,8 +6007,8 @@ append_bubble_item (GtkText *self, item = gtk_button_new (); gtk_widget_set_focus_on_click (item, FALSE); image = gtk_image_new_from_icon_name (icon_name); - gtk_widget_show (image); - gtk_container_add (GTK_CONTAINER (item), image); + gtk_widget_show (GTK_WIDGET (image)); + gtk_container_add (GTK_CONTAINER (item), GTK_WIDGET (image)); gtk_style_context_add_class (gtk_widget_get_style_context (item), "image-button"); gtk_actionable_set_action_name (GTK_ACTIONABLE (item), action_name); gtk_widget_show (GTK_WIDGET (item)); @@ -6546,12 +6547,12 @@ gtk_text_set_placeholder_text (GtkText *self, "xalign", 0.0f, "ellipsize", PANGO_ELLIPSIZE_END, NULL); - gtk_label_set_attributes (GTK_LABEL (priv->placeholder), priv->attrs); - gtk_widget_insert_after (priv->placeholder, GTK_WIDGET (self), NULL); + gtk_label_set_attributes (priv->placeholder, priv->attrs); + gtk_widget_insert_after (GTK_WIDGET (priv->placeholder), GTK_WIDGET (self), NULL); } else { - gtk_label_set_text (GTK_LABEL (priv->placeholder), text); + gtk_label_set_text (priv->placeholder, text); } g_object_notify_by_pspec (G_OBJECT (self), text_props[PROP_PLACEHOLDER_TEXT]); @@ -6578,7 +6579,7 @@ gtk_text_get_placeholder_text (GtkText *self) if (!priv->placeholder) return NULL; - return gtk_label_get_text (GTK_LABEL (priv->placeholder)); + return gtk_label_get_text (priv->placeholder); } /** @@ -6702,7 +6703,7 @@ gtk_text_set_attributes (GtkText *self, priv->attrs = attrs; if (priv->placeholder) - gtk_label_set_attributes (GTK_LABEL (priv->placeholder), attrs); + gtk_label_set_attributes (priv->placeholder, attrs); g_object_notify_by_pspec (G_OBJECT (self), text_props[PROP_ATTRIBUTES]); @@ -6799,12 +6800,12 @@ static void gtk_text_insert_emoji (GtkText *self) { GtkTextPrivate *priv = gtk_text_get_instance_private (self); - GtkWidget *chooser; + GtkEmojiChooser *chooser; if (gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_EMOJI_CHOOSER) != NULL) return; - chooser = GTK_WIDGET (g_object_get_data (G_OBJECT (self), "gtk-emoji-chooser")); + chooser = GTK_EMOJI_CHOOSER (g_object_get_data (G_OBJECT (self), "gtk-emoji-chooser")); if (!chooser) { chooser = gtk_emoji_chooser_new (); @@ -6834,7 +6835,7 @@ set_enable_emoji_completion (GtkText *self, if (priv->enable_emoji_completion) priv->emoji_completion = gtk_emoji_completion_new (self); else - g_clear_pointer (&priv->emoji_completion, gtk_widget_unparent); + g_clear_pointer ((GtkWidget **) &priv->emoji_completion, gtk_widget_unparent); g_object_notify_by_pspec (G_OBJECT (self), text_props[PROP_ENABLE_EMOJI_COMPLETION]); } diff --git a/gtk/gtktext.h b/gtk/gtktext.h index 4ce0b781bb1359c9cb536a748feb912e3c9df9b5..cd87f8017bb05ee420a8b18791a97d67113e1d83 100644 --- a/gtk/gtktext.h +++ b/gtk/gtktext.h @@ -56,9 +56,9 @@ GDK_AVAILABLE_IN_ALL GType gtk_text_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_text_new (void); +GtkText * gtk_text_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_text_new_with_buffer (GtkEntryBuffer *buffer); +GtkText * gtk_text_new_with_buffer (GtkEntryBuffer *buffer); GDK_AVAILABLE_IN_ALL GtkEntryBuffer *gtk_text_get_buffer (GtkText *self); diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index baad3043c41e001ce3f4eda25f1fef14edfcb237..c6525164260a050549392eb4c967bebb1358a14f 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -4215,7 +4215,7 @@ gtk_text_view_size_allocate (GtkWidget *widget, GdkRectangle right_rect; GdkRectangle top_rect; GdkRectangle bottom_rect; - GtkWidget *chooser; + GtkEmojiChooser *chooser; PangoLayout *layout; guint mru_size; @@ -4318,7 +4318,7 @@ gtk_text_view_size_allocate (GtkWidget *widget, */ gtk_text_view_flush_first_validate (text_view); - chooser = g_object_get_data (G_OBJECT (text_view), "gtk-emoji-chooser"); + chooser = GTK_EMOJI_CHOOSER (g_object_get_data (G_OBJECT (text_view), "gtk-emoji-chooser")); if (chooser) gtk_native_check_resize (GTK_NATIVE (chooser)); @@ -8794,7 +8794,8 @@ append_bubble_item (GtkTextView *text_view, GMenuModel *model, int index) { - GtkWidget *item, *image; + GtkWidget *item; + GtkImage *image; GVariant *att; const char *icon_name; const char *action_name; @@ -8843,12 +8844,12 @@ append_bubble_item (GtkTextView *text_view, } if (is_toggle_action) - item = gtk_toggle_button_new (); + item = GTK_WIDGET (gtk_toggle_button_new ()); else item = gtk_button_new (); gtk_widget_set_focus_on_click (item, FALSE); image = gtk_image_new_from_icon_name (icon_name); - gtk_container_add (GTK_CONTAINER (item), image); + gtk_container_add (GTK_CONTAINER (item), GTK_WIDGET (image)); gtk_style_context_add_class (gtk_widget_get_style_context (item), "image-button"); gtk_actionable_set_action_name (GTK_ACTIONABLE (item), action_name); @@ -9663,7 +9664,7 @@ gtk_text_view_get_monospace (GtkTextView *text_view) static void gtk_text_view_insert_emoji (GtkTextView *text_view) { - GtkWidget *chooser; + GtkEmojiChooser *chooser; GtkTextIter iter; GdkRectangle rect; GtkTextBuffer *buffer; @@ -9671,7 +9672,7 @@ gtk_text_view_insert_emoji (GtkTextView *text_view) if (gtk_widget_get_ancestor (GTK_WIDGET (text_view), GTK_TYPE_EMOJI_CHOOSER) != NULL) return; - chooser = GTK_WIDGET (g_object_get_data (G_OBJECT (text_view), "gtk-emoji-chooser")); + chooser = GTK_EMOJI_CHOOSER (g_object_get_data (G_OBJECT (text_view), "gtk-emoji-chooser")); if (!chooser) { chooser = gtk_emoji_chooser_new (); diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index ad70b984ab2c269b0936127480d230962e853e79..1407057e1b06baccf7b8da4708b9cb35ea6bfd94 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -71,7 +71,8 @@ * } * * void make_toggles (void) { - * GtkWidget *window, *toggle1, *toggle2; + * GtkWidget *window; + * GtkToggleButton *toggle1, *toggle2; * GtkWidget *box; * const char *text; * @@ -84,14 +85,14 @@ * g_signal_connect (toggle1, "toggled", * G_CALLBACK (output_state), * NULL); - * gtk_container_add (GTK_CONTAINER (box), toggle1); + * gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (toggle1)); * * text = "Hi, I’m a toggle button."; * toggle2 = gtk_toggle_button_new_with_label (text); * g_signal_connect (toggle2, "toggled", * G_CALLBACK (output_state), * NULL); - * gtk_container_add (GTK_CONTAINER (box), toggle2); + * gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (toggle2)); * * gtk_container_add (GTK_CONTAINER (window), box); * gtk_widget_show (window); @@ -205,7 +206,7 @@ gtk_toggle_button_init (GtkToggleButton *toggle_button) * * Returns: a new toggle button. */ -GtkWidget* +GtkToggleButton* gtk_toggle_button_new (void) { return g_object_new (GTK_TYPE_TOGGLE_BUTTON, NULL); @@ -219,7 +220,7 @@ gtk_toggle_button_new (void) * * Returns: a new toggle button. */ -GtkWidget* +GtkToggleButton* gtk_toggle_button_new_with_label (const gchar *label) { return g_object_new (GTK_TYPE_TOGGLE_BUTTON, "label", label, NULL); @@ -236,7 +237,7 @@ gtk_toggle_button_new_with_label (const gchar *label) * * Returns: a new #GtkToggleButton */ -GtkWidget* +GtkToggleButton* gtk_toggle_button_new_with_mnemonic (const gchar *label) { return g_object_new (GTK_TYPE_TOGGLE_BUTTON, diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h index 3879efcd6f06668e35c395a49f2eeae9ebe9df1c..388d32dc6050e5e024b07ff6219b29fcafe6cbb3 100644 --- a/gtk/gtktogglebutton.h +++ b/gtk/gtktogglebutton.h @@ -64,21 +64,21 @@ struct _GtkToggleButtonClass GDK_AVAILABLE_IN_ALL -GType gtk_toggle_button_get_type (void) G_GNUC_CONST; +GType gtk_toggle_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_toggle_button_new (void); +GtkToggleButton* gtk_toggle_button_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_toggle_button_new_with_label (const gchar *label); +GtkToggleButton* gtk_toggle_button_new_with_label (const gchar *label); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_toggle_button_new_with_mnemonic (const gchar *label); +GtkToggleButton* gtk_toggle_button_new_with_mnemonic (const gchar *label); GDK_AVAILABLE_IN_ALL -void gtk_toggle_button_set_active (GtkToggleButton *toggle_button, - gboolean is_active); +void gtk_toggle_button_set_active (GtkToggleButton *toggle_button, + gboolean is_active); GDK_AVAILABLE_IN_ALL -gboolean gtk_toggle_button_get_active (GtkToggleButton *toggle_button); +gboolean gtk_toggle_button_get_active (GtkToggleButton *toggle_button); GDK_AVAILABLE_IN_ALL -void gtk_toggle_button_toggled (GtkToggleButton *toggle_button); +void gtk_toggle_button_toggled (GtkToggleButton *toggle_button); G_END_DECLS diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index fd733ea2d7232c1d585c785469bb05e3117f34dc..9352218b9aa61003fe11087b4b2836e63b1ab487 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -1123,7 +1123,7 @@ create_popup_func (GtkMenuButton *menu_button, !toolbar_content_is_placeholder (content)) { if (toolbar_content_is_separator (content)) - gtk_container_add (GTK_CONTAINER (priv->menu_box), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_container_add (GTK_CONTAINER (priv->menu_box), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); else if (toolbar_content_has_proxy_menu_item (content)) { const char *text = toolbar_content_get_overflow_text (content); @@ -2128,14 +2128,14 @@ gtk_toolbar_popup_menu (GtkWidget *toolbar) * Returns: the newly-created toolbar. **/ -GtkWidget * +GtkToolbar * gtk_toolbar_new (void) { GtkToolbar *toolbar; toolbar = g_object_new (GTK_TYPE_TOOLBAR, NULL); - return GTK_WIDGET (toolbar); + return toolbar; } /** diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 85ef52b9b761a6e14eb11baf2b50cd8c2da145d9..de40401360c657a0921b83af15822ffa1f904a54 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -50,7 +50,7 @@ typedef struct _GtkToolbar GtkToolbar; GDK_AVAILABLE_IN_ALL GType gtk_toolbar_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_toolbar_new (void); +GtkToolbar * gtk_toolbar_new (void); GDK_AVAILABLE_IN_ALL void gtk_toolbar_insert (GtkToolbar *toolbar, diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 8cc681cf8fb61cc843c051bc02c9b5b237214c19..306c4c9d9ae8453d36b77d37ac2404d6587260f8 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -404,7 +404,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) else label_text = g_strdup (orig_label); - label = gtk_label_new (label_text); + label = GTK_WIDGET (gtk_label_new (label_text)); g_free (label_text); } @@ -450,7 +450,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) } else if (button->priv->icon_name) { - icon = gtk_image_new_from_icon_name (button->priv->icon_name); + icon = GTK_WIDGET (gtk_image_new_from_icon_name (button->priv->icon_name)); } if (icon) diff --git a/gtk/gtktooltipwindow.c b/gtk/gtktooltipwindow.c index 2467657889ca51769800e70f9a41214b9f245bf8..3200aee4e87d2e3b346586336dec056085948422 100644 --- a/gtk/gtktooltipwindow.c +++ b/gtk/gtktooltipwindow.c @@ -61,7 +61,7 @@ struct _GtkTooltipWindow GtkWidget *box; GtkWidget *image; - GtkWidget *label; + GtkLabel *label; GtkWidget *custom_widget; }; @@ -442,12 +442,12 @@ gtk_tooltip_window_set_label_markup (GtkTooltipWindow *window, { if (markup != NULL) { - gtk_label_set_markup (GTK_LABEL (window->label), markup); - gtk_widget_show (window->label); + gtk_label_set_markup (window->label, markup); + gtk_widget_show (GTK_WIDGET (window->label)); } else { - gtk_widget_hide (window->label); + gtk_widget_hide (GTK_WIDGET (window->label)); } } @@ -457,12 +457,12 @@ gtk_tooltip_window_set_label_text (GtkTooltipWindow *window, { if (text != NULL) { - gtk_label_set_text (GTK_LABEL (window->label), text); - gtk_widget_show (window->label); + gtk_label_set_text (window->label, text); + gtk_widget_show (GTK_WIDGET (window->label)); } else { - gtk_widget_hide (window->label); + gtk_widget_hide (GTK_WIDGET (window->label)); } } @@ -540,7 +540,7 @@ gtk_tooltip_window_set_custom_widget (GtkTooltipWindow *window, gtk_container_add (GTK_CONTAINER (window->box), custom_widget); gtk_widget_show (custom_widget); gtk_widget_hide (window->image); - gtk_widget_hide (window->label); + gtk_widget_hide (GTK_WIDGET (window->label)); } } diff --git a/gtk/gtktreepopover.c b/gtk/gtktreepopover.c index cf25dbe658e1d672f72d532a0681d4c4a04e2f7f..25a2bbc1a356685c5c069e1e3475d86ee59439bc 100644 --- a/gtk/gtktreepopover.c +++ b/gtk/gtktreepopover.c @@ -323,7 +323,7 @@ ensure_submenu (GtkTreePopover *popover, gtk_tree_model_get_iter (popover->model, &iter, path); item = gtk_tree_popover_create_item (popover, path, &iter, TRUE); gtk_container_add (GTK_CONTAINER (box), item); - gtk_container_add (GTK_CONTAINER (box), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); } } @@ -497,9 +497,9 @@ gtk_tree_popover_get_path_item (GtkTreePopover *popover, } else { - GtkWidget *view = GTK_WIDGET (g_object_get_data (G_OBJECT (child), "view")); + GtkCellView *view = GTK_CELL_VIEW (g_object_get_data (G_OBJECT (child), "view")); - path = gtk_cell_view_get_displayed_row (GTK_CELL_VIEW (view)); + path = gtk_cell_view_get_displayed_row (view); if (!path) item = child; @@ -651,7 +651,8 @@ gtk_tree_popover_create_item (GtkTreePopover *popover, GtkTreeIter *iter, gboolean header_item) { - GtkWidget *item, *view; + GtkWidget *item; + GtkCellView *view; gboolean is_separator = FALSE; if (popover->row_separator_func) @@ -659,7 +660,7 @@ gtk_tree_popover_create_item (GtkTreePopover *popover, if (is_separator) { - item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + item = GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); g_object_set_data_full (G_OBJECT (item), "gtk-tree-path", gtk_tree_row_reference_new (popover->model, path), (GDestroyNotify)gtk_tree_row_reference_free); @@ -676,9 +677,9 @@ gtk_tree_popover_create_item (GtkTreePopover *popover, has_submenu = TRUE; view = gtk_cell_view_new_with_context (popover->area, popover->context); - gtk_cell_view_set_model (GTK_CELL_VIEW (view), popover->model); - gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (view), path); - gtk_widget_set_hexpand (view, TRUE); + gtk_cell_view_set_model (view, popover->model); + gtk_cell_view_set_displayed_row (view, path); + gtk_widget_set_hexpand (GTK_WIDGET (view), TRUE); item = gtk_gizmo_new ("modelbutton", NULL, NULL, NULL, NULL); gtk_widget_set_layout_manager (item, gtk_box_layout_new (GTK_ORIENTATION_HORIZONTAL)); @@ -691,7 +692,7 @@ gtk_tree_popover_create_item (GtkTreePopover *popover, gtk_widget_set_parent (indicator, item); } - gtk_widget_set_parent (view, item); + gtk_widget_set_parent (GTK_WIDGET (view), item); indicator = gtk_icon_new (has_submenu ? "arrow" : "none"); gtk_style_context_add_class (gtk_widget_get_style_context (indicator), "right"); diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index e687a71e4b92c06f6ac9800e9b51a5c2a0cff91b..4e57ad25783b6412aeb363712292c68e15629794 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -10114,7 +10114,7 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view) tree_view); gtk_widget_add_controller (tree_view->search_popover, controller); - tree_view->search_entry = gtk_text_new (); + tree_view->search_entry = GTK_WIDGET (gtk_text_new ()); controller = gtk_text_get_key_controller (GTK_TEXT (tree_view->search_entry)); gtk_event_controller_set_propagation_limit (controller, GTK_LIMIT_NONE); diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index aa39d9b9baa9b31b2daeec2f8797a5ccd6f82638..45521d6f93f73174efe48b2c42cc93437feb6441 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -156,7 +156,7 @@ struct _GtkTreeViewColumnPrivate GtkWidget *tree_view; GtkWidget *button; GtkWidget *child; - GtkWidget *arrow; + GtkImage *arrow; GtkWidget *frame; gulong property_changed_signal; gfloat xalign; @@ -881,7 +881,7 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column) child = priv->child; else { - child = gtk_label_new (priv->title); + child = GTK_WIDGET (gtk_label_new (priv->title)); } g_signal_connect (child, "mnemonic-activate", @@ -891,11 +891,11 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column) if (priv->xalign <= 0.5) { gtk_container_add (GTK_CONTAINER (hbox), priv->frame); - gtk_container_add (GTK_CONTAINER (hbox), priv->arrow); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (priv->arrow)); } else { - gtk_container_add (GTK_CONTAINER (hbox), priv->arrow); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (priv->arrow)); gtk_container_add (GTK_CONTAINER (hbox), priv->frame); } @@ -910,7 +910,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) gint sort_column_id = -1; GtkWidget *hbox; GtkWidget *frame; - GtkWidget *arrow; + GtkImage *arrow; GtkWidget *current_child; const gchar *icon_name = "missing-image"; GtkTreeModel *model; @@ -940,7 +940,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) { if (current_child == NULL) { - current_child = gtk_label_new (NULL); + current_child = GTK_WIDGET (gtk_label_new (NULL)); gtk_widget_show (current_child); gtk_container_add (GTK_CONTAINER (frame), current_child); @@ -988,27 +988,27 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) } } - gtk_image_set_from_icon_name (GTK_IMAGE (arrow), icon_name); + gtk_image_set_from_icon_name (arrow, icon_name); /* Put arrow on the right if the text is left-or-center justified, and on the * left otherwise; do this by packing boxes, so flipping text direction will * reverse things */ if (priv->xalign <= 0.5) - gtk_box_reorder_child_after (GTK_BOX (hbox), arrow, gtk_widget_get_last_child (hbox)); + gtk_box_reorder_child_after (GTK_BOX (hbox), GTK_WIDGET (arrow), gtk_widget_get_last_child (hbox)); else - gtk_box_reorder_child_after (GTK_BOX (hbox), arrow, NULL); + gtk_box_reorder_child_after (GTK_BOX (hbox), GTK_WIDGET (arrow), NULL); if (priv->show_sort_indicator || (GTK_IS_TREE_SORTABLE (model) && priv->sort_column_id >= 0)) - gtk_widget_show (arrow); + gtk_widget_show (GTK_WIDGET (arrow)); else - gtk_widget_hide (arrow); + gtk_widget_hide (GTK_WIDGET (arrow)); if (priv->show_sort_indicator) - gtk_widget_set_opacity (arrow, 1.0); + gtk_widget_set_opacity (GTK_WIDGET (arrow), 1.0); else - gtk_widget_set_opacity (arrow, 0.0); + gtk_widget_set_opacity (GTK_WIDGET (arrow), 0.0); /* It's always safe to hide the button. It isn't always safe to show it, as * if you show it before it's realized, it'll get the wrong window. */ diff --git a/gtk/gtkvideo.c b/gtk/gtkvideo.c index 1ae48bcddcdc19859a600931e1c1ed988980be7a..cdec3c719e615ab943e07aaf45e8a7a04ce14d0c 100644 --- a/gtk/gtkvideo.c +++ b/gtk/gtkvideo.c @@ -332,7 +332,7 @@ gtk_video_init (GtkVideo *self) * * Returns: a new #GtkVideo **/ -GtkWidget * +GtkVideo * gtk_video_new (void) { return g_object_new (GTK_TYPE_VIDEO, NULL); @@ -346,7 +346,7 @@ gtk_video_new (void) * * Returns: a new #GtkVideo **/ -GtkWidget * +GtkVideo * gtk_video_new_for_media_stream (GtkMediaStream *stream) { g_return_val_if_fail (stream == NULL || GTK_IS_MEDIA_STREAM (stream), NULL); @@ -364,7 +364,7 @@ gtk_video_new_for_media_stream (GtkMediaStream *stream) * * Returns: a new #GtkVideo **/ -GtkWidget * +GtkVideo * gtk_video_new_for_file (GFile *file) { g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL); @@ -385,10 +385,10 @@ gtk_video_new_for_file (GFile *file) * * Returns: a new #GtkVideo **/ -GtkWidget * +GtkVideo * gtk_video_new_for_filename (const char *filename) { - GtkWidget *result; + GtkVideo *result; GFile *file; if (filename) @@ -415,10 +415,10 @@ gtk_video_new_for_filename (const char *filename) * * Returns: a new #GtkVideo **/ -GtkWidget * +GtkVideo * gtk_video_new_for_resource (const char *resource_path) { - GtkWidget *result; + GtkVideo *result; GFile *file; if (resource_path) diff --git a/gtk/gtkvideo.h b/gtk/gtkvideo.h index cf20a8a08c97804afc19d472be68a999b9652cbb..76d3f66fb3a9a8ad7c7afc4ba3c87da6ddceb6bc 100644 --- a/gtk/gtkvideo.h +++ b/gtk/gtkvideo.h @@ -35,15 +35,15 @@ GDK_AVAILABLE_IN_ALL G_DECLARE_FINAL_TYPE (GtkVideo, gtk_video, GTK, VIDEO, GtkWidget) GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_video_new (void); +GtkVideo * gtk_video_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_video_new_for_media_stream (GtkMediaStream *stream); +GtkVideo * gtk_video_new_for_media_stream (GtkMediaStream *stream); GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_video_new_for_file (GFile *file); +GtkVideo * gtk_video_new_for_file (GFile *file); GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_video_new_for_filename (const char *filename); +GtkVideo * gtk_video_new_for_filename (const char *filename); GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_video_new_for_resource (const char *resource_path); +GtkVideo * gtk_video_new_for_resource (const char *resource_path); GDK_AVAILABLE_IN_ALL GtkMediaStream *gtk_video_get_media_stream (GtkVideo *self); diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index e7dd97fc00572ca56fa23c1db12dee4aaacf270b..41b4ea085967ff21ae4a6d1ee3f0125c4b9a6a45 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -6679,6 +6679,7 @@ gtk_window_do_popup_fallback (GtkWindow *window, { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); GtkWidget *menuitem; + GtkSeparator *separator; GdkSurfaceState state; gboolean maximized, minimized; GtkWidget *box; @@ -6754,8 +6755,8 @@ gtk_window_do_popup_fallback (GtkWindow *window, G_CALLBACK (maximize_window_clicked), window); gtk_container_add (GTK_CONTAINER (box), menuitem); - menuitem = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box), menuitem); + separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (separator)); menuitem = gtk_model_button_new (); g_object_set (menuitem, @@ -6770,8 +6771,8 @@ gtk_window_do_popup_fallback (GtkWindow *window, G_CALLBACK (ontop_window_clicked), window); gtk_container_add (GTK_CONTAINER (box), menuitem); - menuitem = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box), menuitem); + separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (separator)); menuitem = gtk_model_button_new (); g_object_set (menuitem, "text", _("Close"), NULL); @@ -8983,7 +8984,7 @@ gtk_window_set_debugging (GdkDisplay *display, { GtkWidget *dialog = NULL; GtkWidget *area; - GtkWidget *check; + GtkCheckButton *check; GtkWidget *inspector_window; gboolean was_debugging; @@ -9014,9 +9015,9 @@ gtk_window_set_debugging (GdkDisplay *display, area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog)); check = gtk_check_button_new_with_label (_("Don’t show this message again")); - gtk_widget_set_margin_start (check, 10); - gtk_widget_show (check); - gtk_container_add (GTK_CONTAINER (area), check); + gtk_widget_set_margin_start (GTK_WIDGET (check), 10); + gtk_widget_show (GTK_WIDGET (check)); + gtk_container_add (GTK_CONTAINER (area), GTK_WIDGET (check)); g_object_set_data (G_OBJECT (dialog), "check", check); gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_NO); gtk_dialog_add_button (GTK_DIALOG (dialog), _("_OK"), GTK_RESPONSE_YES); diff --git a/gtk/inspector/action-editor.c b/gtk/inspector/action-editor.c index ef6319cc9640350a352b678b2d2f75183a166d21..9832c5aa90edd42aa273e6db1e551df8cd9f30f8 100644 --- a/gtk/inspector/action-editor.c +++ b/gtk/inspector/action-editor.c @@ -81,8 +81,8 @@ variant_editor_new (const GVariantType *type, gpointer data) { GtkWidget *editor; - GtkWidget *label; - GtkWidget *entry; + GtkLabel *label; + GtkEntry *entry; VariantEditorData *d; d = g_new (VariantEditorData, 1); @@ -91,21 +91,21 @@ variant_editor_new (const GVariantType *type, if (g_variant_type_equal (type, G_VARIANT_TYPE_BOOLEAN)) { - editor = gtk_toggle_button_new_with_label ("FALSE"); + editor = GTK_WIDGET (gtk_toggle_button_new_with_label ("FALSE")); g_signal_connect (editor, "notify::active", G_CALLBACK (variant_editor_changed_cb), d); } else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING)) { - editor = gtk_entry_new (); + editor = GTK_WIDGET (gtk_entry_new ()); g_signal_connect (editor, "notify::text", G_CALLBACK (variant_editor_changed_cb), d); } else { editor = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); entry = gtk_entry_new (); - gtk_container_add (GTK_CONTAINER (editor), entry); + gtk_container_add (GTK_CONTAINER (editor), GTK_WIDGET (entry)); label = gtk_label_new (g_variant_type_peek_string (type)); - gtk_container_add (GTK_CONTAINER (editor), label); + gtk_container_add (GTK_CONTAINER (editor), GTK_WIDGET (label)); g_signal_connect (entry, "notify::text", G_CALLBACK (variant_editor_changed_cb), d); } @@ -283,7 +283,7 @@ constructed (GObject *object) GVariant *state; GtkWidget *row; GtkWidget *activate; - GtkWidget *label; + GtkLabel *label; r->priv->enabled = g_action_group_get_action_enabled (r->priv->group, r->priv->name); state = g_action_group_get_action_state (r->priv->group, r->priv->name); @@ -314,8 +314,8 @@ constructed (GObject *object) r->priv->state_type = g_variant_type_copy (g_variant_get_type (state)); row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); label = gtk_label_new (_("Set State")); - gtk_size_group_add_widget (r->priv->sg, label); - gtk_container_add (GTK_CONTAINER (row), label); + gtk_size_group_add_widget (r->priv->sg, GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (label)); r->priv->state_entry = variant_editor_new (r->priv->state_type, state_changed, r); variant_editor_set_value (r->priv->state_entry, state); gtk_container_add (GTK_CONTAINER (row), r->priv->state_entry); diff --git a/gtk/inspector/actions.c b/gtk/inspector/actions.c index 8a2f51604fb6104ff4d70fcbd8c6e34f5f71d119..01cd7a3eb3ca4cdedf02e7fb2e07f2e883819060 100644 --- a/gtk/inspector/actions.c +++ b/gtk/inspector/actions.c @@ -70,7 +70,7 @@ add_action (GtkInspectorActions *sl, GVariant *state; gchar *state_string; GtkWidget *row; - GtkWidget *label; + GtkLabel *label; GtkWidget *box; char *key = g_strdup (name); GtkWidget *editor; @@ -91,31 +91,31 @@ add_action (GtkInspectorActions *sl, gtk_container_add (GTK_CONTAINER (row), box); label = gtk_label_new (name); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "cell"); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_size_group_add_widget (sl->priv->name, label); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "cell"); + gtk_label_set_xalign (label, 0); + gtk_size_group_add_widget (sl->priv->name, GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); label = gtk_label_new (enabled ? "+" : "-"); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "cell"); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_widget_set_halign (label, GTK_ALIGN_CENTER); - gtk_size_group_add_widget (sl->priv->enabled, label); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "cell"); + gtk_label_set_xalign (label, 0); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_size_group_add_widget (sl->priv->enabled, GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); g_object_set_data (G_OBJECT (row), "enabled", label); label = gtk_label_new (parameter); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "cell"); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_size_group_add_widget (sl->priv->parameter, label); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "cell"); + gtk_label_set_xalign (label, 0); + gtk_size_group_add_widget (sl->priv->parameter, GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); label = gtk_label_new (state_string); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "cell"); - gtk_size_group_add_widget (sl->priv->state, label); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_label_set_xalign (label, 0); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "cell"); + gtk_size_group_add_widget (sl->priv->state, GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); g_object_set_data (G_OBJECT (row), "state", label); editor = gtk_inspector_action_editor_new (group, name, sl->priv->activate); @@ -174,10 +174,10 @@ static void set_row_enabled (GtkWidget *row, gboolean enabled) { - GtkWidget *label; + GtkLabel *label; - label = GTK_WIDGET (g_object_get_data (G_OBJECT (row), "enabled")); - gtk_label_set_label (GTK_LABEL (label), enabled ? "+" : "-" ); + label = GTK_LABEL (g_object_get_data (G_OBJECT (row), "enabled")); + gtk_label_set_label (label, enabled ? "+" : "-" ); } static void @@ -197,14 +197,14 @@ set_row_state (GtkWidget *row, GVariant *state) { gchar *state_string; - GtkWidget *label; + GtkLabel *label; if (state) state_string = g_variant_print (state, FALSE); else state_string = g_strdup (""); - label = GTK_WIDGET (g_object_get_data (G_OBJECT (row), "state")); - gtk_label_set_label (GTK_LABEL (label), state_string); + label = GTK_LABEL (g_object_get_data (G_OBJECT (row), "state")); + gtk_label_set_label (label, state_string); g_free (state_string); } diff --git a/gtk/inspector/controllers.c b/gtk/inspector/controllers.c index deea5b866fd586c357de7f900f33a4784618a29d..70d306a19195373373b1111b3262d379b962038e 100644 --- a/gtk/inspector/controllers.c +++ b/gtk/inspector/controllers.c @@ -116,8 +116,8 @@ create_controller_widget (gpointer item, GtkInspectorControllers *sl = user_data; GtkWidget *row; GtkWidget *box; - GtkWidget *label; - GtkWidget *combo; + GtkLabel *label; + GtkComboBoxText *combo; row = gtk_list_box_row_new (); gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE); @@ -126,20 +126,20 @@ create_controller_widget (gpointer item, g_object_set (box, "margin", 10, NULL); label = gtk_label_new (G_OBJECT_TYPE_NAME (controller)); g_object_set (label, "xalign", 0.0, NULL); - gtk_container_add (GTK_CONTAINER (box), label); - gtk_size_group_add_widget (sl->priv->sizegroup, label); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); + gtk_size_group_add_widget (sl->priv->sizegroup, GTK_WIDGET (label)); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_NONE, C_("event phase", "None")); - gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_CAPTURE, C_("event phase", "Capture")); - gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_BUBBLE, C_("event phase", "Bubble")); - gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_TARGET, C_("event phase", "Target")); + gtk_combo_box_text_insert_text (combo, GTK_PHASE_NONE, C_("event phase", "None")); + gtk_combo_box_text_insert_text (combo, GTK_PHASE_CAPTURE, C_("event phase", "Capture")); + gtk_combo_box_text_insert_text (combo, GTK_PHASE_BUBBLE, C_("event phase", "Bubble")); + gtk_combo_box_text_insert_text (combo, GTK_PHASE_TARGET, C_("event phase", "Target")); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), gtk_event_controller_get_propagation_phase (controller)); - gtk_container_add (GTK_CONTAINER (box), combo); - gtk_widget_set_halign (label, GTK_ALIGN_END); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo)); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); g_object_set_data (G_OBJECT (row), "controller", controller); g_signal_connect (combo, "changed", G_CALLBACK (phase_changed_cb), sl); diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c index 4cb20632d7d2cc964536ebc106b01c660796728e..e928848f69b2849da6d266e4943a8ef01965997c 100644 --- a/gtk/inspector/css-editor.c +++ b/gtk/inspector/css-editor.c @@ -234,7 +234,7 @@ static void save_clicked (GtkButton *button, GtkInspectorCssEditor *ce) { - GtkWidget *dialog; + GtkFileChooserDialog *dialog; dialog = gtk_file_chooser_dialog_new ("", GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (ce))), @@ -247,7 +247,7 @@ save_clicked (GtkButton *button, gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); g_signal_connect (dialog, "response", G_CALLBACK (save_response), ce); - gtk_widget_show (dialog); + gtk_widget_show (GTK_WIDGET (dialog)); } static void diff --git a/gtk/inspector/data-list.c b/gtk/inspector/data-list.c index c15ace135217816bde0b1dfcfdde00ab2e6d82be..28090692aafe8aa9f36b64c7c4c36d690c1d8810 100644 --- a/gtk/inspector/data-list.c +++ b/gtk/inspector/data-list.c @@ -34,7 +34,7 @@ struct _GtkInspectorDataListPrivate GtkTreeModel *object; GtkTreeModel *types; GtkTreeView *view; - GtkWidget *object_title; + GtkLabel *object_title; gboolean show_data; }; @@ -135,7 +135,7 @@ gtk_inspector_data_list_set_object (GtkInspectorDataList *sl, } title = gtk_inspector_get_object_title (object); - gtk_label_set_label (GTK_LABEL (sl->priv->object_title), title); + gtk_label_set_label (sl->priv->object_title, title); g_free (title); g_object_set (page, "visible", TRUE, NULL); diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c index 5d50c67b0fee32fe947bd002045d8c702d3e7451..d966b0adbe436df56b5f70d215f67cab812fb4e5 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -69,23 +69,23 @@ struct _GtkInspectorGeneralPrivate GtkWidget *gl_box; GtkWidget *vulkan_box; GtkWidget *device_box; - GtkWidget *gtk_version; - GtkWidget *gdk_backend; - GtkWidget *gsk_renderer; - GtkWidget *pango_fontmap; - GtkWidget *gl_version; - GtkWidget *gl_vendor; - GtkWidget *vk_device; - GtkWidget *vk_api_version; - GtkWidget *vk_driver_version; - GtkWidget *prefix; - GtkWidget *xdg_data_home; - GtkWidget *xdg_data_dirs; - GtkWidget *gtk_path; - GtkWidget *gtk_exe_prefix; - GtkWidget *gtk_data_prefix; - GtkWidget *gsettings_schema_dir; - GtkWidget *display_name; + GtkLabel *gtk_version; + GtkLabel *gdk_backend; + GtkLabel *gsk_renderer; + GtkLabel *pango_fontmap; + GtkLabel *gl_version; + GtkLabel *gl_vendor; + GtkLabel *vk_device; + GtkLabel *vk_api_version; + GtkLabel *vk_driver_version; + GtkLabel *prefix; + GtkLabel *xdg_data_home; + GtkLabel *xdg_data_dirs; + GtkLabel *gtk_path; + GtkLabel *gtk_exe_prefix; + GtkLabel *gtk_data_prefix; + GtkLabel *gsettings_schema_dir; + GtkLabel *display_name; GtkWidget *display_rgba; GtkWidget *display_composited; GtkSizeGroup *labels; @@ -146,9 +146,9 @@ init_version (GtkInspectorGeneral *gen) g_object_unref (gsk_renderer); gdk_surface_destroy (surface); - gtk_label_set_text (GTK_LABEL (gen->priv->gtk_version), GTK_VERSION); - gtk_label_set_text (GTK_LABEL (gen->priv->gdk_backend), backend); - gtk_label_set_text (GTK_LABEL (gen->priv->gsk_renderer), renderer); + gtk_label_set_text (gen->priv->gtk_version, GTK_VERSION); + gtk_label_set_text (gen->priv->gdk_backend, backend); + gtk_label_set_text (gen->priv->gsk_renderer, renderer); } static G_GNUC_UNUSED void @@ -158,7 +158,9 @@ add_check_row (GtkInspectorGeneral *gen, gboolean value, gint indent) { - GtkWidget *row, *box, *label, *check; + GtkWidget *row, *box; + GtkImage *check; + GtkLabel *label; box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 40); g_object_set (box, @@ -167,17 +169,17 @@ add_check_row (GtkInspectorGeneral *gen, NULL); label = gtk_label_new (name); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_widget_set_hexpand (label, TRUE); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_label_set_xalign (label, 0.0); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); check = gtk_image_new_from_icon_name ("object-select-symbolic"); - gtk_widget_set_halign (check, GTK_ALIGN_END); - gtk_widget_set_valign (check, GTK_ALIGN_BASELINE); - gtk_widget_set_opacity (check, value ? 1.0 : 0.0); - gtk_container_add (GTK_CONTAINER (box), check); + gtk_widget_set_halign (GTK_WIDGET (check), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (check), GTK_ALIGN_BASELINE); + gtk_widget_set_opacity (GTK_WIDGET (check), value ? 1.0 : 0.0); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (check)); row = gtk_list_box_row_new (); gtk_container_add (GTK_CONTAINER (row), box); @@ -186,7 +188,7 @@ add_check_row (GtkInspectorGeneral *gen, gtk_widget_set_hexpand (box, FALSE); gtk_list_box_insert (list, row, -1); - gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label); + gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), GTK_WIDGET (label)); } static void @@ -197,7 +199,7 @@ add_label_row (GtkInspectorGeneral *gen, gint indent) { GtkWidget *box; - GtkWidget *label; + GtkLabel *label; GtkWidget *row; box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 40); @@ -207,18 +209,18 @@ add_label_row (GtkInspectorGeneral *gen, NULL); label = gtk_label_new (name); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_widget_set_hexpand (label, TRUE); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_label_set_xalign (label, 0.0); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); label = gtk_label_new (value); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); - gtk_widget_set_halign (label, GTK_ALIGN_END); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_label_set_xalign (GTK_LABEL (label), 1.0); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_label_set_selectable (label, TRUE); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_label_set_xalign (label, 1.0); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); row = gtk_list_box_row_new (); gtk_container_add (GTK_CONTAINER (row), box); @@ -227,7 +229,7 @@ add_label_row (GtkInspectorGeneral *gen, gtk_widget_set_hexpand (box, FALSE); gtk_list_box_insert (GTK_LIST_BOX (list), row, -1); - gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label); + gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), GTK_WIDGET (label)); } #ifdef GDK_WINDOWING_X11 @@ -298,9 +300,9 @@ init_gl (GtkInspectorGeneral *gen) return; version = g_strconcat ("GLX ", glXGetClientString (dpy, GLX_VERSION), NULL); - gtk_label_set_text (GTK_LABEL (gen->priv->gl_version), version); + gtk_label_set_text (gen->priv->gl_version, version); g_free (version); - gtk_label_set_text (GTK_LABEL (gen->priv->gl_vendor), glXGetClientString (dpy, GLX_VENDOR)); + gtk_label_set_text (gen->priv->gl_vendor, glXGetClientString (dpy, GLX_VENDOR)); append_glx_extension_row (gen, dpy, "GLX_ARB_create_context_profile"); append_glx_extension_row (gen, dpy, "GLX_SGI_swap_control"); @@ -326,9 +328,9 @@ init_gl (GtkInspectorGeneral *gen) return; version = g_strconcat ("EGL ", eglQueryString (dpy, EGL_VERSION), NULL); - gtk_label_set_text (GTK_LABEL (gen->priv->gl_version), version); + gtk_label_set_text (gen->priv->gl_version, version); g_free (version); - gtk_label_set_text (GTK_LABEL (gen->priv->gl_vendor), eglQueryString (dpy, EGL_VENDOR)); + gtk_label_set_text (gen->priv->gl_vendor, eglQueryString (dpy, EGL_VENDOR)); append_egl_extension_row (gen, dpy, "EGL_KHR_create_context"); append_egl_extension_row (gen, dpy, "EGL_EXT_buffer_age"); @@ -338,8 +340,8 @@ init_gl (GtkInspectorGeneral *gen) else #endif { - gtk_label_set_text (GTK_LABEL (gen->priv->gl_version), C_("GL version", "None")); - gtk_label_set_text (GTK_LABEL (gen->priv->gl_vendor), C_("GL vendor", "None")); + gtk_label_set_text (gen->priv->gl_version, C_("GL version", "None")); + gtk_label_set_text (gen->priv->gl_vendor, C_("GL vendor", "None")); } } @@ -413,9 +415,9 @@ init_vulkan (GtkInspectorGeneral *gen) VK_VERSION_MINOR (props.driverVersion), VK_VERSION_PATCH (props.driverVersion)); - gtk_label_set_text (GTK_LABEL (gen->priv->vk_device), device_name); - gtk_label_set_text (GTK_LABEL (gen->priv->vk_api_version), api_version); - gtk_label_set_text (GTK_LABEL (gen->priv->vk_driver_version), driver_version); + gtk_label_set_text (gen->priv->vk_device, device_name); + gtk_label_set_text (gen->priv->vk_api_version, api_version); + gtk_label_set_text (gen->priv->vk_driver_version, driver_version); g_free (device_name); g_free (api_version); @@ -440,26 +442,26 @@ init_vulkan (GtkInspectorGeneral *gen) else #endif { - gtk_label_set_text (GTK_LABEL (gen->priv->vk_device), C_("Vulkan device", "None")); - gtk_label_set_text (GTK_LABEL (gen->priv->vk_api_version), C_("Vulkan version", "None")); - gtk_label_set_text (GTK_LABEL (gen->priv->vk_driver_version), C_("Vulkan version", "None")); + gtk_label_set_text (gen->priv->vk_device, C_("Vulkan device", "None")); + gtk_label_set_text (gen->priv->vk_api_version, C_("Vulkan version", "None")); + gtk_label_set_text (gen->priv->vk_driver_version, C_("Vulkan version", "None")); } } static void -set_monospace_font (GtkWidget *w) +set_monospace_font (GtkLabel *w) { PangoAttrList *attrs; attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_fallback_new (FALSE)); pango_attr_list_insert (attrs, pango_attr_family_new ("Monospace")); - gtk_label_set_attributes (GTK_LABEL (w), attrs); + gtk_label_set_attributes (w, attrs); pango_attr_list_unref (attrs); } static void -set_path_label (GtkWidget *w, +set_path_label (GtkLabel *w, const gchar *var) { const gchar *v; @@ -468,12 +470,12 @@ set_path_label (GtkWidget *w, if (v != NULL) { set_monospace_font (w); - gtk_label_set_text (GTK_LABEL (w), v); + gtk_label_set_text (w, v); } else { GtkWidget *r; - r = gtk_widget_get_ancestor (w, GTK_TYPE_LIST_BOX_ROW); + r = gtk_widget_get_ancestor (GTK_WIDGET (w), GTK_TYPE_LIST_BOX_ROW); gtk_widget_hide (r); } } @@ -482,7 +484,7 @@ static void init_env (GtkInspectorGeneral *gen) { set_monospace_font (gen->priv->prefix); - gtk_label_set_text (GTK_LABEL (gen->priv->prefix), _gtk_get_data_prefix ()); + gtk_label_set_text (gen->priv->prefix, _gtk_get_data_prefix ()); set_path_label (gen->priv->xdg_data_home, "XDG_DATA_HOME"); set_path_label (gen->priv->xdg_data_dirs, "XDG_DATA_DIRS"); set_path_label (gen->priv->gtk_path, "GTK_PATH"); @@ -521,7 +523,7 @@ populate_display (GdkDisplay *display, GtkInspectorGeneral *gen) for (l = children; l; l = l->next) { child = l->data; - if (gtk_widget_is_ancestor (gen->priv->display_name, child) || + if (gtk_widget_is_ancestor (GTK_WIDGET (gen->priv->display_name), child) || gtk_widget_is_ancestor (gen->priv->display_rgba, child) || gtk_widget_is_ancestor (gen->priv->display_composited, child)) continue; @@ -530,7 +532,7 @@ populate_display (GdkDisplay *display, GtkInspectorGeneral *gen) } g_list_free (children); - gtk_label_set_label (GTK_LABEL (gen->priv->display_name), gdk_display_get_name (display)); + gtk_label_set_label (gen->priv->display_name, gdk_display_get_name (display)); gtk_widget_set_visible (gen->priv->display_rgba, gdk_display_is_rgba (display)); @@ -637,7 +639,7 @@ init_pango (GtkInspectorGeneral *gen) else name = type; - gtk_label_set_label (GTK_LABEL (gen->priv->pango_fontmap), name); + gtk_label_set_label (gen->priv->pango_fontmap, name); } static void populate_seats (GtkInspectorGeneral *gen); diff --git a/gtk/inspector/misc-info.c b/gtk/inspector/misc-info.c index c4eaa54ca834c3e8e935705c2c947a0e5a1ce286..565b87a6a166e16c637c6ef1c4d727f5c0ef51b8 100644 --- a/gtk/inspector/misc-info.c +++ b/gtk/inspector/misc-info.c @@ -39,44 +39,44 @@ struct _GtkInspectorMiscInfoPrivate { GObject *object; GtkWidget *swin; - GtkWidget *address; + GtkLabel *address; GtkWidget *type; GtkWidget *type_popover; GtkWidget *refcount_row; - GtkWidget *refcount; + GtkLabel *refcount; GtkWidget *state_row; - GtkWidget *state; + GtkLabel *state; GtkWidget *buildable_id_row; - GtkWidget *buildable_id; + GtkLabel *buildable_id; GtkWidget *mnemonic_label_row; GtkWidget *mnemonic_label; GtkWidget *request_mode_row; - GtkWidget *request_mode; + GtkLabel *request_mode; GtkWidget *allocated_size_row; - GtkWidget *allocated_size; + GtkLabel *allocated_size; GtkWidget *baseline_row; - GtkWidget *baseline; + GtkLabel *baseline; GtkWidget *surface_row; - GtkWidget *surface; + GtkLabel *surface; GtkWidget *surface_button; GtkWidget *renderer_row; - GtkWidget *renderer; + GtkLabel *renderer; GtkWidget *renderer_button; GtkWidget *frame_clock_row; - GtkWidget *frame_clock; + GtkLabel *frame_clock; GtkWidget *frame_clock_button; GtkWidget *tick_callback_row; GtkWidget *tick_callback; GtkWidget *framerate_row; - GtkWidget *framerate; + GtkLabel *framerate; GtkWidget *framecount_row; - GtkWidget *framecount; + GtkLabel *framecount; GtkWidget *accessible_role_row; - GtkWidget *accessible_role; + GtkLabel *accessible_role; GtkWidget *accessible_name_row; - GtkWidget *accessible_name; + GtkLabel *accessible_name; GtkWidget *accessible_description_row; - GtkWidget *accessible_description; + GtkLabel *accessible_description; GtkWidget *mapped_row; GtkWidget *mapped; GtkWidget *realized_row; @@ -133,7 +133,7 @@ state_flags_changed (GtkWidget *w, GtkStateFlags old_flags, GtkInspectorMiscInfo gchar *s; s = format_state_flags (gtk_widget_get_state_flags (w)); - gtk_label_set_label (GTK_LABEL (sl->priv->state), s); + gtk_label_set_label (sl->priv->state, s); g_free (s); } @@ -154,16 +154,16 @@ allocation_changed (GtkWidget *w, alloc.width, alloc.height, alloc.x, alloc.y); - gtk_label_set_label (GTK_LABEL (sl->priv->allocated_size), size_label); + gtk_label_set_label (sl->priv->allocated_size, size_label); g_free (size_label); size_label = g_strdup_printf ("%d", gtk_widget_get_allocated_baseline (w)); - gtk_label_set_label (GTK_LABEL (sl->priv->baseline), size_label); + gtk_label_set_label (sl->priv->baseline, size_label); g_free (size_label); class = G_ENUM_CLASS (g_type_class_ref (GTK_TYPE_SIZE_REQUEST_MODE)); value = g_enum_get_value (class, gtk_widget_get_request_mode (w)); - gtk_label_set_label (GTK_LABEL (sl->priv->request_mode), value->value_nick); + gtk_label_set_label (sl->priv->request_mode, value->value_nick); g_type_class_unref (class); } @@ -242,7 +242,7 @@ update_surface (GtkInspectorMiscInfo *sl) obj = (GObject *)gtk_native_get_surface (GTK_NATIVE (sl->priv->object)); tmp = g_strdup_printf ("%p", obj); - gtk_label_set_label (GTK_LABEL (sl->priv->surface), tmp); + gtk_label_set_label (sl->priv->surface, tmp); g_free (tmp); } else @@ -263,7 +263,7 @@ update_renderer (GtkInspectorMiscInfo *sl) obj = (GObject *)gtk_native_get_surface (GTK_NATIVE (sl->priv->object)); tmp = g_strdup_printf ("%p", obj); - gtk_label_set_label (GTK_LABEL (sl->priv->renderer), tmp); + gtk_label_set_label (sl->priv->renderer, tmp); g_free (tmp); } else @@ -286,13 +286,13 @@ update_frame_clock (GtkInspectorMiscInfo *sl) { gchar *tmp; tmp = g_strdup_printf ("%p", clock); - gtk_label_set_label (GTK_LABEL (sl->priv->frame_clock), tmp); + gtk_label_set_label (sl->priv->frame_clock, tmp); g_free (tmp); gtk_widget_set_sensitive (sl->priv->frame_clock_button, TRUE); } else { - gtk_label_set_label (GTK_LABEL (sl->priv->frame_clock), "NULL"); + gtk_label_set_label (sl->priv->frame_clock, "NULL"); gtk_widget_set_sensitive (sl->priv->frame_clock_button, FALSE); } } @@ -310,7 +310,7 @@ update_info (gpointer data) GType gtype; tmp = g_strdup_printf ("%p", sl->priv->object); - gtk_label_set_text (GTK_LABEL (sl->priv->address), tmp); + gtk_label_set_text (sl->priv->address, tmp); g_free (tmp); gtype = G_TYPE_FROM_INSTANCE (sl->priv->object); @@ -322,7 +322,7 @@ update_info (gpointer data) if (G_IS_OBJECT (sl->priv->object)) { tmp = g_strdup_printf ("%d", sl->priv->object->ref_count); - gtk_label_set_text (GTK_LABEL (sl->priv->refcount), tmp); + gtk_label_set_text (sl->priv->refcount, tmp); g_free (tmp); } @@ -352,9 +352,9 @@ update_info (gpointer data) accessible = ATK_OBJECT (gtk_widget_get_accessible (GTK_WIDGET (sl->priv->object))); role = atk_object_get_role (accessible); - gtk_label_set_text (GTK_LABEL (sl->priv->accessible_role), atk_role_get_name (role)); - gtk_label_set_text (GTK_LABEL (sl->priv->accessible_name), atk_object_get_name (accessible)); - gtk_label_set_text (GTK_LABEL (sl->priv->accessible_description), atk_object_get_description (accessible)); + gtk_label_set_text (sl->priv->accessible_role, atk_role_get_name (role)); + gtk_label_set_text (sl->priv->accessible_name, atk_object_get_name (accessible)); + gtk_label_set_text (sl->priv->accessible_description, atk_object_get_description (accessible)); gtk_widget_set_visible (sl->priv->mapped, gtk_widget_get_mapped (GTK_WIDGET (sl->priv->object))); gtk_widget_set_visible (sl->priv->realized, gtk_widget_get_realized (GTK_WIDGET (sl->priv->object))); gtk_widget_set_visible (sl->priv->is_toplevel, GTK_IS_ROOT (sl->priv->object)); @@ -367,7 +367,7 @@ update_info (gpointer data) if (GTK_IS_BUILDABLE (sl->priv->object)) { - gtk_label_set_text (GTK_LABEL (sl->priv->buildable_id), + gtk_label_set_text (sl->priv->buildable_id, gtk_buildable_get_name (GTK_BUILDABLE (sl->priv->object))); } @@ -386,7 +386,7 @@ update_info (gpointer data) frame_time = gdk_frame_clock_get_frame_time (clock); tmp = g_strdup_printf ("%"G_GINT64_FORMAT, frame); - gtk_label_set_label (GTK_LABEL (sl->priv->framecount), tmp); + gtk_label_set_label (sl->priv->framecount, tmp); g_free (tmp); history_start = gdk_frame_clock_get_history_start (clock); @@ -397,12 +397,12 @@ update_info (gpointer data) previous_timings = gdk_frame_clock_get_timings (clock, history_start); previous_frame_time = gdk_frame_timings_get_frame_time (previous_timings); tmp = g_strdup_printf ("%4.1f ⁄ s", (G_USEC_PER_SEC * history_len) / (double) (frame_time - previous_frame_time)); - gtk_label_set_label (GTK_LABEL (sl->priv->framerate), tmp); + gtk_label_set_label (sl->priv->framerate, tmp); g_free (tmp); } else { - gtk_label_set_label (GTK_LABEL (sl->priv->framerate), "—"); + gtk_label_set_label (sl->priv->framerate, "—"); } sl->priv->last_frame = frame; diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c index c6f4665d8e51ed6e00ad1dc4d887f7c58994fa41..ceebca4ceb50119a0ab91ab7d4b5653e65d140d1 100644 --- a/gtk/inspector/object-tree.c +++ b/gtk/inspector/object-tree.c @@ -988,6 +988,7 @@ gtk_inspector_object_tree_create_list_widget (gpointer row_item, GtkInspectorObjectTree *wt = user_data; gpointer item; GtkWidget *row, *box, *column, *child; + GtkLabel *label; guint depth; item = gtk_tree_list_row_get_item (row_item); @@ -1033,37 +1034,37 @@ gtk_inspector_object_tree_create_list_widget (gpointer row_item, } else { - child = gtk_image_new (); /* empty whatever */ + child = GTK_WIDGET (gtk_image_new ()); /* empty whatever */ } gtk_container_add (GTK_CONTAINER (column), child); /* 1st column: type name */ - child = gtk_label_new (G_OBJECT_TYPE_NAME (item)); - gtk_label_set_width_chars (GTK_LABEL (child), 30); - gtk_label_set_xalign (GTK_LABEL (child), 0.0); - gtk_container_add (GTK_CONTAINER (column), child); + label = gtk_label_new (G_OBJECT_TYPE_NAME (item)); + gtk_label_set_width_chars (label, 30); + gtk_label_set_xalign (label, 0.0); + gtk_container_add (GTK_CONTAINER (column), GTK_WIDGET (label)); /* 2nd column: name */ - child = gtk_label_new (gtk_inspector_get_object_name (item)); - gtk_label_set_width_chars (GTK_LABEL (child), 15); - gtk_label_set_xalign (GTK_LABEL (child), 0.0); - gtk_size_group_add_widget (wt->priv->name_size_group, child); - gtk_container_add (GTK_CONTAINER (box), child); + label = gtk_label_new (gtk_inspector_get_object_name (item)); + gtk_label_set_width_chars (label, 15); + gtk_label_set_xalign (label, 0.0); + gtk_size_group_add_widget (wt->priv->name_size_group, GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); /* 3rd column: label */ - child = gtk_label_new (NULL); + label = gtk_label_new (NULL); if (GTK_IS_LABEL (item)) - g_object_bind_property (item, "label", child, "label", G_BINDING_SYNC_CREATE); + g_object_bind_property (item, "label", label, "label", G_BINDING_SYNC_CREATE); else if (GTK_IS_BUTTON (item)) - g_object_bind_property (item, "label", child, "label", G_BINDING_SYNC_CREATE); + g_object_bind_property (item, "label", label, "label", G_BINDING_SYNC_CREATE); else if (GTK_IS_WINDOW (item)) - g_object_bind_property (item, "title", child, "label", G_BINDING_SYNC_CREATE); + g_object_bind_property (item, "title", label, "label", G_BINDING_SYNC_CREATE); else if (GTK_IS_TREE_VIEW_COLUMN (item)) - g_object_bind_property (item, "title", child, "label", G_BINDING_SYNC_CREATE); - gtk_label_set_width_chars (GTK_LABEL (child), 15); - gtk_label_set_xalign (GTK_LABEL (child), 0.0); - gtk_size_group_add_widget (wt->priv->label_size_group, child); - gtk_container_add (GTK_CONTAINER (box), child); + g_object_bind_property (item, "title", label, "label", G_BINDING_SYNC_CREATE); + gtk_label_set_width_chars (label, 15); + gtk_label_set_xalign (label, 0.0); + gtk_size_group_add_widget (wt->priv->label_size_group, GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); g_object_unref (item); diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c index 6c7471b0e3ec247ff2baebaf062e600403bf63a7..857d7df220d1f8adab247644df5c3eff7cdff08b 100644 --- a/gtk/inspector/prop-editor.c +++ b/gtk/inspector/prop-editor.c @@ -666,19 +666,20 @@ object_label (GObject *obj, GParamSpec *pspec) static void object_changed (GObject *object, GParamSpec *pspec, gpointer data) { - GtkWidget *label, *button; + GtkLabel *label; + GtkWidget *button; gchar *str; GObject *obj; GList *children = gtk_container_get_children (GTK_CONTAINER (data)); - label = GTK_WIDGET (children->data); + label = GTK_LABEL (children->data); button = GTK_WIDGET (children->next->data); g_object_get (object, pspec->name, &obj, NULL); g_list_free (children); str = object_label (obj, pspec); - gtk_label_set_text (GTK_LABEL (label), str); + gtk_label_set_text (label, str); gtk_widget_set_sensitive (button, G_IS_OBJECT (obj)); if (obj) @@ -781,7 +782,8 @@ static GtkWidget * create_row (gpointer item, gpointer user_data) { - GtkWidget *row, *label, *button; + GtkWidget *row, *button; + GtkLabel *label; char *name; name = object_label (G_OBJECT (item), NULL); @@ -793,7 +795,7 @@ create_row (gpointer item, g_signal_connect (button, "clicked", G_CALLBACK (item_properties), user_data); row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_container_add (GTK_CONTAINER (row), label); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (row), button); return row; @@ -881,7 +883,7 @@ property_editor (GObject *object, } else if (type == G_TYPE_PARAM_STRING) { - prop_edit = gtk_entry_new (); + prop_edit = GTK_WIDGET (gtk_entry_new ()); g_object_connect_property (object, spec, G_CALLBACK (string_changed), @@ -896,7 +898,7 @@ property_editor (GObject *object, } else if (type == G_TYPE_PARAM_BOOLEAN) { - prop_edit = gtk_check_button_new_with_label (""); + prop_edit = GTK_WIDGET (gtk_check_button_new_with_label ("")); g_object_connect_property (object, spec, G_CALLBACK (bool_changed), @@ -911,7 +913,7 @@ property_editor (GObject *object, GEnumClass *eclass; gint j; - prop_edit = gtk_combo_box_text_new (); + prop_edit = GTK_WIDGET (gtk_combo_box_text_new ()); eclass = G_ENUM_CLASS (g_type_class_ref (spec->value_type)); @@ -962,12 +964,12 @@ property_editor (GObject *object, for (j = 0; j < fclass->n_values; j++) { - GtkWidget *b; + GtkCheckButton *b; b = gtk_check_button_new_with_label (fclass->values[j].value_nick); g_object_set_data (G_OBJECT (b), "index", GINT_TO_POINTER (j)); - gtk_widget_show (b); - gtk_container_add (GTK_CONTAINER (box), b); + gtk_widget_show (GTK_WIDGET (b)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (b)); connect_controller (G_OBJECT (b), "toggled", object, spec, G_CALLBACK (flags_modified)); } @@ -984,7 +986,7 @@ property_editor (GObject *object, } else if (type == G_TYPE_PARAM_UNICHAR) { - prop_edit = gtk_entry_new (); + prop_edit = GTK_WIDGET (gtk_entry_new ()); gtk_entry_set_max_length (GTK_ENTRY (prop_edit), 1); g_object_connect_property (object, spec, @@ -996,7 +998,7 @@ property_editor (GObject *object, } else if (type == G_TYPE_PARAM_POINTER) { - prop_edit = gtk_label_new (""); + prop_edit = GTK_WIDGET (gtk_label_new ("")); g_object_connect_property (object, spec, G_CALLBACK (pointer_changed), @@ -1036,7 +1038,8 @@ property_editor (GObject *object, } else if (type == G_TYPE_PARAM_OBJECT) { - GtkWidget *label, *button; + GtkLabel *label; + GtkWidget *button; prop_edit = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -1045,9 +1048,9 @@ property_editor (GObject *object, g_signal_connect_swapped (button, "clicked", G_CALLBACK (object_properties), editor); - gtk_container_add (GTK_CONTAINER (prop_edit), label); + gtk_container_add (GTK_CONTAINER (prop_edit), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (prop_edit), button); - gtk_widget_show (label); + gtk_widget_show (GTK_WIDGET (label)); gtk_widget_show (button); g_object_connect_property (object, spec, @@ -1057,7 +1060,7 @@ property_editor (GObject *object, else if (type == G_TYPE_PARAM_BOXED && G_PARAM_SPEC_VALUE_TYPE (spec) == GDK_TYPE_RGBA) { - prop_edit = gtk_color_button_new (); + prop_edit = GTK_WIDGET (gtk_color_button_new ()); gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (prop_edit), TRUE); g_object_connect_property (object, spec, @@ -1100,7 +1103,7 @@ property_editor (GObject *object, { msg = g_strdup_printf (_("Uneditable property type: %s"), g_type_name (G_PARAM_SPEC_TYPE (spec))); - prop_edit = gtk_label_new (msg); + prop_edit = GTK_WIDGET (gtk_label_new (msg)); g_free (msg); gtk_widget_set_halign (prop_edit, GTK_ALIGN_START); gtk_widget_set_valign (prop_edit, GTK_ALIGN_CENTER); @@ -1191,10 +1194,10 @@ attribute_editor (GObject *object, GtkCellArea *area; GtkTreeModel *model = NULL; gint col = -1; - GtkWidget *label; + GtkLabel *label; GtkWidget *button; GtkWidget *box; - GtkWidget *combo; + GtkComboBox *combo; gchar *text; gint i; gboolean sensitive; @@ -1215,14 +1218,14 @@ attribute_editor (GObject *object, box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); label = gtk_label_new (_("Attribute:")); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); button = gtk_button_new_with_label (_("Model")); g_object_set_data (G_OBJECT (button), "model", model); g_signal_connect (button, "clicked", G_CALLBACK (model_properties), editor); gtk_container_add (GTK_CONTAINER (box), button); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new (_("Column:"))); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new (_("Column:")))); store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store)); renderer = gtk_cell_renderer_text_new (); @@ -1242,11 +1245,11 @@ attribute_editor (GObject *object, gtk_list_store_set (store, &iter, 0, text, 1, sensitive, -1); g_free (text); } - gtk_combo_box_set_active (GTK_COMBO_BOX (combo), col + 1); - attribute_mapping_changed (GTK_COMBO_BOX (combo), editor); + gtk_combo_box_set_active (combo, col + 1); + attribute_mapping_changed (combo, editor); g_signal_connect (combo, "changed", G_CALLBACK (attribute_mapping_changed), editor); - gtk_container_add (GTK_CONTAINER (box), combo); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo)); return box; } @@ -1314,7 +1317,7 @@ action_editor (GObject *object, { text = g_strdup_printf (_("Action from: %p (%s)"), owner, g_type_name_from_instance ((GTypeInstance *)owner)); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new (text)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new (text))); g_free (text); button = gtk_button_new_with_label (_("Properties")); g_object_set_data (G_OBJECT (button), "owner", owner); @@ -1399,7 +1402,7 @@ add_settings_info (GtkInspectorPropEditor *editor) const gchar *direction; const gchar *tip; GtkWidget *row; - GtkWidget *label; + GtkLabel *label; gchar *str; object = editor->priv->object; @@ -1434,17 +1437,17 @@ add_settings_info (GtkInspectorPropEditor *editor) } row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_container_add (GTK_CONTAINER (row), gtk_label_new (_("Setting:"))); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (gtk_label_new (_("Setting:")))); label = gtk_label_new (direction); if (tip) - gtk_widget_set_tooltip_text (label, tip); - gtk_container_add (GTK_CONTAINER (row), label); + gtk_widget_set_tooltip_text (GTK_WIDGET (label), tip); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (label)); str = g_strdup_printf ("%s %s", g_settings_schema_get_id (binding->key.schema), binding->key.name); label = gtk_label_new (str); - gtk_container_add (GTK_CONTAINER (row), label); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (label)); g_free (str); gtk_container_add (GTK_CONTAINER (editor), row); @@ -1498,8 +1501,8 @@ add_gtk_settings_info (GtkInspectorPropEditor *editor) source = _("Unknown"); break; } - gtk_container_add (GTK_CONTAINER (row), gtk_label_new (_("Source:"))); - gtk_container_add (GTK_CONTAINER (row), gtk_label_new (source)); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (gtk_label_new (_("Source:")))); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (gtk_label_new (source))); gtk_container_add (GTK_CONTAINER (editor), row); } @@ -1529,7 +1532,7 @@ constructed (GObject *object) { GtkInspectorPropEditor *editor = GTK_INSPECTOR_PROP_EDITOR (object); GParamSpec *spec; - GtkWidget *label; + GtkLabel *label; gboolean can_modify; GtkWidget *box; @@ -1549,8 +1552,8 @@ constructed (GObject *object) if (label) { - gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_DIM_LABEL); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), GTK_STYLE_CLASS_DIM_LABEL); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); } /* By reaching this, we already know the property is readable. @@ -1563,8 +1566,8 @@ constructed (GObject *object) if (!can_modify) { label = gtk_label_new (""); - gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_DIM_LABEL); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), GTK_STYLE_CLASS_DIM_LABEL); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); readonly_changed (editor->priv->object, spec, label); g_object_connect_property (editor->priv->object, spec, diff --git a/gtk/inspector/prop-list.c b/gtk/inspector/prop-list.c index 69282bd7cea5b14046fad425b6d97b444ae06cf3..e3b14c1488c5c937888f0fb2a5696ef20a9702d7 100644 --- a/gtk/inspector/prop-list.c +++ b/gtk/inspector/prop-list.c @@ -499,7 +499,7 @@ gtk_inspector_prop_list_create_row (GtkInspectorPropList *pl, gboolean writable; GtkWidget *row; GtkWidget *box; - GtkWidget *label; + GtkLabel *label; GtkWidget *widget; g_value_init (&gvalue, prop->value_type); @@ -537,25 +537,25 @@ gtk_inspector_prop_list_create_row (GtkInspectorPropList *pl, gtk_container_add (GTK_CONTAINER (row), box); label = gtk_label_new (prop->name); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "cell"); - gtk_widget_set_sensitive (label, writable); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_size_group_add_widget (pl->priv->names, label); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "cell"); + gtk_widget_set_sensitive (GTK_WIDGET (label), writable); + gtk_label_set_xalign (label, 0); + gtk_size_group_add_widget (pl->priv->names, GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); label = gtk_label_new (type ? type : ""); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "cell"); - gtk_widget_set_sensitive (label, writable); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_size_group_add_widget (pl->priv->types, label); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "cell"); + gtk_widget_set_sensitive (GTK_WIDGET (label), writable); + gtk_label_set_xalign (label, 0); + gtk_size_group_add_widget (pl->priv->types, GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); label = gtk_label_new (g_type_name (prop->owner_type)); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "cell"); - gtk_widget_set_sensitive (label, writable); - gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_size_group_add_widget (pl->priv->origins, label); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "cell"); + gtk_widget_set_sensitive (GTK_WIDGET (label), writable); + gtk_label_set_xalign (label, 0); + gtk_size_group_add_widget (pl->priv->origins, GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); widget = gtk_inspector_prop_editor_new (pl->priv->object, prop->name, pl->priv->values); gtk_style_context_add_class (gtk_widget_get_style_context (widget), "cell"); diff --git a/gtk/inspector/recorder.c b/gtk/inspector/recorder.c index 2ed3649edbef2679371660f9b43f2312d8218abd..c37dd191786f56852670ec8f78b49ddaf4077c1c 100644 --- a/gtk/inspector/recorder.c +++ b/gtk/inspector/recorder.c @@ -300,6 +300,7 @@ create_widget_for_render_node (gpointer row_item, GdkPaintable *paintable; GskRenderNode *node; GtkWidget *row, *box, *child; + GtkLabel *label; char *name; guint depth; @@ -334,19 +335,19 @@ create_widget_for_render_node (gpointer row_item, } else { - child = gtk_image_new (); /* empty whatever */ + child = GTK_WIDGET (gtk_image_new ()); /* empty whatever */ } gtk_container_add (GTK_CONTAINER (box), child); /* icon */ - child = gtk_image_new_from_paintable (paintable); + child = GTK_WIDGET (gtk_image_new_from_paintable (paintable)); gtk_container_add (GTK_CONTAINER (box), child); /* name */ name = node_name (node); - child = gtk_label_new (name); + label = gtk_label_new (name); g_free (name); - gtk_container_add (GTK_CONTAINER (box), child); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); g_object_unref (paintable); @@ -1013,7 +1014,7 @@ render_node_save (GtkButton *button, GtkInspectorRecorder *recorder) { GskRenderNode *node; - GtkWidget *dialog; + GtkFileChooserDialog *dialog; char *filename, *nodename; node = get_selected_node (recorder); @@ -1035,7 +1036,7 @@ render_node_save (GtkButton *button, gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); g_signal_connect (dialog, "response", G_CALLBACK (render_node_save_response), node); - gtk_widget_show (dialog); + gtk_widget_show (GTK_WIDGET (dialog)); } static char * @@ -1068,7 +1069,9 @@ gtk_inspector_recorder_recordings_list_create_widget (gpointer item, char *time_str, *str; const char *render_str; cairo_region_t *region; - GtkWidget *hbox, *label, *button; + GtkWidget *hbox; + GtkToggleButton *button; + GtkLabel *label; guint i; widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); @@ -1113,24 +1116,24 @@ gtk_inspector_recorder_recordings_list_create_widget (gpointer item, str = g_strdup_printf ("%s\n", render_str); } label = gtk_label_new (str); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_use_markup (label, TRUE); g_free (str); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); button = gtk_toggle_button_new (); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_icon_name (GTK_BUTTON (button), "view-more-symbolic"); - gtk_container_add (GTK_CONTAINER (hbox), button); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (button)); label = gtk_label_new (gtk_inspector_render_recording_get_profiler_info (GTK_INSPECTOR_RENDER_RECORDING (recording))); - gtk_widget_hide (label); - gtk_container_add (GTK_CONTAINER (widget), label); + gtk_widget_hide (GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (label)); g_object_bind_property (button, "active", label, "visible", 0); } else { - widget = gtk_label_new ("Start of Recording"); + widget = GTK_WIDGET (gtk_label_new ("Start of Recording")); gtk_label_set_use_markup (GTK_LABEL (widget), TRUE); } @@ -1151,7 +1154,7 @@ node_property_activated (GtkTreeView *tv, GdkTexture *texture; gboolean visible; GtkWidget *popover; - GtkWidget *image; + GtkImage *image; gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->render_node_properties), &iter, path); gtk_tree_model_get (GTK_TREE_MODEL (priv->render_node_properties), &iter, @@ -1169,7 +1172,7 @@ node_property_activated (GtkTreeView *tv, image = gtk_image_new_from_paintable (GDK_PAINTABLE (texture)); g_object_set (image, "margin", 20, NULL); - gtk_container_add (GTK_CONTAINER (popover), image); + gtk_container_add (GTK_CONTAINER (popover), GTK_WIDGET (image)); gtk_popover_popup (GTK_POPOVER (popover)); g_signal_connect (popover, "unmap", G_CALLBACK (gtk_widget_destroy), NULL); diff --git a/gtk/inspector/resource-list.c b/gtk/inspector/resource-list.c index 9f413d0ef17f1bd2a280ba0416c62b7feff2edda..d26b7dbbbe214584117f10334508abe34d1a1965 100644 --- a/gtk/inspector/resource-list.c +++ b/gtk/inspector/resource-list.c @@ -53,10 +53,10 @@ struct _GtkInspectorResourceListPrivate GtkTextBuffer *buffer; GtkWidget *image; GtkWidget *content; - GtkWidget *name_label; + GtkLabel *name_label; GtkWidget *type; - GtkWidget *type_label; - GtkWidget *size_label; + GtkLabel *type_label; + GtkLabel *size_label; GtkWidget *info_grid; GtkWidget *stack; GtkWidget *tree; @@ -178,7 +178,7 @@ populate_details (GtkInspectorResourceList *rl, } markup = g_strconcat ("", path, "", NULL); - gtk_label_set_markup (GTK_LABEL (rl->priv->name_label), markup); + gtk_label_set_markup (rl->priv->name_label, markup); g_free (markup); bytes = g_resources_lookup_data (path, 0, &error); @@ -201,11 +201,11 @@ populate_details (GtkInspectorResourceList *rl, type = g_content_type_guess (name, data, size, NULL); text = g_content_type_get_description (type); - gtk_label_set_text (GTK_LABEL (rl->priv->type_label), text); + gtk_label_set_text (rl->priv->type_label, text); g_free (text); text = g_format_size (size); - gtk_label_set_text (GTK_LABEL (rl->priv->size_label), text); + gtk_label_set_text (rl->priv->size_label, text); g_free (text); if (g_content_type_is_a (type, content_text)) diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c index d45da9495635e714df5aedb92c12facce77ec450..3a6a9a2e5866bc2a0dc38a9f154a0c86000c056f 100644 --- a/gtk/inspector/size-groups.c +++ b/gtk/inspector/size-groups.c @@ -201,7 +201,7 @@ add_widget (GtkInspectorSizeGroups *sl, GtkWidget *widget) { GtkWidget *row; - GtkWidget *label; + GtkLabel *label; gchar *text; row = g_object_new (size_group_row_get_type (), "widget", widget, NULL); @@ -209,9 +209,9 @@ add_widget (GtkInspectorSizeGroups *sl, label = gtk_label_new (text); g_free (text); g_object_set (label, "margin", 10, NULL); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (row), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (listbox), row); } @@ -220,7 +220,8 @@ add_size_group (GtkInspectorSizeGroups *sl, GtkSizeGroup *group) { GtkWidget *frame, *box, *box2; - GtkWidget *label, *combo; + GtkLabel *label; + GtkComboBoxText *combo; GSList *widgets, *l; GtkWidget *listbox; @@ -235,22 +236,22 @@ add_size_group (GtkInspectorSizeGroups *sl, label = gtk_label_new (_("Mode")); g_object_set (label, "margin", 10, NULL); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (box2), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (label)); combo = gtk_combo_box_text_new (); g_object_set (combo, "margin", 10, NULL); - gtk_widget_set_halign (combo, GTK_ALIGN_END); - gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), C_("sizegroup mode", "None")); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), C_("sizegroup mode", "Horizontal")); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), C_("sizegroup mode", "Vertical")); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), C_("sizegroup mode", "Both")); + gtk_widget_set_halign (GTK_WIDGET (combo), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (combo), GTK_ALIGN_BASELINE); + gtk_combo_box_text_append_text (combo, C_("sizegroup mode", "None")); + gtk_combo_box_text_append_text (combo, C_("sizegroup mode", "Horizontal")); + gtk_combo_box_text_append_text (combo, C_("sizegroup mode", "Vertical")); + gtk_combo_box_text_append_text (combo, C_("sizegroup mode", "Both")); g_object_bind_property (group, "mode", combo, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - gtk_container_add (GTK_CONTAINER (box2), combo); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (combo)); listbox = gtk_list_box_new (); gtk_container_add (GTK_CONTAINER (box), listbox); diff --git a/gtk/inspector/statistics.c b/gtk/inspector/statistics.c index 3ca4cd163c3655db01dc972462615c06842f08b1..9a2520c3aacb186577f3107eed92746d95d43a30 100644 --- a/gtk/inspector/statistics.c +++ b/gtk/inspector/statistics.c @@ -43,7 +43,7 @@ enum struct _GtkInspectorStatisticsPrivate { GtkWidget *stack; - GtkWidget *excuse; + GtkLabel *excuse; GtkTreeModel *model; GtkTreeView *view; GtkWidget *button; @@ -396,7 +396,7 @@ constructed (GObject *object) else { if (instance_counts_enabled ()) - gtk_label_set_text (GTK_LABEL (sl->priv->excuse), _("GLib must be configured with -Dbuildtype=debug")); + gtk_label_set_text (sl->priv->excuse, _("GLib must be configured with -Dbuildtype=debug")); gtk_stack_set_visible_child_name (GTK_STACK (sl->priv->stack), "excuse"); gtk_widget_set_sensitive (sl->priv->button, FALSE); } diff --git a/gtk/inspector/strv-editor.c b/gtk/inspector/strv-editor.c index c119c49ccc3c9445f44344c263425f14bef2d0bd..467bd9301e359f1988135d86edf4c6a7f21e07c8 100644 --- a/gtk/inspector/strv-editor.c +++ b/gtk/inspector/strv-editor.c @@ -58,7 +58,7 @@ add_string (GtkInspectorStrvEditor *editor, const gchar *str) { GtkWidget *box; - GtkWidget *entry; + GtkEntry *entry; GtkWidget *button; box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); @@ -67,8 +67,8 @@ add_string (GtkInspectorStrvEditor *editor, entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), str); - gtk_widget_show (entry); - gtk_container_add (GTK_CONTAINER (box), entry); + gtk_widget_show (GTK_WIDGET (entry)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (entry)); g_object_set_data (G_OBJECT (box), "entry", entry); g_signal_connect_swapped (entry, "notify::text", G_CALLBACK (emit_changed), editor); @@ -80,7 +80,7 @@ add_string (GtkInspectorStrvEditor *editor, gtk_container_add (GTK_CONTAINER (editor->box), box); - gtk_widget_grab_focus (entry); + gtk_widget_grab_focus (GTK_WIDGET (entry)); emit_changed (editor); } diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c index 5787f12756deca6571955cbc7d4dbb5950ee2607..793f0f5273ddc71d1317feea9bd8a476b3e3cd36 100644 --- a/gtk/inspector/visual.c +++ b/gtk/inspector/visual.c @@ -59,15 +59,15 @@ struct _GtkInspectorVisualPrivate GtkWidget *swin; GtkWidget *box; GtkWidget *visual_box; - GtkWidget *theme_combo; - GtkWidget *dark_switch; - GtkWidget *icon_combo; - GtkWidget *cursor_combo; + GtkComboBoxText *theme_combo; + GtkSwitch *dark_switch; + GtkComboBoxText *icon_combo; + GtkComboBoxText *cursor_combo; GtkWidget *cursor_size_spin; GtkWidget *direction_combo; GtkWidget *font_button; GtkWidget *hidpi_spin; - GtkWidget *animation_switch; + GtkSwitch *animation_switch; GtkWidget *font_scale_entry; GtkAdjustment *font_scale_adjustment; GtkAdjustment *scale_adjustment; @@ -76,17 +76,17 @@ struct _GtkInspectorVisualPrivate GtkAdjustment *cursor_size_adjustment; GtkWidget *debug_box; - GtkWidget *fps_switch; - GtkWidget *updates_switch; - GtkWidget *fallback_switch; - GtkWidget *baselines_switch; - GtkWidget *layout_switch; - GtkWidget *resize_switch; - GtkWidget *focus_switch; + GtkSwitch *fps_switch; + GtkSwitch *updates_switch; + GtkSwitch *fallback_switch; + GtkSwitch *baselines_switch; + GtkSwitch *layout_switch; + GtkSwitch *resize_switch; + GtkSwitch *focus_switch; GtkWidget *misc_box; - GtkWidget *touchscreen_switch; - GtkWidget *software_gl_switch; + GtkSwitch *touchscreen_switch; + GtkSwitch *software_gl_switch; GtkAdjustment *focus_adjustment; @@ -539,7 +539,7 @@ init_theme (GtkInspectorVisual *vis) for (l = list; l; l = l->next) { theme = l->data; - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (vis->priv->theme_combo), theme, theme); + gtk_combo_box_text_append (vis->priv->theme_combo, theme, theme); } g_list_free (list); @@ -555,8 +555,8 @@ init_theme (GtkInspectorVisual *vis) GtkWidget *row; /* theme is hardcoded, nothing we can do */ - gtk_widget_set_sensitive (vis->priv->theme_combo, FALSE); - row = gtk_widget_get_ancestor (vis->priv->theme_combo, GTK_TYPE_LIST_BOX_ROW); + gtk_widget_set_sensitive (GTK_WIDGET (vis->priv->theme_combo), FALSE); + row = gtk_widget_get_ancestor (GTK_WIDGET (vis->priv->theme_combo), GTK_TYPE_LIST_BOX_ROW); gtk_widget_set_tooltip_text (row, _("Theme is hardcoded by GTK_THEME")); } } @@ -574,8 +574,8 @@ init_dark (GtkInspectorVisual *vis) GtkWidget *row; /* theme is hardcoded, nothing we can do */ - gtk_widget_set_sensitive (vis->priv->dark_switch, FALSE); - row = gtk_widget_get_ancestor (vis->priv->theme_combo, GTK_TYPE_LIST_BOX_ROW); + gtk_widget_set_sensitive (GTK_WIDGET (vis->priv->dark_switch), FALSE); + row = gtk_widget_get_ancestor (GTK_WIDGET (vis->priv->theme_combo), GTK_TYPE_LIST_BOX_ROW); gtk_widget_set_tooltip_text (row, _("Theme is hardcoded by GTK_THEME")); } } @@ -632,7 +632,7 @@ init_icons (GtkInspectorVisual *vis) for (l = list; l; l = l->next) { theme = l->data; - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (vis->priv->icon_combo), theme, theme); + gtk_combo_box_text_append (vis->priv->icon_combo, theme, theme); } g_hash_table_destroy (t); @@ -695,7 +695,7 @@ init_cursors (GtkInspectorVisual *vis) for (l = list; l; l = l->next) { theme = l->data; - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (vis->priv->cursor_combo), theme, theme); + gtk_combo_box_text_append (vis->priv->cursor_combo, theme, theme); } g_hash_table_destroy (t); @@ -870,7 +870,7 @@ update_touchscreen (GtkSwitch *sw) static void init_touchscreen (GtkInspectorVisual *vis) { - gtk_switch_set_active (GTK_SWITCH (vis->priv->touchscreen_switch), (gtk_get_debug_flags () & GTK_DEBUG_TOUCHSCREEN) != 0); + gtk_switch_set_active (vis->priv->touchscreen_switch, (gtk_get_debug_flags () & GTK_DEBUG_TOUCHSCREEN) != 0); g_signal_connect (vis->priv->touchscreen_switch, "notify::active", G_CALLBACK (update_touchscreen), NULL); @@ -879,9 +879,9 @@ init_touchscreen (GtkInspectorVisual *vis) GtkWidget *row; /* hardcoded, nothing we can do */ - gtk_switch_set_active (GTK_SWITCH (vis->priv->touchscreen_switch), TRUE); - gtk_widget_set_sensitive (vis->priv->touchscreen_switch, FALSE); - row = gtk_widget_get_ancestor (vis->priv->touchscreen_switch, GTK_TYPE_LIST_BOX_ROW); + gtk_switch_set_active (vis->priv->touchscreen_switch, TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (vis->priv->touchscreen_switch), FALSE); + row = gtk_widget_get_ancestor (GTK_WIDGET (vis->priv->touchscreen_switch), GTK_TYPE_LIST_BOX_ROW); gtk_widget_set_tooltip_text (row, _("Setting is hardcoded by GTK_TEST_TOUCHSCREEN")); } } @@ -937,59 +937,59 @@ row_activated (GtkListBox *box, GtkListBoxRow *row, GtkInspectorVisual *vis) { - if (gtk_widget_is_ancestor (vis->priv->dark_switch, GTK_WIDGET (row))) + if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->dark_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->dark_switch); + GtkSwitch *sw = vis->priv->dark_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } - else if (gtk_widget_is_ancestor (vis->priv->animation_switch, GTK_WIDGET (row))) + else if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->animation_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->animation_switch); + GtkSwitch *sw = vis->priv->animation_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } - else if (gtk_widget_is_ancestor (vis->priv->fps_switch, GTK_WIDGET (row))) + else if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->fps_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->fps_switch); + GtkSwitch *sw = vis->priv->fps_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } - else if (gtk_widget_is_ancestor (vis->priv->updates_switch, GTK_WIDGET (row))) + else if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->updates_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->updates_switch); + GtkSwitch *sw = vis->priv->updates_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } - else if (gtk_widget_is_ancestor (vis->priv->fallback_switch, GTK_WIDGET (row))) + else if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->fallback_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->fallback_switch); + GtkSwitch *sw = vis->priv->fallback_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } - else if (gtk_widget_is_ancestor (vis->priv->baselines_switch, GTK_WIDGET (row))) + else if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->baselines_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->baselines_switch); + GtkSwitch *sw = vis->priv->baselines_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } - else if (gtk_widget_is_ancestor (vis->priv->layout_switch, GTK_WIDGET (row))) + else if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->layout_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->layout_switch); + GtkSwitch *sw = vis->priv->layout_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } - else if (gtk_widget_is_ancestor (vis->priv->resize_switch, GTK_WIDGET (row))) + else if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->resize_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->resize_switch); + GtkSwitch *sw = vis->priv->resize_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } - else if (gtk_widget_is_ancestor (vis->priv->focus_switch, GTK_WIDGET (row))) + else if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->focus_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->focus_switch); + GtkSwitch *sw = vis->priv->focus_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } - else if (gtk_widget_is_ancestor (vis->priv->touchscreen_switch, GTK_WIDGET (row))) + else if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->touchscreen_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->touchscreen_switch); + GtkSwitch *sw = vis->priv->touchscreen_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } - else if (gtk_widget_is_ancestor (vis->priv->software_gl_switch, GTK_WIDGET (row))) + else if (gtk_widget_is_ancestor (GTK_WIDGET (vis->priv->software_gl_switch), GTK_WIDGET (row))) { - GtkSwitch *sw = GTK_SWITCH (vis->priv->software_gl_switch); + GtkSwitch *sw = vis->priv->software_gl_switch; gtk_switch_set_active (sw, !gtk_switch_get_active (sw)); } } @@ -999,14 +999,14 @@ init_gl (GtkInspectorVisual *vis) { GdkDebugFlags flags = gdk_display_get_debug_flags (vis->priv->display); - gtk_switch_set_active (GTK_SWITCH (vis->priv->software_gl_switch), flags & GDK_DEBUG_GL_SOFTWARE); + gtk_switch_set_active (vis->priv->software_gl_switch, flags & GDK_DEBUG_GL_SOFTWARE); if (flags & GDK_DEBUG_GL_DISABLE) { GtkWidget *row; - gtk_widget_set_sensitive (vis->priv->software_gl_switch, FALSE); - row = gtk_widget_get_ancestor (vis->priv->software_gl_switch, GTK_TYPE_LIST_BOX_ROW); + gtk_widget_set_sensitive (GTK_WIDGET (vis->priv->software_gl_switch), FALSE); + row = gtk_widget_get_ancestor (GTK_WIDGET (vis->priv->software_gl_switch), GTK_TYPE_LIST_BOX_ROW); gtk_widget_set_tooltip_text (row, _("GL rendering is disabled")); } } diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c index 6b4b2524d5a00ddbbdd75fc603dea0931f8699c1..40c6a00be781b71ef1e194af2180ba9acdc1a50c 100644 --- a/gtk/inspector/window.c +++ b/gtk/inspector/window.c @@ -82,7 +82,7 @@ set_selected_object (GtkInspectorWindow *iw, return FALSE; title = gtk_inspector_get_object_title (selected); - gtk_label_set_label (GTK_LABEL (iw->object_title), title); + gtk_label_set_label (iw->object_title, title); g_free (title); gtk_inspector_prop_list_set_layout_child (GTK_INSPECTOR_PROP_LIST (iw->layout_prop_list), selected); diff --git a/gtk/inspector/window.h b/gtk/inspector/window.h index 3f297061415b7d456c9adbff9fc44d9329894bf6..a69d54b94d61084ba3e9ff665237b9352f2763e5 100644 --- a/gtk/inspector/window.h +++ b/gtk/inspector/window.h @@ -25,6 +25,7 @@ #include +#include #include "inspectoroverlay.h" @@ -54,7 +55,7 @@ typedef struct GtkWidget *select_object; GtkWidget *object_start_stack; GtkWidget *object_center_stack; - GtkWidget *object_title; + GtkLabel *object_title; GtkWidget *prop_list; GtkWidget *layout_prop_list; GtkWidget *selector; diff --git a/tests/animated-revealing.c b/tests/animated-revealing.c index 72e28459f42619575888532b448c336b8ef39df4..721493f80d73a4b5584cfd5109e1ee7c49ba5e28 100644 --- a/tests/animated-revealing.c +++ b/tests/animated-revealing.c @@ -20,7 +20,7 @@ toggle_reveal (GtkRevealer *revealer) int main(int argc, char **argv) { - GtkWidget *window, *revealer, *grid, *widget; + GtkWidget *window, *revealer, *grid; GtkCssProvider *cssprovider; GError *error = NULL; guint x, y; @@ -60,11 +60,13 @@ main(int argc, char **argv) { for (y = 0; y < 20; y++) { - widget = gtk_label_new ("Hello World"); - gtk_style_context_add_provider (gtk_widget_get_style_context (widget), + GtkLabel *label; + + label = gtk_label_new ("Hello World"); + gtk_style_context_add_provider (gtk_widget_get_style_context (GTK_WIDGET (label)), GTK_STYLE_PROVIDER (cssprovider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - gtk_grid_attach (GTK_GRID (grid), widget, x, y, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), x, y, 1, 1); } } diff --git a/tests/gdkgears.c b/tests/gdkgears.c index 2df86a98e26eaa16d7d62b5805c82c48c2a8a110..d5468c5512d35f3fb4a968336308fe930a61b6df 100644 --- a/tests/gdkgears.c +++ b/tests/gdkgears.c @@ -40,7 +40,8 @@ static GtkWidget * create_axis_slider (GtkGears *gears, int axis) { - GtkWidget *box, *label, *slider; + GtkWidget *box, *slider; + GtkLabel *label; GtkAdjustment *adj; const char *text; @@ -65,8 +66,8 @@ create_axis_slider (GtkGears *gears, } label = gtk_label_new (text); - gtk_container_add (GTK_CONTAINER (box), label); - gtk_widget_show (label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); adj = gtk_adjustment_new (gtk_gears_get_axis (gears, axis), 0.0, 360.0, 1.0, 12.0, 0.0); g_object_set_data (G_OBJECT (adj), "axis", GINT_TO_POINTER (axis)); @@ -110,9 +111,11 @@ less_gears (GtkButton *button, gpointer data) int main (int argc, char *argv[]) { - GtkWidget *window, *box, *hbox, *button, *spinner, *check, - *fps_label, *gears, *extra_hbox, *bbox, *overlay, - *revealer, *frame, *label, *scrolled, *popover; + GtkWidget *window, *box, *hbox, *button, *spinner, + *gears, *extra_hbox, *bbox, *overlay, + *revealer, *frame, *scrolled, *popover; + GtkCheckButton *check; + GtkLabel *fps_label, *label; int i; gtk_init (); @@ -146,8 +149,8 @@ main (int argc, char *argv[]) gtk_widget_show (hbox); label = gtk_label_new ("This is a transparent overlay widget!!!!\nAmazing, eh?"); - gtk_container_add (GTK_CONTAINER (hbox), label); - gtk_widget_show (label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE); gtk_box_set_spacing (GTK_BOX (box), 6); @@ -174,23 +177,23 @@ main (int argc, char *argv[]) gtk_widget_show (hbox); fps_label = gtk_label_new (""); - gtk_widget_set_hexpand (fps_label, TRUE); - gtk_widget_set_halign (fps_label, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (hbox), fps_label); - gtk_gears_set_fps_label (GTK_GEARS (gears), GTK_LABEL (fps_label)); + gtk_widget_set_hexpand (GTK_WIDGET (fps_label), TRUE); + gtk_widget_set_halign (GTK_WIDGET (fps_label), GTK_ALIGN_START); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (fps_label)); + gtk_gears_set_fps_label (GTK_GEARS (gears), fps_label); button = gtk_menu_button_new (); gtk_menu_button_set_direction (GTK_MENU_BUTTON (button), GTK_ARROW_UP); popover = gtk_popover_new (NULL); label = gtk_label_new ("Popovers work too!"); - gtk_container_add (GTK_CONTAINER (popover), label); + gtk_container_add (GTK_CONTAINER (popover), GTK_WIDGET (label)); gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), popover); gtk_container_add (GTK_CONTAINER (hbox), button); check = gtk_check_button_new_with_label ("Overlay"); - gtk_container_add (GTK_CONTAINER (hbox), check); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (check)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE); g_signal_connect (check, "toggled", G_CALLBACK (toggle_overlay), revealer); @@ -198,7 +201,7 @@ main (int argc, char *argv[]) check = gtk_check_button_new_with_label ("Animate spinner"); - gtk_container_add (GTK_CONTAINER (hbox), check); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (check)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); diff --git a/tests/listmodel.c b/tests/listmodel.c index c1bd0f933d6684fc705df63113b34e2c545b8221..8bc272b212ced5e9503e45acc8ed9b2dfb36af8f 100644 --- a/tests/listmodel.c +++ b/tests/listmodel.c @@ -106,12 +106,12 @@ create_widget (gpointer item, gpointer user_data) { MyObject *obj = (MyObject *)item; - GtkWidget *label; + GtkLabel *label; label = gtk_label_new (""); g_object_bind_property (obj, "label", label, "label", G_BINDING_SYNC_CREATE); - return label; + return GTK_WIDGET (label); } static gint diff --git a/tests/motion-compression.c b/tests/motion-compression.c index d69716e5f35d75c3a048cc42b436433e310ef9c1..94359aebc9dba96dd63c0de4000159e1454b75df 100644 --- a/tests/motion-compression.c +++ b/tests/motion-compression.c @@ -39,7 +39,7 @@ main (int argc, char **argv) { GtkWidget *window; GtkWidget *vbox; - GtkWidget *label; + GtkLabel *label; GtkWidget *scale; GtkWidget *da; GtkEventController *controller; @@ -58,8 +58,8 @@ main (int argc, char **argv) gtk_container_add (GTK_CONTAINER (vbox), da); label = gtk_label_new ("Event processing time (ms):"); - gtk_widget_set_halign (label, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); adjustment = gtk_adjustment_new (20, 0, 200, 1, 10, 0); scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment); diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c index 64f327935113c0358870ea1abfbbc60e5a957980..e9cbeeddcfb4d8dac05501eb8b3aa0ebaa94149f 100644 --- a/tests/overlayscroll.c +++ b/tests/overlayscroll.c @@ -48,7 +48,7 @@ main (int argc, char *argv[]) GtkWidget *sw; GtkWidget *tv; GtkWidget *sb2; - GtkWidget *combo; + GtkComboBoxText *combo; GtkAdjustment *adj; gtk_init (); @@ -79,13 +79,13 @@ main (int argc, char *argv[]) adj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (tv)); combo = gtk_combo_box_text_new (); - gtk_widget_set_valign (combo, GTK_ALIGN_START); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Traditional"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Overlay"); + gtk_widget_set_valign (GTK_WIDGET (combo), GTK_ALIGN_START); + gtk_combo_box_text_append_text (combo, "Traditional"); + gtk_combo_box_text_append_text (combo, "Overlay"); g_signal_connect (combo, "changed", G_CALLBACK (mode_changed), sw); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 1); - gtk_container_add (GTK_CONTAINER (box), combo); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo)); sb2 = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, adj); gtk_container_add (GTK_CONTAINER (box), sb2); diff --git a/tests/print-editor.c b/tests/print-editor.c index b141fbb80c99d76cd2cf7d6c3807ad0a87621cfa..1ead45bff0fc4341f70e9036c93afa61e03c54d3 100644 --- a/tests/print-editor.c +++ b/tests/print-editor.c @@ -315,7 +315,8 @@ static GtkWidget * create_custom_widget (GtkPrintOperation *operation, PrintData *data) { - GtkWidget *vbox, *hbox, *font, *label; + GtkWidget *vbox, *hbox, *font; + GtkLabel *label; gtk_print_operation_set_custom_tab_label (operation, "Other"); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); @@ -325,8 +326,8 @@ create_custom_widget (GtkPrintOperation *operation, gtk_widget_show (hbox); label = gtk_label_new ("Font:"); - gtk_container_add (GTK_CONTAINER (hbox), label); - gtk_widget_show (label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); font = gtk_font_button_new_with_font (data->font); gtk_container_add (GTK_CONTAINER (hbox), font); @@ -479,7 +480,7 @@ activate_save_as (GSimpleAction *action, GVariant *parameter, gpointer user_data) { - GtkWidget *dialog; + GtkFileChooserDialog *dialog; gint response; char *save_filename; @@ -499,7 +500,7 @@ activate_save_as (GSimpleAction *action, g_free (save_filename); } - gtk_widget_destroy (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); } static void @@ -518,7 +519,7 @@ activate_open (GSimpleAction *action, GVariant *parameter, gpointer user_data) { - GtkWidget *dialog; + GtkFileChooserDialog *dialog; gint response; char *open_filename; @@ -538,7 +539,7 @@ activate_open (GSimpleAction *action, g_free (open_filename); } - gtk_widget_destroy (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); } static void diff --git a/tests/showrendernode.c b/tests/showrendernode.c index 6ea4ba1d5db80189a156661678bc9e528658c4b4..a779361045778ef43b6be91a584e0797989315e5 100644 --- a/tests/showrendernode.c +++ b/tests/showrendernode.c @@ -198,14 +198,14 @@ main (int argc, char **argv) GdkSurface *gdk_surface = gdk_surface_new_toplevel (gdk_display_get_default(), 10 , 10); GskRenderer *renderer = gsk_renderer_new_for_surface (gdk_surface); GdkTexture *texture = gsk_renderer_render_texture (renderer, GTK_NODE_VIEW (nodeview)->node, NULL); - GtkWidget *image = gtk_image_new_from_paintable (GDK_PAINTABLE (texture)); + GtkImage *image = gtk_image_new_from_paintable (GDK_PAINTABLE (texture)); - gtk_widget_set_size_request (image, + gtk_widget_set_size_request (GTK_WIDGET (image), gdk_texture_get_width (texture), gdk_texture_get_height (texture)); gtk_container_add (GTK_CONTAINER (box), nodeview); - gtk_container_add (GTK_CONTAINER (box), image); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (image)); gtk_container_add (GTK_CONTAINER (window), box); gsk_renderer_unrealize (renderer); diff --git a/tests/stresstest-toolbar.c b/tests/stresstest-toolbar.c index bbf745e60f55fd781963591a1b8c9c2c2ffc5302..2af3c31e24a6fd53bb2b375688e16f9415f6a07f 100644 --- a/tests/stresstest-toolbar.c +++ b/tests/stresstest-toolbar.c @@ -88,7 +88,7 @@ stress_test_old_api (gpointer data) if (!info->toolbar) { - info->toolbar = GTK_TOOLBAR (gtk_toolbar_new ()); + info->toolbar = gtk_toolbar_new (); gtk_container_add (GTK_CONTAINER (info->window), GTK_WIDGET (info->toolbar)); gtk_widget_show (GTK_WIDGET (info->toolbar)); diff --git a/tests/testaccel.c b/tests/testaccel.c index 0cc7d1600b95fcaf67c2664c53f7ad260bf91aa0..b7c1f6ec3c6951fc8309e16f8ad7b680c73c1f2a 100644 --- a/tests/testaccel.c +++ b/tests/testaccel.c @@ -64,7 +64,8 @@ key_test (void) GtkTreeViewColumn *column; GtkCellRenderer *rend; gint i; - GtkWidget *box, *entry; + GtkWidget *box; + GtkEntry *entry; /* create window */ window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -111,8 +112,8 @@ key_test (void) } entry = gtk_entry_new (); - gtk_widget_show (entry); - gtk_container_add (GTK_CONTAINER (box), entry); + gtk_widget_show (GTK_WIDGET (entry)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (entry)); return window; } diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c index 7bcb86215f7eef546b04d0713264a80f6e708053..64c056aa4fed784755dca6562d42b7a13b2d9c81 100644 --- a/tests/testadjustsize.c +++ b/tests/testadjustsize.c @@ -35,18 +35,18 @@ static GtkWidget *test_widgets[TEST_WIDGET_LAST]; static GtkWidget* create_image (void) { - return gtk_image_new_from_icon_name ("document-open"); + return GTK_WIDGET (gtk_image_new_from_icon_name ("document-open")); } -static GtkWidget* +static GtkLabel* create_label (gboolean wrap) { - GtkWidget *widget; + GtkLabel *widget; widget = gtk_label_new ("This is a label, label label label"); if (wrap) - gtk_label_set_wrap (GTK_LABEL (widget), TRUE); + gtk_label_set_wrap (widget, TRUE); return widget; } @@ -71,8 +71,8 @@ open_test_window (void) gtk_window_set_resizable (GTK_WINDOW (test_window), FALSE); test_widgets[TEST_WIDGET_IMAGE] = create_image (); - test_widgets[TEST_WIDGET_LABEL] = create_label (FALSE); - test_widgets[TEST_WIDGET_WRAP_LABEL] = create_label (TRUE); + test_widgets[TEST_WIDGET_LABEL] = GTK_WIDGET (create_label (FALSE)); + test_widgets[TEST_WIDGET_WRAP_LABEL] = GTK_WIDGET (create_label (TRUE)); test_widgets[TEST_WIDGET_BUTTON] = create_button (); grid = gtk_grid_new (); @@ -126,7 +126,7 @@ open_control_window (void) { GtkWidget *window; GtkWidget *box; - GtkWidget *toggle; + GtkToggleButton *toggle; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Controls"); @@ -141,14 +141,14 @@ open_control_window (void) g_signal_connect (G_OBJECT (toggle), "toggled", G_CALLBACK (on_set_small_size_requests), NULL); - gtk_container_add (GTK_CONTAINER (box), toggle); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (toggle)); toggle = gtk_toggle_button_new_with_label ("Set large size requests"); g_signal_connect (G_OBJECT (toggle), "toggled", G_CALLBACK (on_set_large_size_requests), NULL); - gtk_container_add (GTK_CONTAINER (box), toggle); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (toggle)); gtk_widget_show (window); @@ -162,7 +162,7 @@ create_widget_visible_border (const char *text) GtkWidget *outer_box; GtkWidget *inner_box; GtkWidget *test_widget; - GtkWidget *label; + GtkLabel *label; outer_box = gtk_overlay_new (); gtk_style_context_add_class (gtk_widget_get_style_context (outer_box), "black-bg"); @@ -179,7 +179,7 @@ create_widget_visible_border (const char *text) gtk_container_add (GTK_CONTAINER (inner_box), test_widget); label = gtk_label_new (text); - gtk_container_add (GTK_CONTAINER (test_widget), label); + gtk_container_add (GTK_CONTAINER (test_widget), GTK_WIDGET (label)); g_assert (TEST_WIDGET (outer_box) == test_widget); @@ -313,7 +313,8 @@ open_margin_window (void) static void open_valigned_label_window (void) { - GtkWidget *window, *box, *label, *frame; + GtkWidget *window, *box, *frame; + GtkLabel *label; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -324,19 +325,19 @@ open_valigned_label_window (void) gtk_container_add (GTK_CONTAINER (window), box); label = gtk_label_new ("Both labels expand"); - gtk_widget_show (label); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_widget_show (GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); label = gtk_label_new ("Some wrapping text with width-chars = 15 and max-width-chars = 35"); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_width_chars (GTK_LABEL (label), 15); - gtk_label_set_max_width_chars (GTK_LABEL (label), 35); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_width_chars (label, 15); + gtk_label_set_max_width_chars (label, 35); - gtk_widget_show (label); + gtk_widget_show (GTK_WIDGET (label)); frame = gtk_frame_new (NULL); gtk_widget_show (frame); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); diff --git a/tests/testappchooser.c b/tests/testappchooser.c index baf9adcad2a31951a0d13515b2f77313d1069cfd..5f3cc8781e4af84c5b5a9c6c26e0a9dce3bae69b 100644 --- a/tests/testappchooser.c +++ b/tests/testappchooser.c @@ -24,9 +24,10 @@ static GtkWidget *toplevel; static GFile *file; static GtkWidget *grid, *file_l, *open; -static GtkWidget *radio_file, *radio_content, *dialog; +static GtkWidget *radio_file, *radio_content; +static GtkAppChooserDialog *dialog; static GtkWidget *app_chooser_widget; -static GtkWidget *def, *recommended, *fallback, *other, *all; +static GtkCheckButton *def, *recommended, *fallback, *other, *all; static void dialog_response (GtkDialog *d, @@ -105,14 +106,14 @@ prepare_dialog (void) 0, content_type); } - gtk_app_chooser_dialog_set_heading (GTK_APP_CHOOSER_DIALOG (dialog), "Select one already, you fool"); + gtk_app_chooser_dialog_set_heading (dialog, "Select one already, you fool"); g_signal_connect (dialog, "response", G_CALLBACK (dialog_response), NULL); g_free (content_type); - app_chooser_widget = gtk_app_chooser_dialog_get_widget (GTK_APP_CHOOSER_DIALOG (dialog)); + app_chooser_widget = gtk_app_chooser_dialog_get_widget (dialog); bind_props (); } @@ -122,14 +123,14 @@ display_dialog (void) if (dialog == NULL) prepare_dialog (); - gtk_widget_show (dialog); + gtk_widget_show (GTK_WIDGET (dialog)); } static void button_clicked (GtkButton *b, gpointer user_data) { - GtkWidget *w; + GtkFileChooserDialog *w; gchar *path; w = gtk_file_chooser_dialog_new ("Select file", @@ -144,7 +145,7 @@ button_clicked (GtkButton *b, path = g_file_get_path (file); gtk_button_set_label (GTK_BUTTON (file_l), path); - gtk_widget_destroy (w); + gtk_widget_destroy (GTK_WIDGET (w)); gtk_widget_set_sensitive (open, TRUE); @@ -154,7 +155,7 @@ button_clicked (GtkButton *b, int main (int argc, char **argv) { - GtkWidget *w1; + GtkLabel *w1; gchar *path; gtk_init (); @@ -163,9 +164,9 @@ main (int argc, char **argv) grid = gtk_grid_new (); w1 = gtk_label_new ("File:"); - gtk_widget_set_halign (w1, GTK_ALIGN_START); + gtk_widget_set_halign (GTK_WIDGET (w1), GTK_ALIGN_START); gtk_grid_attach (GTK_GRID (grid), - w1, 0, 0, 1, 1); + GTK_WIDGET (w1), 0, 0, 1, 1); file_l = gtk_button_new (); path = g_build_filename (g_get_current_dir (), "apple-red.png", NULL); @@ -175,7 +176,7 @@ main (int argc, char **argv) gtk_widget_set_halign (file_l, GTK_ALIGN_START); gtk_grid_attach_next_to (GTK_GRID (grid), file_l, - w1, GTK_POS_RIGHT, 3, 1); + GTK_WIDGET (w1), GTK_POS_RIGHT, 3, 1); g_signal_connect (file_l, "clicked", G_CALLBACK (button_clicked), NULL); @@ -193,25 +194,25 @@ main (int argc, char **argv) radio_content, GTK_POS_BOTTOM, 1, 1); recommended = gtk_check_button_new_with_label ("Show recommended"); - gtk_grid_attach_next_to (GTK_GRID (grid), recommended, - open, GTK_POS_BOTTOM, 1, 1); + gtk_grid_attach_next_to (GTK_GRID (grid), GTK_WIDGET (recommended), + GTK_WIDGET (open), GTK_POS_BOTTOM, 1, 1); g_object_set (recommended, "active", TRUE, NULL); fallback = gtk_check_button_new_with_label ("Show fallback"); - gtk_grid_attach_next_to (GTK_GRID (grid), fallback, - recommended, GTK_POS_RIGHT, 1, 1); + gtk_grid_attach_next_to (GTK_GRID (grid), GTK_WIDGET (fallback), + GTK_WIDGET (recommended), GTK_POS_RIGHT, 1, 1); other = gtk_check_button_new_with_label ("Show other"); - gtk_grid_attach_next_to (GTK_GRID (grid), other, - fallback, GTK_POS_RIGHT, 1, 1); + gtk_grid_attach_next_to (GTK_GRID (grid), GTK_WIDGET (other), + GTK_WIDGET (fallback), GTK_POS_RIGHT, 1, 1); all = gtk_check_button_new_with_label ("Show all"); - gtk_grid_attach_next_to (GTK_GRID (grid), all, - other, GTK_POS_RIGHT, 1, 1); + gtk_grid_attach_next_to (GTK_GRID (grid), GTK_WIDGET (all), + GTK_WIDGET (other), GTK_POS_RIGHT, 1, 1); def = gtk_check_button_new_with_label ("Show default"); - gtk_grid_attach_next_to (GTK_GRID (grid), def, - all, GTK_POS_RIGHT, 1, 1); + gtk_grid_attach_next_to (GTK_GRID (grid), GTK_WIDGET (def), + GTK_WIDGET (all), GTK_POS_RIGHT, 1, 1); g_object_set (recommended, "active", TRUE, NULL); prepare_dialog (); diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c index 6aee3dad6d9e5a05caeec4df23227e5449448c21..87104ffba9ba50af3d8bc32d82db9b1c2cc6dacf 100644 --- a/tests/testappchooserbutton.c +++ b/tests/testappchooserbutton.c @@ -23,8 +23,10 @@ #define CUSTOM_ITEM "custom-item" -static GtkWidget *toplevel, *button, *box; -static GtkWidget *sel_image, *sel_name; +static GtkWidget *toplevel, *box; +static GtkAppChooserButton *button; +static GtkImage *sel_image; +static GtkLabel *sel_name; static void combo_changed_cb (GtkAppChooserButton *button, @@ -37,8 +39,8 @@ combo_changed_cb (GtkAppChooserButton *button, if (app_info == NULL) return; - gtk_image_set_from_gicon (GTK_IMAGE (sel_image), g_app_info_get_icon (app_info)); - gtk_label_set_text (GTK_LABEL (sel_name), g_app_info_get_display_name (app_info)); + gtk_image_set_from_gicon (sel_image, g_app_info_get_icon (app_info)); + gtk_label_set_text (sel_name, g_app_info_get_display_name (app_info)); g_object_unref (app_info); } @@ -48,8 +50,8 @@ special_item_activated_cb (GtkAppChooserButton *b, const gchar *item_name, gpointer user_data) { - gtk_image_set_from_gicon (GTK_IMAGE (sel_image), g_themed_icon_new ("face-smile")); - gtk_label_set_text (GTK_LABEL (sel_name), "Special Item"); + gtk_image_set_from_gicon (sel_image, g_themed_icon_new ("face-smile")); + gtk_label_set_text (sel_name, "Special Item"); } static void @@ -64,6 +66,7 @@ int main (int argc, char **argv) { + GtkLabel *label; GtkWidget *w; gtk_init (); @@ -74,39 +77,39 @@ main (int argc, gtk_container_add (GTK_CONTAINER (toplevel), box); button = gtk_app_chooser_button_new ("image/jpeg"); - gtk_container_add (GTK_CONTAINER (box), button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (button)); g_signal_connect (button, "changed", G_CALLBACK (combo_changed_cb), NULL); - w = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (w), "Selected app info"); - gtk_container_add (GTK_CONTAINER (box), w); + label = gtk_label_new (NULL); + gtk_label_set_markup (label, "Selected app info"); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (box), w); sel_image = gtk_image_new (); - gtk_container_add (GTK_CONTAINER (w), sel_image); + gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (sel_image)); sel_name = gtk_label_new (NULL); - gtk_container_add (GTK_CONTAINER (w), sel_name); + gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (sel_name)); gtk_app_chooser_button_set_heading (GTK_APP_CHOOSER_BUTTON (button), "Choose one, not two"); - gtk_app_chooser_button_append_separator (GTK_APP_CHOOSER_BUTTON (button)); - gtk_app_chooser_button_append_custom_item (GTK_APP_CHOOSER_BUTTON (button), + gtk_app_chooser_button_append_separator (button); + gtk_app_chooser_button_append_custom_item (button, CUSTOM_ITEM, "Hey, I'm special!", g_themed_icon_new ("face-smile")); /* this one will trigger a warning, and will not be added */ - gtk_app_chooser_button_append_custom_item (GTK_APP_CHOOSER_BUTTON (button), + gtk_app_chooser_button_append_custom_item (button, CUSTOM_ITEM, "Hey, I'm fake!", g_themed_icon_new ("face-evil")); - gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (button), + gtk_app_chooser_button_set_show_dialog_item (button, TRUE); - gtk_app_chooser_button_set_show_default_item (GTK_APP_CHOOSER_BUTTON (button), + gtk_app_chooser_button_set_show_default_item (button, TRUE); /* connect to the detailed signal */ @@ -121,7 +124,7 @@ main (int argc, gtk_app_chooser_refresh (GTK_APP_CHOOSER (button)); #if 0 - gtk_app_chooser_button_set_active_custom_item (GTK_APP_CHOOSER_BUTTON (button), + gtk_app_chooser_button_set_active_custom_item (button, CUSTOM_ITEM); #endif gtk_widget_show (toplevel); diff --git a/tests/testassistant.c b/tests/testassistant.c index ec3d3f9928a587aaca51ae053d7c3f03576dfc8d..f5bcb9e46a37fcb5773a8edf5f6341fd7175b631 100644 --- a/tests/testassistant.c +++ b/tests/testassistant.c @@ -26,7 +26,7 @@ static GtkWidget* get_test_page (const gchar *text) { - return gtk_label_new (text); + return GTK_WIDGET (gtk_label_new (text)); } typedef struct { @@ -55,14 +55,14 @@ add_completion_test_page (GtkWidget *assistant, gboolean complete) { GtkWidget *page; - GtkWidget *check; + GtkCheckButton *check; PageData *pdata; page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); check = gtk_check_button_new_with_label ("Complete"); - gtk_container_add (GTK_CONTAINER (page), gtk_label_new (text)); - gtk_container_add (GTK_CONTAINER (page), check); + gtk_container_add (GTK_CONTAINER (page), GTK_WIDGET (gtk_label_new (text))); + gtk_container_add (GTK_CONTAINER (page), GTK_WIDGET (check)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), complete); @@ -247,7 +247,8 @@ create_generous_assistant (GtkWidget *widget) if (!assistant) { - GtkWidget *page, *next, *check; + GtkWidget *page, *next; + GtkCheckButton *check; PageData *pdata; assistant = gtk_assistant_new (); @@ -276,8 +277,8 @@ create_generous_assistant (GtkWidget *widget) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (visible_cb), next); - gtk_widget_show (check); - gtk_container_add (GTK_CONTAINER (page), check); + gtk_widget_show (GTK_WIDGET (check)); + gtk_container_add (GTK_CONTAINER (page), GTK_WIDGET (check)); add_completion_test_page (assistant, "Even More Content", TRUE, TRUE); @@ -297,19 +298,19 @@ create_generous_assistant (GtkWidget *widget) gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Progress"); gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_PROGRESS); - page = gtk_check_button_new_with_label ("Summary complete"); - gtk_widget_show (page); - gtk_assistant_append_page (GTK_ASSISTANT (assistant), page); - gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Summary"); - gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_SUMMARY); + check = gtk_check_button_new_with_label ("Summary complete"); + gtk_widget_show (GTK_WIDGET (check)); + gtk_assistant_append_page (GTK_ASSISTANT (assistant), GTK_WIDGET (check)); + gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), GTK_WIDGET (check), "Summary"); + gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), GTK_WIDGET (check), GTK_ASSISTANT_PAGE_SUMMARY); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page), + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gtk_assistant_get_page_complete (GTK_ASSISTANT (assistant), - page)); + GTK_WIDGET (check))); pdata = g_new (PageData, 1); pdata->assistant = GTK_ASSISTANT (assistant); - pdata->page = page; + pdata->page = GTK_WIDGET (check); g_signal_connect (page, "toggled", G_CALLBACK (complete_cb), pdata); } @@ -457,6 +458,7 @@ create_looping_assistant (GtkWidget *widget) if (!assistant) { GtkWidget *page; + GtkCheckButton *check; assistant = gtk_assistant_new (); gtk_window_set_default_size (GTK_WINDOW (assistant), 400, 300); @@ -493,11 +495,11 @@ create_looping_assistant (GtkWidget *widget) gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "More content"); gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE); - page = gtk_check_button_new_with_label ("Loop?"); - gtk_widget_show (page); - gtk_assistant_append_page (GTK_ASSISTANT (assistant), page); - gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Loop?"); - gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE); + check = gtk_check_button_new_with_label ("Loop?"); + gtk_widget_show (GTK_WIDGET (check)); + gtk_assistant_append_page (GTK_ASSISTANT (assistant), GTK_WIDGET (check)); + gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), GTK_WIDGET (check), "Loop?"); + gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), GTK_WIDGET (check), TRUE); page = get_test_page ("Confirmation"); gtk_widget_show (page); diff --git a/tests/testbaseline.c b/tests/testbaseline.c index 2ab609582f5440beaff73602ef63c493adeb40c3..69e0469cfd15a3b380e520229c2e04723d011b16 100644 --- a/tests/testbaseline.c +++ b/tests/testbaseline.c @@ -55,7 +55,7 @@ image_size_value_changed (GtkSpinButton *spin_button, { gint size = gtk_spin_button_get_value_as_int (spin_button); - gtk_image_set_pixel_size (GTK_IMAGE (image), size); + gtk_image_set_pixel_size (image, size); } static void @@ -70,8 +70,14 @@ int main (int argc, char **argv) { - GtkWidget *window, *label, *entry, *button, *grid, *notebook; - GtkWidget *vbox, *hbox, *grid_hbox, *spin, *spin2, *toggle, *combo, *image; + GtkWidget *window, *button, *grid, *notebook; + GtkToggleButton *toggle_button; + GtkCheckButton *check; + GtkEntry *entry; + GtkWidget *vbox, *hbox, *grid_hbox, *spin, *spin2, *toggle; + GtkImage *image; + GtkComboBoxText *combo; + GtkLabel *label; GtkAdjustment *adjustment; int i, j; GtkCssProvider *provider; @@ -95,7 +101,7 @@ main (int argc, vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), - vbox, gtk_label_new ("hboxes")); + vbox, GTK_WIDGET (gtk_label_new ("hboxes"))); for (j = 0; j < 2; j++) { @@ -106,27 +112,27 @@ main (int argc, GtkAlign aligns[] = { GTK_ALIGN_FILL, GTK_ALIGN_BASELINE}; label = gtk_label_new (aligns_names[j]); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); for (i = 0; i < 3; i++) { label = gtk_label_new ("│XYyj,Ö..."); - set_font_size (label, i); + set_font_size (GTK_WIDGET (label), i); - gtk_widget_set_valign (label, aligns[j]); + gtk_widget_set_valign (GTK_WIDGET (label), aligns[j]); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); } for (i = 0; i < 3; i++) { entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "│XYyj,Ö..."); - set_font_size (entry, i); + set_font_size (GTK_WIDGET (entry), i); - gtk_widget_set_valign (entry, aligns[j]); + gtk_widget_set_valign (GTK_WIDGET (entry), aligns[j]); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); } spin = gtk_spin_button_new (NULL, 0, 1); @@ -143,11 +149,11 @@ main (int argc, gtk_container_add (GTK_CONTAINER (vbox), hbox); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), baseline_pos_str[0]); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), baseline_pos_str[1]); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), baseline_pos_str[2]); + gtk_combo_box_text_append_text (combo, baseline_pos_str[0]); + gtk_combo_box_text_append_text (combo, baseline_pos_str[1]); + gtk_combo_box_text_append_text (combo, baseline_pos_str[2]); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 1); - gtk_container_add (GTK_CONTAINER (hbox), combo); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (combo)); for (j = 0; j < 2; j++) { @@ -161,7 +167,7 @@ main (int argc, label = gtk_label_new ("Baseline:"); else label = gtk_label_new ("Normal:"); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); for (i = 0; i < 3; i++) { @@ -180,8 +186,8 @@ main (int argc, GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("│Xyj,Ö")); - gtk_container_add (GTK_CONTAINER (box), gtk_image_new_from_icon_name ("face-sad")); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new ("│Xyj,Ö"))); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_image_new_from_icon_name ("face-sad"))); gtk_container_add (GTK_CONTAINER (button), box); set_font_size (button, i); @@ -193,25 +199,25 @@ main (int argc, } image = gtk_image_new_from_icon_name ("face-sad"); - gtk_image_set_pixel_size (GTK_IMAGE (image), 34); + gtk_image_set_pixel_size (image, 34); if (j == 0) - gtk_widget_set_valign (image, GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (hbox), image); + gtk_widget_set_valign (GTK_WIDGET (image), GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (image)); - button = gtk_toggle_button_new_with_label ("│Xyj,Ö"); + toggle_button = gtk_toggle_button_new_with_label ("│Xyj,Ö"); if (j == 0) - gtk_widget_set_valign (button, GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (hbox), button); + gtk_widget_set_valign (GTK_WIDGET (toggle_button), GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (toggle_button)); - button = gtk_toggle_button_new_with_label ("│Xyj,Ö"); + toggle_button = gtk_toggle_button_new_with_label ("│Xyj,Ö"); if (j == 0) - gtk_widget_set_valign (button, GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (hbox), button); + gtk_widget_set_valign (GTK_WIDGET (toggle_button), GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (toggle_button)); - button = gtk_check_button_new_with_label ("│Xyj,Ö"); + check = gtk_check_button_new_with_label ("│Xyj,Ö"); if (j == 0) - gtk_widget_set_valign (button, GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (hbox), button); + gtk_widget_set_valign (GTK_WIDGET (check), GTK_ALIGN_BASELINE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (check)); button = gtk_radio_button_new_with_label (NULL, "│Xyj,Ö"); if (j == 0) @@ -222,15 +228,15 @@ main (int argc, vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), - vbox, gtk_label_new ("grid")); + vbox, GTK_WIDGET (gtk_label_new ("grid"))); grid_hbox = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_container_add (GTK_CONTAINER (vbox), hbox); label = gtk_label_new ("Align me:"); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); grid = gtk_grid_new (); gtk_widget_set_valign (grid, GTK_ALIGN_BASELINE); @@ -243,10 +249,10 @@ main (int argc, label = gtk_label_new (labels[j]); gtk_grid_attach (GTK_GRID (grid), - label, + GTK_WIDGET (label), 0, j, 1, 1); - gtk_widget_set_vexpand (label, TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (label), TRUE); if (j != 0) gtk_grid_set_row_baseline_position (GTK_GRID (grid), @@ -256,13 +262,13 @@ main (int argc, { label = gtk_label_new ("Xyjg,Ö."); - set_font_size (label, i); + set_font_size (GTK_WIDGET (label), i); if (j != 0) - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_BASELINE); gtk_grid_attach (GTK_GRID (grid), - label, + GTK_WIDGET (label), i+1, j, 1, 1); } @@ -272,8 +278,8 @@ main (int argc, GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("│Xyj,Ö")); - gtk_container_add (GTK_CONTAINER (box), gtk_image_new_from_icon_name ("face-sad")); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new ("│Xyj,Ö"))); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_image_new_from_icon_name ("face-sad"))); gtk_container_add (GTK_CONTAINER (button), box); set_font_size (button, i); @@ -304,17 +310,17 @@ main (int argc, gtk_container_add (GTK_CONTAINER (hbox), toggle); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), baseline_pos_str[0]); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), baseline_pos_str[1]); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), baseline_pos_str[2]); + gtk_combo_box_text_append_text (combo, baseline_pos_str[0]); + gtk_combo_box_text_append_text (combo, baseline_pos_str[1]); + gtk_combo_box_text_append_text (combo, baseline_pos_str[2]); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 1); g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (baseline_position_changed), grid_hbox); - gtk_container_add (GTK_CONTAINER (hbox), combo); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (combo)); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), - vbox, gtk_label_new ("button box")); + vbox, GTK_WIDGET (gtk_label_new ("button box"))); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_container_add (GTK_CONTAINER (vbox), hbox); @@ -335,12 +341,12 @@ main (int argc, gtk_box_set_baseline_position (GTK_BOX (hbox), j); label = gtk_label_new (baseline_pos_str[j]); - gtk_container_add (GTK_CONTAINER (hbox), label); - gtk_widget_set_vexpand (label, TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); + gtk_widget_set_vexpand (GTK_WIDGET (label), TRUE); image = gtk_image_new_from_icon_name ("face-sad"); - gtk_image_set_pixel_size (GTK_IMAGE (image), 34); - gtk_container_add (GTK_CONTAINER (hbox), image); + gtk_image_set_pixel_size (image, 34); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (image)); g_signal_connect (spin, "value-changed", (GCallback)image_size_value_changed, image); @@ -361,10 +367,10 @@ main (int argc, GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("│Xyj,Ö")); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new ("│Xyj,Ö"))); image = gtk_image_new_from_icon_name ("face-sad"); - gtk_image_set_pixel_size (GTK_IMAGE (image), 16); - gtk_container_add (GTK_CONTAINER (box), image); + gtk_image_set_pixel_size (image, 16); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (image)); gtk_container_add (GTK_CONTAINER (button), box); if (i == 0) diff --git a/tests/testblur.c b/tests/testblur.c index 99632ffd9c48f53fe8900a8e67d3464f3ca8f782..863c9d5cdade66674a92edcf2b714474ebe29eb6 100644 --- a/tests/testblur.c +++ b/tests/testblur.c @@ -78,7 +78,7 @@ main (int argc, char **argv) GtkWidget *window; GtkWidget *blur_box; GtkWidget *scale; - GtkWidget *value_label; + GtkLabel *value_label; gtk_init (); @@ -91,16 +91,16 @@ main (int argc, char **argv) NULL); value_label = gtk_label_new ("FF"); - gtk_widget_set_margin_top (value_label, 32); + gtk_widget_set_margin_top (GTK_WIDGET (value_label), 32); { PangoAttrList *attrs; attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_scale_new (6.0)); - gtk_label_set_attributes (GTK_LABEL (value_label), attrs); + gtk_label_set_attributes (value_label, attrs); pango_attr_list_unref (attrs); } - gtk_container_add (GTK_CONTAINER (blur_box), value_label); + gtk_container_add (GTK_CONTAINER (blur_box), GTK_WIDGET (value_label)); scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 10, 0.05); diff --git a/tests/testbox.c b/tests/testbox.c index 106986d45bc09ea3668e56139fc250c93af059ab..604fea3430dc976411da6791e655a990b50588d3 100644 --- a/tests/testbox.c +++ b/tests/testbox.c @@ -5,9 +5,9 @@ edit_widget (GtkWidget *button) { GtkWidget *dialog; GtkWidget *grid; - GtkWidget *label; - GtkWidget *entry; - GtkWidget *check; + GtkLabel *label; + GtkEntry *entry; + GtkCheckButton *check; dialog = GTK_WIDGET (g_object_get_data (G_OBJECT (button), "dialog")); @@ -27,22 +27,22 @@ edit_widget (GtkWidget *button) gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), grid); label = gtk_label_new ("Label:"); - gtk_widget_set_halign (label, GTK_ALIGN_END); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_END); entry = gtk_entry_new (); g_object_bind_property (button, "label", entry, "text", G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (entry), 1, 0, 1, 1); label = gtk_label_new ("Visible:"); - gtk_widget_set_halign (label, GTK_ALIGN_END); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_END); check = gtk_check_button_new (); g_object_bind_property (button, "visible", check, "active", G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE); - gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1); - gtk_grid_attach (GTK_GRID (grid), check, 1, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check), 1, 1, 1, 1); g_object_set_data (G_OBJECT (button), "dialog", dialog); } @@ -76,9 +76,9 @@ main (int argc, char *argv[]) GtkWidget *window; GtkWidget *vbox; GtkWidget *box; - GtkWidget *check; + GtkCheckButton *check; GtkWidget *b; - GtkWidget *label; + GtkLabel *label; GtkWidget *spin; gtk_init (); @@ -103,16 +103,16 @@ main (int argc, char *argv[]) check, "active", G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE); g_object_set (check, "margin", 10, NULL); - gtk_widget_set_halign (check, GTK_ALIGN_CENTER); - gtk_widget_show (check); - gtk_container_add (GTK_CONTAINER (vbox), check); + gtk_widget_set_halign (GTK_WIDGET (check), GTK_ALIGN_CENTER); + gtk_widget_show (GTK_WIDGET (check)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (check)); b = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); g_object_set (b, "margin", 10, NULL); gtk_widget_set_halign (b, GTK_ALIGN_CENTER); label = gtk_label_new ("Spacing:"); - gtk_widget_set_halign (label, GTK_ALIGN_END); - gtk_container_add (GTK_CONTAINER (b), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_END); + gtk_container_add (GTK_CONTAINER (b), GTK_WIDGET (label)); spin = gtk_spin_button_new_with_range (0, 10, 1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE); diff --git a/tests/testbuttons.c b/tests/testbuttons.c index 038dfade80a24f15f80bb303e6b1f7eda8cfb755..78e199a1cb4cb319a779808c9a79e9cdca72b296 100644 --- a/tests/testbuttons.c +++ b/tests/testbuttons.c @@ -25,7 +25,7 @@ int main (int argc, char *argv[]) gchar *text; const char *icon_name; gboolean use_underline; - GtkWidget *label; + GtkLabel *label; gtk_init (); @@ -50,7 +50,7 @@ int main (int argc, char *argv[]) text = g_strdup_printf ("label: \"%s\" icon-name: \"%s\" use-underline: %s\n", text, icon_name, use_underline ? "TRUE" : "FALSE"); label = gtk_label_new (text); g_free (text); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (box), hbox); @@ -65,7 +65,7 @@ int main (int argc, char *argv[]) text = g_strdup_printf ("label: \"%s\" icon-name: \"%s\" use-underline: %s\n", text, icon_name, use_underline ? "TRUE" : "FALSE"); label = gtk_label_new (text); g_free (text); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (box), hbox); @@ -80,7 +80,7 @@ int main (int argc, char *argv[]) text = g_strdup_printf ("label: \"%s\" icon-name: \"%s\" use-underline: %s\n", text, icon_name, use_underline ? "TRUE" : "FALSE"); label = gtk_label_new (text); g_free (text); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (box), hbox); @@ -95,7 +95,7 @@ int main (int argc, char *argv[]) text = g_strdup_printf ("label: \"%s\" icon-name: \"%s\" use-underline: %s\n", text, icon_name, use_underline ? "TRUE" : "FALSE"); label = gtk_label_new (text); g_free (text); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (box), hbox); @@ -111,7 +111,7 @@ int main (int argc, char *argv[]) text = g_strdup_printf ("label: \"%s\" icon-name: \"%s\" use-underline: %s\n", text, icon_name, use_underline ? "TRUE" : "FALSE"); label = gtk_label_new (text); g_free (text); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); gtk_widget_show (window); diff --git a/tests/testcalendar.c b/tests/testcalendar.c index 545e89aac035b701eb9a411db4f89db7f0c5cbf2..1b3a46511b2b87150a8fc74e3030e34b3cef7b97 100644 --- a/tests/testcalendar.c +++ b/tests/testcalendar.c @@ -34,9 +34,9 @@ typedef struct _CalendarData gboolean settings[6]; GtkWidget *font_dialog; GtkWidget *window; - GtkWidget *prev2_sig; - GtkWidget *prev_sig; - GtkWidget *last_sig; + GtkLabel *prev2_sig; + GtkLabel *prev_sig; + GtkLabel *last_sig; GtkWidget *month; GHashTable *details_table; @@ -128,12 +128,12 @@ calendar_set_signal_strings (char *sig_str, { const gchar *prev_sig; - prev_sig = gtk_label_get_text (GTK_LABEL (data->prev_sig)); - gtk_label_set_text (GTK_LABEL (data->prev2_sig), prev_sig); + prev_sig = gtk_label_get_text (data->prev_sig); + gtk_label_set_text (data->prev2_sig, prev_sig); - prev_sig = gtk_label_get_text (GTK_LABEL (data->last_sig)); - gtk_label_set_text (GTK_LABEL (data->prev_sig), prev_sig); - gtk_label_set_text (GTK_LABEL (data->last_sig), sig_str); + prev_sig = gtk_label_get_text (data->last_sig); + gtk_label_set_text (data->prev_sig, prev_sig); + gtk_label_set_text (data->last_sig, sig_str); } static void @@ -344,14 +344,14 @@ calendar_toggle_details (GtkWidget *widget, NULL, NULL, NULL); } -static GtkWidget* +static GtkExpander* create_expander (const char *caption, GtkWidget *child, GtkAlign halign, GtkAlign valign) { - GtkWidget *expander = gtk_expander_new (""); - GtkWidget *label = gtk_expander_get_label_widget (GTK_EXPANDER (expander)); + GtkExpander *expander = gtk_expander_new (""); + GtkWidget *label = gtk_expander_get_label_widget (expander); g_object_set (child, "margin-top", 6, @@ -415,8 +415,11 @@ create_calendar(void) static CalendarData calendar_data; GtkWidget *window, *hpaned, *vbox, *rpane, *hbox; - GtkWidget *calendar, *toggle, *scroller, *button; - GtkWidget *frame, *label, *bbox, *details; + GtkWidget *calendar, *scroller, *button; + GtkCheckButton *toggle; + GtkWidget *frame, *bbox, *details; + GtkExpander *expander; + GtkLabel *label; GtkSizeGroup *size; GtkStyleContext *context; @@ -506,13 +509,13 @@ create_calendar(void) &calendar_data); label = gtk_label_new_with_mnemonic ("_Font:"); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), button); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_size_group_add_widget (size, label); + gtk_label_set_mnemonic_widget (label, button); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_size_group_add_widget (size, GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (hbox), button); gtk_container_add (GTK_CONTAINER (vbox), hbox); @@ -527,13 +530,13 @@ create_calendar(void) &calendar_data); label = gtk_label_new_with_mnemonic ("Details W_idth:"); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), button); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_size_group_add_widget (size, label); + gtk_label_set_mnemonic_widget (label, button); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_size_group_add_widget (size, GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (hbox), button); gtk_container_add (GTK_CONTAINER (vbox), hbox); @@ -548,13 +551,13 @@ create_calendar(void) &calendar_data); label = gtk_label_new_with_mnemonic ("Details H_eight:"); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), button); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_size_group_add_widget (size, label); + gtk_label_set_mnemonic_widget (label, button); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_size_group_add_widget (size, GTK_WIDGET (label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (hbox), button); gtk_container_add (GTK_CONTAINER (vbox), hbox); @@ -609,19 +612,19 @@ create_calendar(void) g_signal_connect (toggle, "toggled", G_CALLBACK(calendar_toggle_details), &calendar_data); - gtk_container_add (GTK_CONTAINER (vbox), toggle); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (toggle)); /* Build the Right frame with the flags in */ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - frame = create_expander ("Flags", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (rpane), frame); + expander = create_expander ("Flags", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (rpane), GTK_WIDGET (expander)); for (i = 0; i < G_N_ELEMENTS (calendar_data.settings); i++) { toggle = gtk_check_button_new_with_mnemonic(flags[i].label); - gtk_container_add (GTK_CONTAINER (vbox), toggle); - calendar_data.flag_checkboxes[i] = toggle; + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (toggle)); + calendar_data.flag_checkboxes[i] = GTK_WIDGET (toggle); g_signal_connect (toggle, "toggled", G_CALLBACK (calendar_toggle_flag), @@ -641,23 +644,23 @@ create_calendar(void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_container_add (GTK_CONTAINER (vbox), hbox); label = gtk_label_new ("Signal:"); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); calendar_data.last_sig = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (hbox), calendar_data.last_sig); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (calendar_data.last_sig)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_container_add (GTK_CONTAINER (vbox), hbox); label = gtk_label_new ("Previous signal:"); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); calendar_data.prev_sig = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (hbox), calendar_data.prev_sig); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (calendar_data.prev_sig)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_container_add (GTK_CONTAINER (vbox), hbox); label = gtk_label_new ("Second previous signal:"); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); calendar_data.prev2_sig = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (hbox), calendar_data.prev2_sig); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (calendar_data.prev2_sig)); /* * Glue everything together @@ -673,9 +676,9 @@ create_calendar(void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL); gtk_container_add (GTK_CONTAINER (vbox), hpaned); - gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); gtk_container_add (GTK_CONTAINER (vbox), frame); - gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); gtk_container_add (GTK_CONTAINER (vbox), bbox); gtk_container_add (GTK_CONTAINER (window), vbox); diff --git a/tests/testcellarea.c b/tests/testcellarea.c index e4d9f19cecd73842bc12a37d50b13396363b63fb..4e898917aa4da7b115ebb17ed75624787489c08f 100644 --- a/tests/testcellarea.c +++ b/tests/testcellarea.c @@ -177,7 +177,9 @@ expand_cell_3_toggled (GtkToggleButton *toggle, static void simple_cell_area (void) { - GtkWidget *window, *widget; + GtkWidget *window; + GtkCheckButton *widget; + GtkComboBoxText *combo; GtkWidget *iconview, *frame, *vbox, *hbox; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -201,28 +203,28 @@ simple_cell_area (void) gtk_container_add (GTK_CONTAINER (hbox), frame); - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (vbox), widget); + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (combo, "Horizontal"); + gtk_combo_box_text_append_text (combo, "Vertical"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + gtk_widget_show (GTK_WIDGET (combo)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (combo)); - g_signal_connect (G_OBJECT (widget), "changed", + g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (orientation_changed), iconview); widget = gtk_check_button_new_with_label ("Align 2nd Cell"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (vbox), widget); + gtk_widget_show (GTK_WIDGET (widget)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (widget)); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (align_cell_2_toggled), iconview); widget = gtk_check_button_new_with_label ("Align 3rd Cell"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (vbox), widget); + gtk_widget_show (GTK_WIDGET (widget)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (widget)); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (align_cell_3_toggled), iconview); @@ -230,24 +232,24 @@ simple_cell_area (void) widget = gtk_check_button_new_with_label ("Expand 1st Cell"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (vbox), widget); + gtk_widget_show (GTK_WIDGET (widget)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (widget)); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (expand_cell_1_toggled), iconview); widget = gtk_check_button_new_with_label ("Expand 2nd Cell"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (vbox), widget); + gtk_widget_show (GTK_WIDGET (widget)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (widget)); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (expand_cell_2_toggled), iconview); widget = gtk_check_button_new_with_label ("Expand 3rd Cell"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (vbox), widget); + gtk_widget_show (GTK_WIDGET (widget)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (widget)); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (expand_cell_3_toggled), iconview); @@ -420,7 +422,9 @@ focus_sibling_toggled (GtkToggleButton *toggle, static void focus_cell_area (void) { - GtkWidget *window, *widget; + GtkWidget *window; + GtkCheckButton *widget; + GtkComboBoxText *combo; GtkWidget *iconview, *frame, *vbox, *hbox; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -444,20 +448,20 @@ focus_cell_area (void) gtk_container_add (GTK_CONTAINER (hbox), vbox); gtk_container_add (GTK_CONTAINER (hbox), frame); - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (vbox), widget); + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (combo, "Horizontal"); + gtk_combo_box_text_append_text (combo, "Vertical"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + gtk_widget_show (GTK_WIDGET (combo)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (combo)); - g_signal_connect (G_OBJECT (widget), "changed", + g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (orientation_changed), iconview); widget = gtk_check_button_new_with_label ("Focus Sibling"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (vbox), widget); + gtk_widget_show (GTK_WIDGET (widget)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (widget)); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (focus_sibling_toggled), iconview); @@ -509,8 +513,10 @@ item_padding_changed (GtkSpinButton *spin_button, static void background_area (void) { - GtkWidget *window, *widget, *label, *main_vbox; + GtkWidget *window, *widget, *main_vbox; + GtkComboBoxText *combo; GtkWidget *iconview, *frame, *vbox, *hbox; + GtkLabel *label; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); @@ -524,9 +530,9 @@ background_area (void) label = gtk_label_new ("In this example, row spacing gets devided into the background area, " "column spacing is added between each background area, item_padding is " "prepended space distributed to the background area."); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_width_chars (GTK_LABEL (label), 40); - gtk_container_add (GTK_CONTAINER (main_vbox), label); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_width_chars (label, 40); + gtk_container_add (GTK_CONTAINER (main_vbox), GTK_WIDGET (label)); iconview = focus_iconview (TRUE, NULL, NULL); @@ -546,21 +552,21 @@ background_area (void) gtk_container_add (GTK_CONTAINER (main_vbox), hbox); - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (vbox), widget); + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (combo, "Horizontal"); + gtk_combo_box_text_append_text (combo, "Vertical"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + gtk_widget_show (GTK_WIDGET (combo)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (combo)); - g_signal_connect (G_OBJECT (widget), "changed", + g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (orientation_changed), iconview); widget = gtk_spin_button_new_with_range (0, 10, 1); label = gtk_label_new ("Cell spacing"); - gtk_widget_set_hexpand (label, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (hbox), widget); gtk_container_add (GTK_CONTAINER (vbox), hbox); @@ -571,9 +577,9 @@ background_area (void) widget = gtk_spin_button_new_with_range (0, 10, 1); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), gtk_icon_view_get_row_spacing (GTK_ICON_VIEW (iconview))); label = gtk_label_new ("Row spacing"); - gtk_widget_set_hexpand (label, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (hbox), widget); gtk_container_add (GTK_CONTAINER (vbox), hbox); @@ -582,10 +588,10 @@ background_area (void) widget = gtk_spin_button_new_with_range (0, 30, 1); label = gtk_label_new ("Item padding"); - gtk_widget_set_hexpand (label, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), gtk_icon_view_get_item_padding (GTK_ICON_VIEW (iconview))); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (hbox), widget); gtk_container_add (GTK_CONTAINER (vbox), hbox); diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c index 4c35f13ef853ad4ab899afe76403d5be69a2dfed..5715a062009c68c1aa07e7ab619ee8fa885eac52 100644 --- a/tests/testcellrenderertext.c +++ b/tests/testcellrenderertext.c @@ -251,7 +251,7 @@ main (int argc, char **argv) { GtkWidget *window; GtkWidget *vbox; - GtkWidget *label; + GtkLabel *label; GtkWidget *tree; gtk_init (); @@ -266,7 +266,7 @@ main (int argc, char **argv) /* LTR */ label = gtk_label_new ("Left to right"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); tree = create_tree (FALSE); gtk_widget_set_vexpand (tree, TRUE); @@ -275,7 +275,7 @@ main (int argc, char **argv) /* RTL */ label = gtk_label_new ("Right to left"); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); tree = create_tree (TRUE); gtk_widget_set_vexpand (tree, TRUE); diff --git a/tests/testcenterbox.c b/tests/testcenterbox.c index 326a728bfb10c63d666da1c73a0f25bbc56b489e..e5076b48efa00ac815e022b63bcbd94e41aafcba 100644 --- a/tests/testcenterbox.c +++ b/tests/testcenterbox.c @@ -4,8 +4,8 @@ int main (int argc, char *argv[]) { GtkWidget *window; - GtkWidget *box; - GtkWidget *child; + GtkCenterBox *box; + GtkLabel *child; gtk_init (); @@ -14,19 +14,19 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); box = gtk_center_box_new (); - gtk_container_add (GTK_CONTAINER (window), box); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (box)); child = gtk_label_new ("Start Start Start Start Start"); - gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END); - gtk_center_box_set_start_widget (GTK_CENTER_BOX (box), child); + gtk_label_set_ellipsize (child, PANGO_ELLIPSIZE_END); + gtk_center_box_set_start_widget (box, GTK_WIDGET (child)); child = gtk_label_new ("Center"); - gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END); - gtk_center_box_set_center_widget (GTK_CENTER_BOX (box), child); + gtk_label_set_ellipsize (child, PANGO_ELLIPSIZE_END); + gtk_center_box_set_center_widget (box, GTK_WIDGET (child)); child = gtk_label_new ("End"); - gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END); - gtk_center_box_set_end_widget (GTK_CENTER_BOX (box), child); + gtk_label_set_ellipsize (child, PANGO_ELLIPSIZE_END); + gtk_center_box_set_end_widget (box, GTK_WIDGET (child)); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); diff --git a/tests/testclipboard2.c b/tests/testclipboard2.c index 432cbfc4bf1085aceead4c1e5f324c8d9e5ed686..bac1d87dd918252e61750509a190ff86e91840f4 100644 --- a/tests/testclipboard2.c +++ b/tests/testclipboard2.c @@ -162,7 +162,7 @@ format_list_add_row (GtkWidget *list, GtkWidget *box; box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new (format_name)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new (format_name))); gdk_content_formats_unref (formats); gtk_container_add (GTK_CONTAINER (list), box); @@ -220,6 +220,8 @@ static GtkWidget * get_contents_widget (GdkClipboard *clipboard) { GtkWidget *stack, *child; + GtkImage *image; + GtkLabel *label; stack = gtk_stack_new (); gtk_widget_set_hexpand (stack, TRUE); @@ -230,12 +232,12 @@ get_contents_widget (GdkClipboard *clipboard) child = get_formats_list (clipboard); gtk_stack_add_titled (GTK_STACK (stack), child, "info", "Info"); - child = gtk_image_new (); - gtk_stack_add_titled (GTK_STACK (stack), child, "image", "Image"); + image = gtk_image_new (); + gtk_stack_add_titled (GTK_STACK (stack), GTK_WIDGET (image), "image", "Image"); - child = gtk_label_new (NULL); - gtk_label_set_wrap (GTK_LABEL (child), TRUE); - gtk_stack_add_titled (GTK_STACK (stack), child, "text", "Text"); + label = gtk_label_new (NULL); + gtk_label_set_wrap (label, TRUE); + gtk_stack_add_titled (GTK_STACK (stack), GTK_WIDGET (label), "text", "Text"); return stack; } @@ -276,7 +278,7 @@ get_button_list (GdkClipboard *clipboard, box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new (info)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new (info))); add_provider_button (box, NULL, @@ -341,7 +343,7 @@ get_clipboard_widget (GdkClipboard *clipboard, hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (hbox), vbox); - gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new (name)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_label_new (name))); switcher = gtk_stack_switcher_new (); gtk_container_add (GTK_CONTAINER (vbox), switcher); stack = get_contents_widget (clipboard); diff --git a/tests/testcolorchooser.c b/tests/testcolorchooser.c index 0a6fb1d5bc442704b915039df3981539dbc42fd4..b171b6c9d0c035697e7701968e04c34d19551e09 100644 --- a/tests/testcolorchooser.c +++ b/tests/testcolorchooser.c @@ -33,7 +33,7 @@ dialog_response (GtkDialog *dialog, gint response) int main (int argc, char *argv[]) { - GtkWidget *dialog; + GtkColorChooserDialog *dialog; gint i; gtk_init (); @@ -86,7 +86,7 @@ main (int argc, char *argv[]) } else if (g_strcmp0 (argv[i], "--no-palette") == 0) { - gtk_color_chooser_add_palette (GTK_COLOR_CHOOSER (dialog), + gtk_color_chooser_add_palette (GTK_COLOR_CHOOSER (dialog), GTK_ORIENTATION_VERTICAL, 0, 0, NULL); } } @@ -94,7 +94,7 @@ main (int argc, char *argv[]) g_signal_connect (dialog, "notify::color", G_CALLBACK (color_changed), NULL); g_signal_connect (dialog, "response", G_CALLBACK (dialog_response), NULL); - gtk_widget_show (dialog); + gtk_widget_show (GTK_WIDGET (dialog)); gtk_main (); diff --git a/tests/testcombo.c b/tests/testcombo.c index ade1673f8020314df8408f13a0152f0155f1c706..e49e0f15e918372f6273c0425741ce72f6cc233c 100644 --- a/tests/testcombo.c +++ b/tests/testcombo.c @@ -27,7 +27,7 @@ static GtkTreeModel * create_tree_blaat (void) { - GtkWidget *cellview; + GtkCellView *cellview; GtkTreeIter iter, iter2; GtkTreeStore *store; @@ -79,7 +79,7 @@ create_tree_blaat (void) 2, FALSE, -1); - gtk_widget_destroy (cellview); + gtk_widget_destroy (GTK_WIDGET (cellview)); return GTK_TREE_MODEL (store); } @@ -87,7 +87,7 @@ create_tree_blaat (void) static GtkTreeModel * create_empty_list_blaat (void) { - GtkWidget *cellview; + GtkCellView *cellview; GtkTreeIter iter; GtkListStore *store; @@ -101,7 +101,7 @@ create_empty_list_blaat (void) 1, "dialog-warning", -1); - gtk_widget_destroy (cellview); + gtk_widget_destroy (GTK_WIDGET (cellview)); return GTK_TREE_MODEL (store); } @@ -111,7 +111,7 @@ populate_list_blaat (gpointer data) { GtkComboBox *combo_box = GTK_COMBO_BOX (data); GtkListStore *store; - GtkWidget *cellview; + GtkCellView *cellview; GtkTreeIter iter; store = GTK_LIST_STORE (gtk_combo_box_get_model (combo_box)); @@ -153,13 +153,13 @@ populate_list_blaat (gpointer data) 1, "document-open", -1); - gtk_widget_destroy (cellview); + gtk_widget_destroy (GTK_WIDGET (cellview)); } static GtkTreeModel * create_list_blaat (void) { - GtkWidget *cellview; + GtkCellView *cellview; GtkTreeIter iter; GtkListStore *store; @@ -203,7 +203,7 @@ create_list_blaat (void) 1, "document-open", -1); - gtk_widget_destroy (cellview); + gtk_widget_destroy (GTK_WIDGET (cellview)); return GTK_TREE_MODEL (store); } @@ -922,8 +922,10 @@ displayed_row_changed (GtkComboBox *combo, int main (int argc, char **argv) { - GtkWidget *window, *cellview, *mainbox; - GtkWidget *combobox, *comboboxtext; + GtkWidget *window, *mainbox; + GtkCellView *cellview; + GtkComboBox *combobox; + GtkComboBoxText *comboboxtext; GtkWidget *tmp, *boom; GtkCellRenderer *renderer; GtkTreeModel *model; @@ -963,7 +965,7 @@ main (int argc, char **argv) renderer, TRUE); g_object_set (renderer, "text", "la la la", NULL); - gtk_container_add (GTK_CONTAINER (boom), cellview); + gtk_container_add (GTK_CONTAINER (boom), GTK_WIDGET (cellview)); /* GtkComboBox list */ tmp = gtk_frame_new ("GtkComboBox (list)"); @@ -975,7 +977,7 @@ main (int argc, char **argv) model = create_list_blaat (); combobox = gtk_combo_box_new_with_model (model); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (boom), combobox); + gtk_container_add (GTK_CONTAINER (boom), GTK_WIDGET (combobox)); renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), @@ -1000,10 +1002,10 @@ main (int argc, char **argv) renderer, set_sensitive, NULL, NULL); - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), + gtk_combo_box_set_row_separator_func (combobox, is_separator, NULL, NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); + gtk_combo_box_set_active (combobox, 0); /* GtkComboBox dynamic list */ tmp = gtk_frame_new ("GtkComboBox (dynamic list)"); @@ -1018,7 +1020,7 @@ main (int argc, char **argv) G_CALLBACK (populate_list_blaat), combobox); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (boom), combobox); + gtk_container_add (GTK_CONTAINER (boom), GTK_WIDGET (combobox)); renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), @@ -1043,10 +1045,10 @@ main (int argc, char **argv) renderer, set_sensitive, NULL, NULL); - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), + gtk_combo_box_set_row_separator_func (combobox, is_separator, NULL, NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); + gtk_combo_box_set_active (combobox, 0); /* GtkComboBox custom entry */ tmp = gtk_frame_new ("GtkComboBox (custom)"); @@ -1058,7 +1060,7 @@ main (int argc, char **argv) model = create_list_blaat (); combobox = gtk_combo_box_new_with_model (model); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (boom), combobox); + gtk_container_add (GTK_CONTAINER (boom), GTK_WIDGET (combobox)); renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), @@ -1083,24 +1085,24 @@ main (int argc, char **argv) renderer, set_sensitive, NULL, NULL); - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), + gtk_combo_box_set_row_separator_func (combobox, is_separator, NULL, NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); + gtk_combo_box_set_active (combobox, 0); - tmp = gtk_cell_view_new (); - gtk_widget_show (tmp); - gtk_cell_view_set_model (GTK_CELL_VIEW (tmp), model); + cellview = gtk_cell_view_new (); + gtk_widget_show (GTK_WIDGET (cellview)); + gtk_cell_view_set_model (cellview, model); renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (tmp), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (tmp), renderer, + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview), renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (cellview), renderer, "text", 1, NULL); - displayed_row_changed (GTK_COMBO_BOX (combobox), GTK_CELL_VIEW (tmp)); - g_signal_connect (combobox, "changed", G_CALLBACK (displayed_row_changed), tmp); + displayed_row_changed (combobox, cellview); + g_signal_connect (combobox, "changed", G_CALLBACK (displayed_row_changed), cellview); - gtk_container_add (GTK_CONTAINER (combobox), tmp); + gtk_container_add (GTK_CONTAINER (combobox), GTK_WIDGET (cellview)); /* GtkComboBox tree */ tmp = gtk_frame_new ("GtkComboBox (tree)"); @@ -1112,7 +1114,7 @@ main (int argc, char **argv) model = create_tree_blaat (); combobox = gtk_combo_box_new_with_model (model); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (boom), combobox); + gtk_container_add (GTK_CONTAINER (boom), GTK_WIDGET (combobox)); renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), @@ -1137,10 +1139,10 @@ main (int argc, char **argv) renderer, set_sensitive, NULL, NULL); - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), + gtk_combo_box_set_row_separator_func (combobox, is_separator, NULL, NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); + gtk_combo_box_set_active (combobox, 0); #if 0 g_timeout_add (1000, (GSourceFunc) animation_timer, model); #endif @@ -1161,8 +1163,8 @@ main (int argc, char **argv) gtk_container_add (GTK_CONTAINER (tmp), boom); comboboxtext = gtk_combo_box_text_new_with_entry (); - setup_combo_entry (GTK_COMBO_BOX_TEXT (comboboxtext)); - gtk_container_add (GTK_CONTAINER (boom), comboboxtext); + setup_combo_entry (comboboxtext); + gtk_container_add (GTK_CONTAINER (boom), GTK_WIDGET (comboboxtext)); /* Phylogenetic tree */ @@ -1175,7 +1177,7 @@ main (int argc, char **argv) model = create_phylogenetic_tree (); combobox = gtk_combo_box_new_with_model (model); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (boom), combobox); + gtk_container_add (GTK_CONTAINER (boom), GTK_WIDGET (combobox)); renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), @@ -1185,7 +1187,7 @@ main (int argc, char **argv) "text", 0, NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); + gtk_combo_box_set_active (combobox, 0); /* Capitals */ tmp = gtk_frame_new ("Where are you ?"); @@ -1197,7 +1199,7 @@ main (int argc, char **argv) model = create_capital_tree (); combobox = gtk_combo_box_new_with_model (model); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (boom), combobox); + gtk_container_add (GTK_CONTAINER (boom), GTK_WIDGET (combobox)); renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), renderer, @@ -1212,7 +1214,7 @@ main (int argc, char **argv) path = gtk_tree_path_new_from_indices (0, 8, -1); gtk_tree_model_get_iter (model, &iter, path); gtk_tree_path_free (path); - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), &iter); + gtk_combo_box_set_active_iter (combobox, &iter); #if 1 g_timeout_add (1000, (GSourceFunc) capital_animation, model); @@ -1228,7 +1230,7 @@ main (int argc, char **argv) model = create_food_list (); combobox = gtk_combo_box_new_with_model (model); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (boom), combobox); + gtk_container_add (GTK_CONTAINER (boom), GTK_WIDGET (combobox)); area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (combobox)); @@ -1250,7 +1252,7 @@ main (int argc, char **argv) "text", 1, NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); + gtk_combo_box_set_active (combobox, 0); /* Ellipsizing growing combos */ tmp = gtk_frame_new ("Unconstrained Menu"); @@ -1262,27 +1264,27 @@ main (int argc, char **argv) model = create_list_long (); combobox = gtk_combo_box_new_with_model (model); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (boom), combobox); + gtk_container_add (GTK_CONTAINER (boom), GTK_WIDGET (combobox)); renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), renderer, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer, "text", 0, NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); - gtk_combo_box_set_popup_fixed_width (GTK_COMBO_BOX (combobox), FALSE); + gtk_combo_box_set_active (combobox, 0); + gtk_combo_box_set_popup_fixed_width (combobox, FALSE); tmp = gtk_frame_new ("Looong"); gtk_container_add (GTK_CONTAINER (mainbox), tmp); - combobox = gtk_combo_box_text_new (); + comboboxtext = gtk_combo_box_text_new (); for (i = 0; i < 200; i++) { text = g_strdup_printf ("Item %d", i); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), text); + gtk_combo_box_text_append_text (comboboxtext, text); g_free (text); } - gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 53); - gtk_container_add (GTK_CONTAINER (tmp), combobox); + gtk_combo_box_set_active (GTK_COMBO_BOX (comboboxtext), 53); + gtk_container_add (GTK_CONTAINER (tmp), GTK_WIDGET (comboboxtext)); gtk_widget_show (window); diff --git a/tests/testcombochange.c b/tests/testcombochange.c index ea52eb49434a8868c248af72deb33eab198873f6..3533f0e72074833ad973bee028a90f9efae5ec3c 100644 --- a/tests/testcombochange.c +++ b/tests/testcombochange.c @@ -70,12 +70,12 @@ combochange_log (const char *fmt, g_free (msg); } -static GtkWidget * +static GtkComboBox * create_combo (const char *name, gboolean is_list) { GtkCellRenderer *cell_renderer; - GtkWidget *combo; + GtkComboBox *combo; GtkCssProvider *provider; GtkStyleContext *context; gchar *css_data; @@ -86,9 +86,9 @@ create_combo (const char *name, gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell_renderer, "text", 0, NULL); - gtk_widget_set_name (combo, name); + gtk_widget_set_name (GTK_WIDGET (combo), name); - context = gtk_widget_get_style_context (combo); + context = gtk_widget_get_style_context (GTK_WIDGET (combo)); provider = gtk_css_provider_new (); css_data = g_strdup_printf ("#%s { -GtkComboBox-appears-as-list: %s }", @@ -228,9 +228,9 @@ main (int argc, char **argv) GtkWidget *button_vbox; GtkWidget *combo_vbox; GtkWidget *button; - GtkWidget *menu_combo; - GtkWidget *label; - GtkWidget *list_combo; + GtkComboBox *menu_combo; + GtkLabel *label; + GtkComboBox *list_combo; test_init (); @@ -253,20 +253,20 @@ main (int argc, char **argv) gtk_container_add (GTK_CONTAINER (hbox), combo_vbox); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), "Menu mode"); - gtk_container_add (GTK_CONTAINER (combo_vbox), label); + gtk_label_set_markup (label, "Menu mode"); + gtk_container_add (GTK_CONTAINER (combo_vbox), GTK_WIDGET (label)); menu_combo = create_combo ("menu-combo", FALSE); - gtk_widget_set_margin_start (menu_combo, 12); - gtk_container_add (GTK_CONTAINER (combo_vbox), menu_combo); + gtk_widget_set_margin_start (GTK_WIDGET (menu_combo), 12); + gtk_container_add (GTK_CONTAINER (combo_vbox), GTK_WIDGET (menu_combo)); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), "List mode"); - gtk_container_add (GTK_CONTAINER (combo_vbox), label); + gtk_label_set_markup (label, "List mode"); + gtk_container_add (GTK_CONTAINER (combo_vbox), GTK_WIDGET (label)); list_combo = create_combo ("list-combo", TRUE); - gtk_widget_set_margin_start (list_combo, 12); - gtk_container_add (GTK_CONTAINER (combo_vbox), list_combo); + gtk_widget_set_margin_start (GTK_WIDGET (list_combo), 12); + gtk_container_add (GTK_CONTAINER (combo_vbox), GTK_WIDGET (list_combo)); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_widget_set_hexpand (scrolled_window, TRUE); diff --git a/tests/testdialog.c b/tests/testdialog.c index 7ec34dc9cd74002591410b720a70208d6f353be6..ebd45f0359b11d4c89f6405fa161c1d1d0b5b554 100644 --- a/tests/testdialog.c +++ b/tests/testdialog.c @@ -24,7 +24,7 @@ static void show_message_dialog1a (GtkWindow *parent) { GtkWidget *dialog; - GtkWidget *image; + GtkImage *image; dialog = GTK_WIDGET (gtk_message_dialog_new (parent, GTK_DIALOG_MODAL| @@ -35,7 +35,7 @@ show_message_dialog1a (GtkWindow *parent) "The system network services are not compatible with this version.")); image = gtk_image_new_from_icon_name ("computer-fail"); - gtk_widget_show (image); + gtk_widget_show (GTK_WIDGET (image)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -67,12 +67,12 @@ show_message_dialog2 (GtkWindow *parent) static void show_color_chooser (GtkWindow *parent) { - GtkWidget *dialog; + GtkColorChooserDialog *dialog; dialog = gtk_color_chooser_dialog_new ("Builtin", parent); gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); } static void @@ -92,13 +92,13 @@ show_color_chooser_generic (GtkWindow *parent) static void add_content (GtkWidget *dialog) { - GtkWidget *label; + GtkLabel *label; label = gtk_label_new ("content"); g_object_set (label, "margin", 50, NULL); - gtk_widget_show (label); + gtk_widget_show (GTK_WIDGET (label)); - gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), GTK_WIDGET (label)); } static void @@ -316,6 +316,7 @@ main (int argc, char *argv[]) GtkWidget *vbox; GtkWidget *box; GtkWidget *button; + GtkCheckButton *check; #ifdef GTK_SRCDIR g_chdir (GTK_SRCDIR); @@ -405,13 +406,13 @@ main (int argc, char *argv[]) gtk_widget_show (button); gtk_container_add (GTK_CONTAINER (box), button); - button = gtk_check_button_new_with_label ("Dialogs have headers"); + check = gtk_check_button_new_with_label ("Dialogs have headers"); g_object_bind_property (gtk_settings_get_default (), "gtk-dialogs-use-header", - button, "active", + check, "active", G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE); - gtk_widget_show (button); - gtk_widget_set_halign (button, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (vbox), button); + gtk_widget_show (GTK_WIDGET (check)); + gtk_widget_set_halign (GTK_WIDGET (check), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (check)); button = gtk_spinner_new (); gtk_spinner_start (GTK_SPINNER (button)); diff --git a/tests/testdnd.c b/tests/testdnd.c index 54df81423e0ddd085fe3ecac0afe6ee5e07053e4..ee900aaed135f1463213b614a85c66289a9391aa 100644 --- a/tests/testdnd.c +++ b/tests/testdnd.c @@ -588,9 +588,8 @@ main (int argc, char **argv) { GtkWidget *window; GtkWidget *grid; - GtkWidget *label; - GtkWidget *pixmap; - GtkWidget *button; + GtkLabel *label; + GtkImage *pixmap; GdkPixbuf *drag_icon; GdkTexture *texture; GdkContentProvider *content; @@ -622,11 +621,11 @@ main (int argc, char **argv) targets = gdk_content_formats_new (target_table, n_targets - 1); /* no rootwin */ dest = gtk_drop_target_new (targets, GDK_ACTION_COPY | GDK_ACTION_MOVE); g_signal_connect (dest, "drag-drop", G_CALLBACK (label_drag_drop), NULL); - gtk_widget_add_controller (label, GTK_EVENT_CONTROLLER (dest)); + gtk_widget_add_controller (GTK_WIDGET (label), GTK_EVENT_CONTROLLER (dest)); - gtk_widget_set_hexpand (label, TRUE); - gtk_widget_set_vexpand (label, TRUE); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (label), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); label = gtk_label_new ("Popup\n"); @@ -634,11 +633,11 @@ main (int argc, char **argv) g_signal_connect (dest, "accept", G_CALLBACK (popsite_motion), NULL); g_signal_connect (dest, "drag-enter", G_CALLBACK (popsite_enter), NULL); g_signal_connect (dest, "drag-leave", G_CALLBACK (popsite_leave), NULL); - gtk_widget_add_controller (label, GTK_EVENT_CONTROLLER (dest)); + gtk_widget_add_controller (GTK_WIDGET (label), GTK_EVENT_CONTROLLER (dest)); - gtk_widget_set_hexpand (label, TRUE); - gtk_widget_set_vexpand (label, TRUE); - gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (label), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 1, 1, 1, 1); gdk_content_formats_unref (targets); @@ -648,17 +647,17 @@ main (int argc, char **argv) g_signal_connect (dest, "drag-leave", G_CALLBACK (target_drag_leave), pixmap); g_signal_connect (dest, "accept", G_CALLBACK (target_drag_motion), pixmap); g_signal_connect (dest, "drag-drop", G_CALLBACK (target_drag_drop), pixmap); - gtk_widget_add_controller (pixmap, GTK_EVENT_CONTROLLER (dest)); + gtk_widget_add_controller (GTK_WIDGET (pixmap), GTK_EVENT_CONTROLLER (dest)); gdk_content_formats_unref (targets); - gtk_widget_set_hexpand (pixmap, TRUE); - gtk_widget_set_vexpand (pixmap, TRUE); - gtk_grid_attach (GTK_GRID (grid), pixmap, 1, 0, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (pixmap), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (pixmap), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (pixmap), 1, 0, 1, 1); /* Drag site */ - button = gtk_label_new ("Drag Here\n"); + label = gtk_label_new ("Drag Here\n"); source = gtk_drag_source_new (); g_value_init (&value, G_TYPE_STRING); @@ -668,14 +667,14 @@ main (int argc, char **argv) gtk_drag_source_set_content (source, content); g_object_unref (content); gtk_drag_source_set_actions (source, GDK_ACTION_COPY|GDK_ACTION_MOVE); - gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (source)); + gtk_widget_add_controller (GTK_WIDGET (label), GTK_EVENT_CONTROLLER (source)); gtk_drag_source_set_icon (source, GDK_PAINTABLE (texture), 0, 0); g_object_unref (texture); - gtk_widget_set_hexpand (button, TRUE); - gtk_widget_set_vexpand (button, TRUE); - gtk_grid_attach (GTK_GRID (grid), button, 0, 1, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (label), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 1, 1, 1); gtk_widget_show (window); diff --git a/tests/testdnd2.c b/tests/testdnd2.c index ecf5a95551ad167d65e8e67e5dcbccef4016cb73..f1e9b60b922bc4e6ecd36e1f72b2b4c042251bb7 100644 --- a/tests/testdnd2.c +++ b/tests/testdnd2.c @@ -315,7 +315,7 @@ drag_cancel (GtkDragSource *source, GtkWidget * make_image (const gchar *icon_name, int hotspot) { - GtkWidget *image; + GtkImage *image; GtkDragSource *source; GtkDropTarget *dest; GdkContentFormats *formats; @@ -323,7 +323,7 @@ make_image (const gchar *icon_name, int hotspot) GdkContentProvider *content; image = gtk_image_new_from_icon_name (icon_name); - gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE); + gtk_image_set_icon_size (image, GTK_ICON_SIZE_LARGE); builder = gdk_content_formats_builder_new (); gdk_content_formats_builder_add_gtype (builder, GDK_TYPE_TEXTURE); @@ -340,16 +340,16 @@ make_image (const gchar *icon_name, int hotspot) g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), NULL); g_signal_connect (source, "drag-end", G_CALLBACK (drag_end), NULL); g_signal_connect (source, "drag-cancel", G_CALLBACK (drag_cancel), NULL); - gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source)); + gtk_widget_add_controller (GTK_WIDGET (image), GTK_EVENT_CONTROLLER (source)); dest = gtk_drop_target_new (formats, GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_ASK); g_signal_connect (dest, "accept", G_CALLBACK (image_drag_motion), image); g_signal_connect (dest, "drag-drop", G_CALLBACK (image_drag_drop), image); - gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest)); + gtk_widget_add_controller (GTK_WIDGET (image), GTK_EVENT_CONTROLLER (dest)); gdk_content_formats_unref (formats); - return image; + return GTK_WIDGET (image); } static void @@ -394,7 +394,7 @@ main (int argc, char *Argv[]) { GtkWidget *window; GtkWidget *grid; - GtkWidget *entry; + GtkEntry *entry; gtk_init (); @@ -413,7 +413,7 @@ main (int argc, char *Argv[]) gtk_grid_attach (GTK_GRID (grid), make_image ("process-stop", BOTTOM_RIGHT), 1, 0, 1, 1); entry = gtk_entry_new (); - gtk_grid_attach (GTK_GRID (grid), entry, 0, 1, 2, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (entry), 0, 1, 2, 1); gtk_grid_attach (GTK_GRID (grid), make_spinner (), 0, 2, 1, 1); gtk_grid_attach (GTK_GRID (grid), make_image ("weather-clear", CENTER), 1, 2, 1, 1); diff --git a/tests/testdnd3.c b/tests/testdnd3.c index f9315569fc5ecd6d2421dbf85c3da0bb5454d58c..a9174bded90f6c384cd6749030eeef861ada7d56 100644 --- a/tests/testdnd3.c +++ b/tests/testdnd3.c @@ -273,7 +273,7 @@ canvas_item_new (int i, double y, double angle) { - GtkWidget *widget; + GtkLabel *widget; char *label; char *id; TransformData *transform_data; @@ -288,10 +288,10 @@ canvas_item_new (int i, gdk_rgba_parse (&rgba, "yellow"); widget = gtk_label_new (label); - gtk_style_context_add_class (gtk_widget_get_style_context (widget), "frame"); - gtk_widget_set_name (widget, id); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (widget)), "frame"); + gtk_widget_set_name (GTK_WIDGET (widget), id); - set_color (widget, &rgba); + set_color (GTK_WIDGET (widget), &rgba); transform_data = g_new0 (TransformData, 1); transform_data->x = x; transform_data->y = y; @@ -305,19 +305,19 @@ canvas_item_new (int i, dest = gtk_drop_target_new (formats, GDK_ACTION_COPY); g_signal_connect (dest, "drag-drop", G_CALLBACK (item_drag_drop), NULL); g_signal_connect (dest, "accept", G_CALLBACK (item_drag_motion), NULL); - gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (dest)); + gtk_widget_add_controller (GTK_WIDGET (widget), GTK_EVENT_CONTROLLER (dest)); gdk_content_formats_unref (formats); gesture = gtk_gesture_rotate_new (); g_signal_connect (gesture, "angle-changed", G_CALLBACK (angle_changed), NULL); g_signal_connect (gesture, "end", G_CALLBACK (rotate_done), NULL); - gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (gesture)); + gtk_widget_add_controller (GTK_WIDGET (widget), GTK_EVENT_CONTROLLER (gesture)); gesture = gtk_gesture_click_new (); g_signal_connect (gesture, "released", G_CALLBACK (click_done), NULL); - gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (gesture)); + gtk_widget_add_controller (GTK_WIDGET (widget), GTK_EVENT_CONTROLLER (gesture)); - return widget; + return GTK_WIDGET (widget); } int main (int argc, char *argv[]) @@ -325,7 +325,7 @@ int main (int argc, char *argv[]) GtkWidget *window; GtkWidget *sw; GtkWidget *canvas; - GtkWidget *widget; + GtkColorButton *button; GtkWidget *box, *box2, *box3; const char *colors[] = { "red", "green", "blue", "magenta", "orange", "gray", "black", "yellow", @@ -338,8 +338,8 @@ int main (int argc, char *argv[]) gtk_init (); - widget = gtk_color_button_new (); - gtk_widget_destroy (widget); + button = gtk_color_button_new (); + gtk_widget_destroy (GTK_WIDGET (button)); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size (GTK_WINDOW (window), 640, 480); diff --git a/tests/testellipsise.c b/tests/testellipsise.c index 7abb58f22932cec02887249f94b25f5bae2358a1..58b8a5c7d00421e7fe747f7b309c2641ebe130d4 100644 --- a/tests/testellipsise.c +++ b/tests/testellipsise.c @@ -25,13 +25,13 @@ #include static void -combo_changed_cb (GtkWidget *combo, - gpointer data) +combo_changed_cb (GtkComboBox *combo, + gpointer data) { GtkWidget *label = GTK_WIDGET (data); gint active; - active = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); + active = gtk_combo_box_get_active (combo); gtk_label_set_ellipsize (GTK_LABEL (label), (PangoEllipsizeMode)active); } @@ -97,8 +97,10 @@ overlay_draw (GtkDrawingArea *da, int main (int argc, char *argv[]) { - GtkWidget *window, *vbox, *label; - GtkWidget *combo, *scale, *overlay, *da; + GtkWidget *window, *vbox; + GtkComboBoxText *combo; + GtkWidget *scale, *overlay, *da; + GtkLabel *label; gtk_init (); @@ -114,14 +116,14 @@ main (int argc, char *argv[]) 0, 360, 1); label = gtk_label_new ("This label may be ellipsized\nto make it fit."); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "NONE"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "START"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "MIDDLE"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "END"); + gtk_combo_box_text_append_text (combo, "NONE"); + gtk_combo_box_text_append_text (combo, "START"); + gtk_combo_box_text_append_text (combo, "MIDDLE"); + gtk_combo_box_text_append_text (combo, "END"); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - gtk_widget_set_halign (label, GTK_ALIGN_CENTER); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); da = gtk_drawing_area_new (); gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), overlay_draw, label, NULL); @@ -129,9 +131,9 @@ main (int argc, char *argv[]) overlay = gtk_overlay_new (); gtk_container_add (GTK_CONTAINER (overlay), da); gtk_widget_set_vexpand (overlay, TRUE); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (label)); - gtk_container_add (GTK_CONTAINER (vbox), combo); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (combo)); gtk_container_add (GTK_CONTAINER (vbox), scale); gtk_container_add (GTK_CONTAINER (vbox), overlay); diff --git a/tests/testemblems.c b/tests/testemblems.c index cd28b3995286de3297c98ada3400307c072a99ec..169032547def81c57337cbf8f5d4c0bd6a4748f7 100644 --- a/tests/testemblems.c +++ b/tests/testemblems.c @@ -3,7 +3,7 @@ int main (int argc, char **argv) { GtkWidget *window; - GtkWidget *button; + GtkImage *button; GtkWidget *grid; GIcon *icon; GIcon *icon2; @@ -19,19 +19,19 @@ int main (int argc, char **argv) icon = g_themed_icon_new ("folder"); button = gtk_image_new_from_gicon (icon); - gtk_grid_attach (GTK_GRID (grid), button, 1, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (button), 1, 1, 1, 1); icon2 = g_themed_icon_new ("folder-symbolic"); button = gtk_image_new_from_gicon (icon2); - gtk_grid_attach (GTK_GRID (grid), button, 2, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (button), 2, 1, 1, 1); icon = g_emblemed_icon_new (icon, g_emblem_new (g_themed_icon_new ("emblem-new"))); button = gtk_image_new_from_gicon (icon); - gtk_grid_attach (GTK_GRID (grid), button, 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (button), 1, 2, 1, 1); icon2 = g_emblemed_icon_new (icon2, g_emblem_new (g_themed_icon_new ("emblem-new"))); button = gtk_image_new_from_gicon (icon2); - gtk_grid_attach (GTK_GRID (grid), button, 2, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (button), 2, 2, 1, 1); gtk_widget_show (window); diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c index 3967c0bba6a4b47c58542524c21229f3a6964030..6d25d85ceaa6b86220712a7ff0d6a18086abf32a 100644 --- a/tests/testentrycompletion.c +++ b/tests/testentrycompletion.c @@ -290,8 +290,8 @@ int main (int argc, char *argv[]) { GtkWidget *vbox; - GtkWidget *label; - GtkWidget *entry; + GtkLabel *label; + GtkEntry *entry; GtkEntryCompletion *completion; GtkTreeModel *completion_model; GtkCellRenderer *cell; @@ -306,8 +306,8 @@ main (int argc, char *argv[]) label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing total or gnome for example."); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_label_set_markup (label, "Completion demo, try writing total or gnome for example."); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); /* Create our first entry */ entry = gtk_entry_new (); @@ -317,10 +317,10 @@ main (int argc, char *argv[]) gtk_entry_completion_set_inline_completion (completion, TRUE); /* Assign the completion to the entry */ - gtk_entry_set_completion (GTK_ENTRY (entry), completion); + gtk_entry_set_completion (entry, completion); g_object_unref (completion); - gtk_container_add (GTK_CONTAINER (vbox), entry); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (entry)); /* Create a tree model and use it as the completion model */ completion_model = create_simple_completion_model (); @@ -337,10 +337,10 @@ main (int argc, char *argv[]) completion = gtk_entry_completion_new (); /* Assign the completion to the entry */ - gtk_entry_set_completion (GTK_ENTRY (entry), completion); + gtk_entry_set_completion (entry, completion); g_object_unref (completion); - gtk_container_add (GTK_CONTAINER (vbox), entry); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (entry)); /* Create a tree model and use it as the completion model */ completion_model = create_completion_model (); @@ -374,10 +374,10 @@ main (int argc, char *argv[]) completion = gtk_entry_completion_new (); /* Assign the completion to the entry */ - gtk_entry_set_completion (GTK_ENTRY (entry), completion); + gtk_entry_set_completion (entry, completion); g_object_unref (completion); - gtk_container_add (GTK_CONTAINER (vbox), entry); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (entry)); /* Create a tree model and use it as the completion model */ completion_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING)); @@ -392,7 +392,7 @@ main (int argc, char *argv[]) g_timeout_add (1000, (GSourceFunc) animation_timer, completion); /* Fourth entry */ - gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Model-less entry completion")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_label_new ("Model-less entry completion"))); entry = gtk_entry_new (); @@ -400,10 +400,10 @@ main (int argc, char *argv[]) completion = gtk_entry_completion_new (); /* Assign the completion to the entry */ - gtk_entry_set_completion (GTK_ENTRY (entry), completion); + gtk_entry_set_completion (entry, completion); g_object_unref (completion); - gtk_container_add (GTK_CONTAINER (vbox), entry); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (entry)); gtk_widget_show (window); diff --git a/tests/testentryicons.c b/tests/testentryicons.c index e117579d2e6fc4c9a410a07dcbdcf2c2083fecae..ea6a0b6ed56ff343430e4007f32cbfcf891c8160 100644 --- a/tests/testentryicons.c +++ b/tests/testentryicons.c @@ -79,10 +79,11 @@ main (int argc, char **argv) { GtkWidget *window; GtkWidget *grid; - GtkWidget *label; - GtkWidget *entry; + GtkLabel *label; + GtkEntry *entry; + GtkWidget *password_entry; GtkWidget *box; - GtkWidget *image; + GtkImage *image; GtkWidget *button1; GtkWidget *button2; GtkWidget *button3; @@ -109,26 +110,26 @@ main (int argc, char **argv) * Open File - Sets the icon using a GIcon */ label = gtk_label_new ("Open File:"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); entry = gtk_entry_new (); - gtk_widget_set_hexpand (entry, TRUE); - gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (entry), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (entry), 1, 0, 1, 1); icon = g_themed_icon_new ("folder-symbolic"); g_themed_icon_append_name (G_THEMED_ICON (icon), "folder-symbolic"); - gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), + gtk_entry_set_icon_from_gicon (entry, GTK_ENTRY_ICON_PRIMARY, icon); g_object_unref (icon); - gtk_entry_set_icon_sensitive (GTK_ENTRY (entry), + gtk_entry_set_icon_sensitive (entry, GTK_ENTRY_ICON_PRIMARY, FALSE); - gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), + gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY, "Open a file"); @@ -136,20 +137,20 @@ main (int argc, char **argv) * Save File - sets the icon using an icon name. */ label = gtk_label_new ("Save File:"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 1, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); entry = gtk_entry_new (); - gtk_widget_set_hexpand (entry, TRUE); - gtk_grid_attach (GTK_GRID (grid), entry, 1, 1, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (entry), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (entry), 1, 1, 1, 1); gtk_editable_set_text (GTK_EDITABLE (entry), "‏Right-to-left"); - gtk_widget_set_direction (entry, GTK_TEXT_DIR_RTL); + gtk_widget_set_direction (GTK_WIDGET (entry), GTK_TEXT_DIR_RTL); - gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), + gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_PRIMARY, "document-save-symbolic"); - gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), + gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY, "Save a file"); @@ -157,7 +158,7 @@ main (int argc, char **argv) g_value_set_string (&value, "Amazing"); content = gdk_content_provider_new_for_value (&value); g_value_unset (&value); - gtk_entry_set_icon_drag_source (GTK_ENTRY (entry), + gtk_entry_set_icon_drag_source (entry, GTK_ENTRY_ICON_PRIMARY, content, GDK_ACTION_COPY); g_object_unref (content); @@ -166,30 +167,30 @@ main (int argc, char **argv) * Search - Uses a helper function */ label = gtk_label_new ("Search:"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 2, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); entry = gtk_entry_new (); - gtk_widget_set_hexpand (entry, TRUE); - gtk_grid_attach (GTK_GRID (grid), entry, 1, 2, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (entry), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (entry), 1, 2, 1, 1); - gtk_entry_set_placeholder_text (GTK_ENTRY (entry), + gtk_entry_set_placeholder_text (entry, "Type some text, then click an icon"); - gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), + gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_PRIMARY, "edit-find-symbolic"); - gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), + gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY, "Clicking the other icon is more interesting!"); - gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), + gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, "edit-clear-symbolic"); - gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), + gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY, "Clear"); @@ -199,29 +200,29 @@ main (int argc, char **argv) * Password - Sets the icon using an icon name */ label = gtk_label_new ("Password:"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 3, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); - entry = gtk_password_entry_new (); - gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (entry), TRUE); - gtk_widget_set_hexpand (entry, TRUE); - gtk_grid_attach (GTK_GRID (grid), entry, 1, 3, 1, 1); + password_entry = gtk_password_entry_new (); + gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (password_entry), TRUE); + gtk_widget_set_hexpand (password_entry, TRUE); + gtk_grid_attach (GTK_GRID (grid), password_entry, 1, 3, 1, 1); /* Name - Does not set any icons. */ label = gtk_label_new ("Name:"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 4, 1, 1); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 4, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); entry = gtk_entry_new (); - gtk_widget_set_hexpand (entry, TRUE); - gtk_entry_set_placeholder_text (GTK_ENTRY (entry), + gtk_widget_set_hexpand (GTK_WIDGET (entry), TRUE); + gtk_entry_set_placeholder_text (entry, "Use the RadioButtons to choose an icon"); - gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), + gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY, "Use the RadioButtons to change this icon"); - gtk_grid_attach (GTK_GRID (grid), entry, 1, 4, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (entry), 1, 4, 1, 1); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_set_vexpand (GTK_WIDGET (box), TRUE); @@ -248,35 +249,35 @@ main (int argc, char **argv) gtk_container_add (GTK_CONTAINER (box), button4); label = gtk_label_new ("Emoji:"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 6, 1, 1); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 6, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); entry = gtk_entry_new (); g_object_set (entry, "show-emoji-icon", TRUE, NULL); - gtk_widget_set_hexpand (entry, TRUE); - gtk_grid_attach (GTK_GRID (grid), entry, 1, 6, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (entry), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (entry), 1, 6, 1, 1); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_style_context_add_class (gtk_widget_get_style_context (box), "view"); gtk_style_context_add_class (gtk_widget_get_style_context (box), "entry-frame"); gtk_widget_set_cursor_from_name (box, "text"); entry = gtk_entry_new (); - gtk_widget_set_hexpand (entry, TRUE); - gtk_container_add (GTK_CONTAINER (box), entry); + gtk_widget_set_hexpand (GTK_WIDGET (entry), TRUE); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (entry)); image = gtk_image_new_from_icon_name ("edit-find-symbolic"); - gtk_widget_set_cursor_from_name (image, "default"); + gtk_widget_set_cursor_from_name (GTK_WIDGET (image), "default"); g_object_set (image, "margin", 6, NULL); - gtk_widget_set_tooltip_text (image, "Click me"); + gtk_widget_set_tooltip_text (GTK_WIDGET (image), "Click me"); GtkGesture *gesture; gesture = gtk_gesture_click_new (); g_signal_connect (gesture, "pressed", G_CALLBACK (icon_pressed_cb), NULL); - gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture)); - gtk_container_add (GTK_CONTAINER (box), image); + gtk_widget_add_controller (GTK_WIDGET (image), GTK_EVENT_CONTROLLER (gesture)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (image)); image = gtk_image_new_from_icon_name ("document-save-symbolic"); g_object_set (image, "margin", 6, NULL); - gtk_container_add (GTK_CONTAINER (box), image); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (image)); gtk_grid_attach (GTK_GRID (grid), box, 1, 7, 1, 1); GtkCssProvider *provider; diff --git a/tests/testexpand.c b/tests/testexpand.c index 348e66dd85f3d3f5e80dd50c701f152d7ef73c7f..190f632483303083540c1ac095094195dcf8ff97 100644 --- a/tests/testexpand.c +++ b/tests/testexpand.c @@ -43,7 +43,7 @@ create_box_window (void) { GtkWidget *window; GtkWidget *box1, *box2, *box3; - GtkWidget *toggle; + GtkToggleButton *toggle; GtkWidget *colorbox; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -54,46 +54,46 @@ create_box_window (void) box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (box1), - gtk_label_new ("VBox 1 Top")); + GTK_WIDGET (gtk_label_new ("VBox 1 Top"))); gtk_container_add (GTK_CONTAINER (box1), box2); gtk_container_add (GTK_CONTAINER(box1), - gtk_label_new ("VBox 1 Bottom")); + GTK_WIDGET (gtk_label_new ("VBox 1 Bottom"))); gtk_container_add (GTK_CONTAINER (box2), - gtk_label_new ("HBox 2 Left")); + GTK_WIDGET (gtk_label_new ("HBox 2 Left"))); gtk_container_add (GTK_CONTAINER (box2), box3); gtk_container_add (GTK_CONTAINER(box2), - gtk_label_new ("HBox 2 Right")); + GTK_WIDGET (gtk_label_new ("HBox 2 Right"))); gtk_container_add (GTK_CONTAINER (box3), - gtk_label_new ("VBox 3 Top")); + GTK_WIDGET (gtk_label_new ("VBox 3 Top"))); colorbox = gtk_frame_new (NULL); toggle = gtk_toggle_button_new_with_label ("H Expand"); - gtk_widget_set_halign (toggle, GTK_ALIGN_CENTER); - gtk_widget_set_valign (toggle, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (toggle), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (toggle), GTK_ALIGN_CENTER); g_object_set (toggle, "margin", 5, NULL); g_signal_connect (G_OBJECT (toggle), "toggled", G_CALLBACK (on_toggle_hexpand), NULL); - gtk_container_add (GTK_CONTAINER (colorbox), toggle); + gtk_container_add (GTK_CONTAINER (colorbox), GTK_WIDGET (toggle)); gtk_container_add (GTK_CONTAINER (box3), colorbox); colorbox = gtk_frame_new (NULL); toggle = gtk_toggle_button_new_with_label ("V Expand"); - gtk_widget_set_halign (toggle, GTK_ALIGN_CENTER); - gtk_widget_set_valign (toggle, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (toggle), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (toggle), GTK_ALIGN_CENTER); g_object_set (toggle, "margin", 5, NULL); g_signal_connect (G_OBJECT (toggle), "toggled", G_CALLBACK (on_toggle_vexpand), NULL); - gtk_container_add (GTK_CONTAINER (colorbox), toggle); + gtk_container_add (GTK_CONTAINER (colorbox), GTK_WIDGET (toggle)); gtk_container_add (GTK_CONTAINER (box3), colorbox); gtk_container_add (GTK_CONTAINER (box3), - gtk_label_new ("VBox 3 Bottom")); + GTK_WIDGET (gtk_label_new ("VBox 3 Bottom"))); gtk_container_add (GTK_CONTAINER (window), box1); gtk_widget_show (window); @@ -104,7 +104,7 @@ create_grid_window (void) { GtkWidget *window; GtkWidget *grid; - GtkWidget *toggle; + GtkToggleButton *toggle; GtkWidget *colorbox; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -112,32 +112,32 @@ create_grid_window (void) grid = gtk_grid_new (); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Top"), 1, 0, 1, 1); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Bottom"), 1, 3, 1, 1); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Left"), 0, 1, 1, 2); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Right"), 2, 1, 1, 2); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Top")), 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Bottom")), 1, 3, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Left")), 0, 1, 1, 2); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Right")), 2, 1, 1, 2); colorbox = gtk_frame_new (NULL); toggle = gtk_toggle_button_new_with_label ("H Expand"); - gtk_widget_set_halign (toggle, GTK_ALIGN_CENTER); - gtk_widget_set_valign (toggle, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (toggle), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (toggle), GTK_ALIGN_CENTER); g_object_set (toggle, "margin", 5, NULL); g_signal_connect (G_OBJECT (toggle), "toggled", G_CALLBACK (on_toggle_hexpand), NULL); - gtk_container_add (GTK_CONTAINER (colorbox), toggle); + gtk_container_add (GTK_CONTAINER (colorbox), GTK_WIDGET (toggle)); gtk_grid_attach (GTK_GRID (grid), colorbox, 1, 1, 1, 1); colorbox = gtk_frame_new (NULL); toggle = gtk_toggle_button_new_with_label ("V Expand"); - gtk_widget_set_halign (toggle, GTK_ALIGN_CENTER); - gtk_widget_set_valign (toggle, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (toggle), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (toggle), GTK_ALIGN_CENTER); g_object_set (toggle, "margin", 5, NULL); g_signal_connect (G_OBJECT (toggle), "toggled", G_CALLBACK (on_toggle_vexpand), NULL); - gtk_container_add (GTK_CONTAINER (colorbox), toggle); + gtk_container_add (GTK_CONTAINER (colorbox), GTK_WIDGET (toggle)); gtk_grid_attach (GTK_GRID (grid), colorbox, 1, 2, 1, 1); diff --git a/tests/testexpander.c b/tests/testexpander.c index 114ef8bc94944f3498460c9afcf4f65844a6cd9f..a3fbdf78a69edf710b250bee9ef5b17bf1b7632d 100644 --- a/tests/testexpander.c +++ b/tests/testexpander.c @@ -22,7 +22,7 @@ main (int argc, char *argv[]) { GtkWidget *dialog; GtkWidget *area; - GtkWidget *expander; + GtkExpander *expander; GtkWidget *sw; GtkWidget *tv; GtkTextBuffer *buffer; @@ -65,9 +65,9 @@ main (int argc, char *argv[]) "resize the window. Do it already !", -1); gtk_container_add (GTK_CONTAINER (sw), tv); gtk_container_add (GTK_CONTAINER (expander), sw); - gtk_widget_set_hexpand (expander, TRUE); - gtk_widget_set_vexpand (expander, TRUE); - gtk_container_add (GTK_CONTAINER (area), expander); + gtk_widget_set_hexpand (GTK_WIDGET (expander), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (expander), TRUE); + gtk_container_add (GTK_CONTAINER (area), GTK_WIDGET (expander)); g_signal_connect (expander, "notify::expanded", G_CALLBACK (expander_cb), dialog); diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c index 1df31b9a04f276958d4cfe2381a5b1c09006a9ba..4e56affd493a513858a6251462cf7ee39b9a083b 100644 --- a/tests/testfilechooserbutton.c +++ b/tests/testfilechooserbutton.c @@ -213,29 +213,31 @@ add_new_filechooser_button (const gchar *mnemonic, GtkWidget *group_box, GtkSizeGroup *label_group) { - GtkWidget *hbox, *label, *chooser, *button; + GtkWidget *hbox, *button; + GtkFileChooserButton *chooser; + GtkLabel *label; hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_container_add (GTK_CONTAINER (group_box), hbox); label = gtk_label_new_with_mnemonic (mnemonic); - gtk_size_group_add_widget (GTK_SIZE_GROUP (label_group), label); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_size_group_add_widget (GTK_SIZE_GROUP (label_group), GTK_WIDGET (label)); + gtk_label_set_xalign (label, 0.0); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); chooser = gtk_file_chooser_button_new (g_strconcat(chooser_title, " - testfilechooserbutton", NULL), action); - gtk_widget_set_hexpand (chooser, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (chooser), TRUE); gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL); gtk_file_chooser_remove_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser); + gtk_label_set_mnemonic_widget (label, GTK_WIDGET (chooser)); g_signal_connect (chooser, "current-folder-changed", G_CALLBACK (chooser_current_folder_changed_cb), NULL); g_signal_connect (chooser, "selection-changed", G_CALLBACK (chooser_selection_changed_cb), NULL); g_signal_connect (chooser, "file-activated", G_CALLBACK (chooser_file_activated_cb), NULL); g_signal_connect (chooser, "update-preview", G_CALLBACK (chooser_update_preview_cb), NULL); - gtk_container_add (GTK_CONTAINER (hbox), chooser); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (chooser)); button = gtk_button_new_with_label ("Tests"); g_signal_connect (button, "clicked", G_CALLBACK (tests_button_clicked_cb), chooser); diff --git a/tests/testflowbox.c b/tests/testflowbox.c index f1e8415aeb7a16813c961f8b9bc7a261fe3328f9..c20161754988a875320d48bb71539fc727a43d03 100644 --- a/tests/testflowbox.c +++ b/tests/testflowbox.c @@ -39,19 +39,20 @@ static gint items_type = SIMPLE_ITEMS; static void populate_flowbox_simple (GtkFlowBox *flowbox) { - GtkWidget *widget, *frame; + GtkLabel *label; + GtkWidget *frame; gint i; for (i = 0; i < N_ITEMS; i++) { gchar *text = g_strdup_printf ("Item %02d", i); - widget = gtk_label_new (text); + label = gtk_label_new (text); frame = gtk_frame_new (NULL); - gtk_widget_show (widget); + gtk_widget_show (GTK_WIDGET (label)); gtk_widget_show (frame); - gtk_container_add (GTK_CONTAINER (frame), widget); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); g_object_set_data_full (G_OBJECT (frame), "id", (gpointer)g_strdup (text), g_free); gtk_container_add (GTK_CONTAINER (flowbox), frame); @@ -64,6 +65,7 @@ static void populate_flowbox_focus (GtkFlowBox *flowbox) { GtkWidget *widget, *frame, *box; + GtkLabel *label; gint i; gboolean sensitive; @@ -76,22 +78,22 @@ populate_flowbox_focus (GtkFlowBox *flowbox) box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (frame), box); - widget = gtk_label_new ("Label"); - gtk_container_add (GTK_CONTAINER (box), widget); + label = gtk_label_new ("Label"); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); switch (i % 4) { case 0: - widget = gtk_entry_new (); + widget = GTK_WIDGET (gtk_entry_new ()); break; case 1: widget = gtk_button_new_with_label ("Button"); break; case 2: - widget = gtk_label_new ("bla"); + widget = GTK_WIDGET (gtk_label_new ("bla")); break; case 3: - widget = gtk_label_new ("bla"); + widget = GTK_WIDGET (gtk_label_new ("bla")); sensitive = FALSE; break; } @@ -99,7 +101,7 @@ populate_flowbox_focus (GtkFlowBox *flowbox) gtk_container_add (GTK_CONTAINER (box), widget); if (i % 5 == 0) - gtk_container_add (GTK_CONTAINER (box), gtk_switch_new ()); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_switch_new ())); gtk_container_add (GTK_CONTAINER (flowbox), frame); if (!sensitive) @@ -126,7 +128,8 @@ populate_flowbox_buttons (GtkFlowBox *flowbox) static void populate_flowbox_wrappy (GtkFlowBox *flowbox) { - GtkWidget *widget, *frame; + GtkLabel *label; + GtkWidget *frame; gint i; const gchar *strings[] = { @@ -140,16 +143,16 @@ populate_flowbox_wrappy (GtkFlowBox *flowbox) for (i = 0; i < G_N_ELEMENTS (strings); i++) { - widget = gtk_label_new (strings[i]); + label = gtk_label_new (strings[i]); frame = gtk_frame_new (NULL); - gtk_widget_show (widget); + gtk_widget_show (GTK_WIDGET (label)); gtk_widget_show (frame); - gtk_container_add (GTK_CONTAINER (frame), widget); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); - gtk_label_set_wrap (GTK_LABEL (widget), TRUE); - gtk_label_set_wrap_mode (GTK_LABEL (widget), PANGO_WRAP_WORD); - gtk_label_set_width_chars (GTK_LABEL (widget), 10); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_wrap_mode (label, PANGO_WRAP_WORD); + gtk_label_set_width_chars (label, 10); g_object_set_data_full (G_OBJECT (frame), "id", (gpointer)g_strdup (strings[i]), g_free); gtk_container_add (GTK_CONTAINER (flowbox), frame); @@ -159,7 +162,9 @@ populate_flowbox_wrappy (GtkFlowBox *flowbox) static void populate_flowbox_images (GtkFlowBox *flowbox) { - GtkWidget *widget, *image, *label; + GtkWidget *widget; + GtkImage *image; + GtkLabel *label; gint i; for (i = 0; i < N_ITEMS; i++) @@ -170,14 +175,14 @@ populate_flowbox_images (GtkFlowBox *flowbox) gtk_widget_set_hexpand (widget, TRUE); image = gtk_image_new_from_icon_name ("face-wink"); - gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE); - gtk_widget_set_hexpand (image, TRUE); - gtk_image_set_pixel_size (GTK_IMAGE (image), 256); + gtk_image_set_icon_size (image, GTK_ICON_SIZE_LARGE); + gtk_widget_set_hexpand (GTK_WIDGET (image), TRUE); + gtk_image_set_pixel_size (image, 256); label = gtk_label_new (text); - gtk_container_add (GTK_CONTAINER (widget), image); - gtk_container_add (GTK_CONTAINER (widget), label); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (image)); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (label)); g_object_set_data_full (G_OBJECT (widget), "id", (gpointer)g_strdup (text), g_free); gtk_container_add (GTK_CONTAINER (flowbox), widget); @@ -377,7 +382,11 @@ static GtkWidget * create_window (void) { GtkWidget *window, *hbox, *vbox, *flowbox_cntl, *items_cntl; - GtkWidget *flowbox, *widget, *expander, *swindow; + GtkWidget *flowbox, *widget, *swindow; + GtkCheckButton *check; + GtkComboBoxText *combo; + GtkExpander *expander; + GtkLabel *label; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); @@ -418,86 +427,86 @@ create_window (void) /* Add Flowbox test control frame */ expander = gtk_expander_new ("Flow Box controls"); - gtk_expander_set_expanded (GTK_EXPANDER (expander), TRUE); + gtk_expander_set_expanded (expander, TRUE); flowbox_cntl = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); gtk_widget_show (flowbox_cntl); - gtk_widget_show (expander); + gtk_widget_show (GTK_WIDGET (expander)); gtk_container_add (GTK_CONTAINER (expander), flowbox_cntl); - gtk_container_add (GTK_CONTAINER (vbox), expander); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (expander)); - widget = gtk_check_button_new_with_label ("Homogeneous"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - gtk_widget_show (widget); + check = gtk_check_button_new_with_label ("Homogeneous"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE); + gtk_widget_show (GTK_WIDGET (check)); - gtk_widget_set_tooltip_text (widget, "Set whether the items should be displayed at the same size"); - gtk_container_add (GTK_CONTAINER (flowbox_cntl), widget); + gtk_widget_set_tooltip_text (GTK_WIDGET (check), "Set whether the items should be displayed at the same size"); + gtk_container_add (GTK_CONTAINER (flowbox_cntl), GTK_WIDGET (check)); - g_signal_connect (G_OBJECT (widget), "toggled", + g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (homogeneous_toggled), flowbox); - widget = gtk_check_button_new_with_label ("Activate on single click"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - g_object_bind_property (widget, "active", + check = gtk_check_button_new_with_label ("Activate on single click"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE); + g_object_bind_property (check, "active", flowbox, "activate-on-single-click", G_BINDING_SYNC_CREATE); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (flowbox_cntl), widget); + gtk_widget_show (GTK_WIDGET (check)); + gtk_container_add (GTK_CONTAINER (flowbox_cntl), GTK_WIDGET (check)); /* Add alignment controls */ - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Fill"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Start"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "End"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Center"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), INITIAL_HALIGN); - gtk_widget_show (widget); - - gtk_widget_set_tooltip_text (widget, "Set the horizontal alignment policy"); - gtk_container_add (GTK_CONTAINER (flowbox_cntl), widget); - - g_signal_connect (G_OBJECT (widget), "changed", + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (combo, "Fill"); + gtk_combo_box_text_append_text (combo, "Start"); + gtk_combo_box_text_append_text (combo, "End"); + gtk_combo_box_text_append_text (combo, "Center"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), INITIAL_HALIGN); + gtk_widget_show (GTK_WIDGET (combo)); + + gtk_widget_set_tooltip_text (GTK_WIDGET (combo), "Set the horizontal alignment policy"); + gtk_container_add (GTK_CONTAINER (flowbox_cntl), GTK_WIDGET (combo)); + + g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (horizontal_alignment_changed), flowbox); - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Fill"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Start"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "End"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Center"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), INITIAL_VALIGN); - gtk_widget_show (widget); + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (combo, "Fill"); + gtk_combo_box_text_append_text (combo, "Start"); + gtk_combo_box_text_append_text (combo, "End"); + gtk_combo_box_text_append_text (combo, "Center"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), INITIAL_VALIGN); + gtk_widget_show (GTK_WIDGET (combo)); - gtk_widget_set_tooltip_text (widget, "Set the vertical alignment policy"); - gtk_container_add (GTK_CONTAINER (flowbox_cntl), widget); + gtk_widget_set_tooltip_text (GTK_WIDGET (combo), "Set the vertical alignment policy"); + gtk_container_add (GTK_CONTAINER (flowbox_cntl), GTK_WIDGET (combo)); - g_signal_connect (G_OBJECT (widget), "changed", + g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (vertical_alignment_changed), flowbox); /* Add Orientation control */ - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_show (widget); + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (combo, "Horizontal"); + gtk_combo_box_text_append_text (combo, "Vertical"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + gtk_widget_show (GTK_WIDGET (combo)); - gtk_widget_set_tooltip_text (widget, "Set the flowbox orientation"); - gtk_container_add (GTK_CONTAINER (flowbox_cntl), widget); + gtk_widget_set_tooltip_text (GTK_WIDGET (combo), "Set the flowbox orientation"); + gtk_container_add (GTK_CONTAINER (flowbox_cntl), GTK_WIDGET (combo)); - g_signal_connect (G_OBJECT (widget), "changed", + g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (orientation_changed), flowbox); /* Add selection mode control */ - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "None"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Single"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Browse"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Multiple"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 1); - gtk_widget_show (widget); - - gtk_widget_set_tooltip_text (widget, "Set the selection mode"); - gtk_container_add (GTK_CONTAINER (flowbox_cntl), widget); - - g_signal_connect (G_OBJECT (widget), "changed", + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (combo, "None"); + gtk_combo_box_text_append_text (combo, "Single"); + gtk_combo_box_text_append_text (combo, "Browse"); + gtk_combo_box_text_append_text (combo, "Multiple"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 1); + gtk_widget_show (GTK_WIDGET (combo)); + + gtk_widget_set_tooltip_text (GTK_WIDGET (combo), "Set the selection mode"); + gtk_container_add (GTK_CONTAINER (flowbox_cntl), GTK_WIDGET (combo)); + + g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (selection_mode_changed), flowbox); /* Add minimum line length in items control */ @@ -530,8 +539,8 @@ create_window (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_widget_show (hbox); - widget = gtk_label_new ("H Spacing"); - gtk_container_add (GTK_CONTAINER (hbox), widget); + label = gtk_label_new ("H Spacing"); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); widget = gtk_spin_button_new_with_range (0, 30, 1); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), INITIAL_CSPACING); @@ -550,8 +559,8 @@ create_window (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_widget_show (hbox); - widget = gtk_label_new ("V Spacing"); - gtk_container_add (GTK_CONTAINER (hbox), widget); + label = gtk_label_new ("V Spacing"); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); widget = gtk_spin_button_new_with_range (0, 30, 1); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), INITIAL_RSPACING); @@ -569,50 +578,50 @@ create_window (void) /* filtering and sorting */ - widget = gtk_check_button_new_with_label ("Filter"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - gtk_widget_show (widget); + check = gtk_check_button_new_with_label ("Filter"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE); + gtk_widget_show (GTK_WIDGET (check)); - gtk_widget_set_tooltip_text (widget, "Set whether some items should be filtered out"); - gtk_container_add (GTK_CONTAINER (flowbox_cntl), widget); + gtk_widget_set_tooltip_text (GTK_WIDGET (check), "Set whether some items should be filtered out"); + gtk_container_add (GTK_CONTAINER (flowbox_cntl), GTK_WIDGET (check)); - g_signal_connect (G_OBJECT (widget), "toggled", + g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (filter_toggled), flowbox); - widget = gtk_check_button_new_with_label ("Sort"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - gtk_widget_show (widget); + check = gtk_check_button_new_with_label ("Sort"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE); + gtk_widget_show (GTK_WIDGET (check)); - gtk_widget_set_tooltip_text (widget, "Set whether items should be sorted"); - gtk_container_add (GTK_CONTAINER (flowbox_cntl), widget); + gtk_widget_set_tooltip_text (GTK_WIDGET (check), "Set whether items should be sorted"); + gtk_container_add (GTK_CONTAINER (flowbox_cntl), GTK_WIDGET (check)); - g_signal_connect (G_OBJECT (widget), "toggled", + g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (sort_toggled), flowbox); /* Add test items control frame */ expander = gtk_expander_new ("Test item controls"); - gtk_expander_set_expanded (GTK_EXPANDER (expander), TRUE); + gtk_expander_set_expanded (expander, TRUE); items_cntl = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); gtk_widget_show (items_cntl); - gtk_widget_show (expander); + gtk_widget_show (GTK_WIDGET (expander)); gtk_container_add (GTK_CONTAINER (expander), items_cntl); - gtk_container_add (GTK_CONTAINER (vbox), expander); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (expander)); /* Add Items control */ - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Simple"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Focus"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Wrappy"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Images"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Buttons"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_show (widget); - - gtk_widget_set_tooltip_text (widget, "Set the item set to use"); - gtk_container_add (GTK_CONTAINER (items_cntl), widget); - - g_signal_connect (G_OBJECT (widget), "changed", + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (combo, "Simple"); + gtk_combo_box_text_append_text (combo, "Focus"); + gtk_combo_box_text_append_text (combo, "Wrappy"); + gtk_combo_box_text_append_text (combo, "Images"); + gtk_combo_box_text_append_text (combo, "Buttons"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + gtk_widget_show (GTK_WIDGET (combo)); + + gtk_widget_set_tooltip_text (GTK_WIDGET (combo), "Set the item set to use"); + gtk_container_add (GTK_CONTAINER (items_cntl), GTK_WIDGET (combo)); + + g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (items_changed), flowbox); populate_items (GTK_FLOW_BOX (flowbox)); diff --git a/tests/testfontoptions.c b/tests/testfontoptions.c index 404314619930ec59fa2bdb7716719323cc018830..83b37f7342ff36982bfc66d4f4d0800edcf6d917 100644 --- a/tests/testfontoptions.c +++ b/tests/testfontoptions.c @@ -1,8 +1,8 @@ #include -static GtkWidget *antialias; -static GtkWidget *subpixel; -static GtkWidget *hintstyle; +static GtkComboBoxText *antialias; +static GtkComboBoxText *subpixel; +static GtkComboBoxText *hintstyle; static void set_font_options (GtkWidget *label) @@ -30,7 +30,8 @@ set_font_options (GtkWidget *label) int main (int argc, char *argv[]) { - GtkWidget *window, *label, *grid, *demo; + GtkWidget *window, *grid; + GtkLabel *label, *demo; gtk_init (); @@ -40,44 +41,44 @@ main (int argc, char *argv[]) gtk_grid_set_column_spacing (GTK_GRID (grid), 10); gtk_container_add (GTK_CONTAINER (window), grid); label = gtk_label_new ("Default font options"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 2, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 2, 1); demo = gtk_label_new ("Custom font options"); - gtk_grid_attach (GTK_GRID (grid), demo, 0, 1, 2, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (demo), 0, 1, 2, 1); antialias = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (antialias), "Default"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (antialias), "None"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (antialias), "Gray"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (antialias), "Subpixel"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (antialias), "Fast"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (antialias), "Good"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (antialias), "Best"); + gtk_combo_box_text_append_text (antialias, "Default"); + gtk_combo_box_text_append_text (antialias, "None"); + gtk_combo_box_text_append_text (antialias, "Gray"); + gtk_combo_box_text_append_text (antialias, "Subpixel"); + gtk_combo_box_text_append_text (antialias, "Fast"); + gtk_combo_box_text_append_text (antialias, "Good"); + gtk_combo_box_text_append_text (antialias, "Best"); g_signal_connect_swapped (antialias, "changed", G_CALLBACK (set_font_options), demo); label = gtk_label_new ("Antialias"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1); - gtk_grid_attach (GTK_GRID (grid), antialias, 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (antialias), 1, 2, 1, 1); subpixel = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (subpixel), "Default"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (subpixel), "RGB"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (subpixel), "BGR"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (subpixel), "Vertical RGB"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (subpixel), "Vertical BGR"); + gtk_combo_box_text_append_text (subpixel, "Default"); + gtk_combo_box_text_append_text (subpixel, "RGB"); + gtk_combo_box_text_append_text (subpixel, "BGR"); + gtk_combo_box_text_append_text (subpixel, "Vertical RGB"); + gtk_combo_box_text_append_text (subpixel, "Vertical BGR"); g_signal_connect_swapped (subpixel, "changed", G_CALLBACK (set_font_options), demo); label = gtk_label_new ("Subpixel"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1); - gtk_grid_attach (GTK_GRID (grid), subpixel, 1, 3, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 3, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (subpixel), 1, 3, 1, 1); hintstyle = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (hintstyle), "Default"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (hintstyle), "None"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (hintstyle), "Slight"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (hintstyle), "Medium"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (hintstyle), "Full"); + gtk_combo_box_text_append_text (hintstyle, "Default"); + gtk_combo_box_text_append_text (hintstyle, "None"); + gtk_combo_box_text_append_text (hintstyle, "Slight"); + gtk_combo_box_text_append_text (hintstyle, "Medium"); + gtk_combo_box_text_append_text (hintstyle, "Full"); g_signal_connect_swapped (hintstyle, "changed", G_CALLBACK (set_font_options), demo); label = gtk_label_new ("Hintstyle"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 4, 1, 1); - gtk_grid_attach (GTK_GRID (grid), hintstyle, 1, 4, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 4, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (hintstyle), 1, 4, 1, 1); gtk_combo_box_set_active (GTK_COMBO_BOX (antialias), 0); gtk_combo_box_set_active (GTK_COMBO_BOX (subpixel), 0); diff --git a/tests/testframe.c b/tests/testframe.c index 20ca049ec2468c49044741bb40829355d21b892d..ef1473abed5f64490c6366deb0b9891eac9a0151 100644 --- a/tests/testframe.c +++ b/tests/testframe.c @@ -127,6 +127,8 @@ draw_border_cb (GtkToggleButton *toggle_button, GtkFrame *frame) int main (int argc, char **argv) { GtkWidget *window, *widget; + GtkCheckButton *check; + GtkLabel *label; GtkBox *vbox; GtkFrame *frame; GtkGrid *grid; @@ -159,8 +161,8 @@ int main (int argc, char **argv) xalign = gtk_frame_get_label_align (frame); /* Spin to control :label-xalign */ - widget = gtk_label_new ("label xalign:"); - gtk_grid_attach (grid, widget, 0, 0, 1, 1); + label = gtk_label_new ("label xalign:"); + gtk_grid_attach (grid, GTK_WIDGET (label), 0, 0, 1, 1); widget = gtk_spin_button_new_with_range (0.0, 1.0, 0.1); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), xalign); @@ -168,8 +170,8 @@ int main (int argc, char **argv) gtk_grid_attach (grid, widget, 1, 0, 1, 1); /* Spin to control vertical padding */ - widget = gtk_label_new ("vertical padding:"); - gtk_grid_attach (grid, widget, 0, 1, 1, 1); + label = gtk_label_new ("vertical padding:"); + gtk_grid_attach (grid, GTK_WIDGET (label), 0, 1, 1, 1); widget = gtk_spin_button_new_with_range (0, 250, 1); g_signal_connect (widget, "value-changed", G_CALLBACK (spin_vpadding_cb), frame); @@ -177,8 +179,8 @@ int main (int argc, char **argv) gtk_grid_attach (grid, widget, 1, 1, 1, 1); /* Spin to control horizontal padding */ - widget = gtk_label_new ("horizontal padding:"); - gtk_grid_attach (grid, widget, 0, 2, 1, 1); + label = gtk_label_new ("horizontal padding:"); + gtk_grid_attach (grid, GTK_WIDGET (label), 0, 2, 1, 1); widget = gtk_spin_button_new_with_range (0, 250, 1); g_signal_connect (widget, "value-changed", G_CALLBACK (spin_hpadding_cb), frame); @@ -187,10 +189,10 @@ int main (int argc, char **argv) /* CheckButton to control whether to draw border */ draw_border = gtk_frame_get_shadow_type (frame) != GTK_SHADOW_NONE; - widget = gtk_check_button_new_with_label ("draw border"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), draw_border); - g_signal_connect (widget, "toggled", G_CALLBACK (draw_border_cb), frame); - gtk_grid_attach (grid, widget, 0, 3, 1, 1); + check = gtk_check_button_new_with_label ("draw border"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), draw_border); + g_signal_connect (check, "toggled", G_CALLBACK (draw_border_cb), frame); + gtk_grid_attach (grid, GTK_WIDGET (check), 0, 3, 1, 1); gtk_widget_show (window); diff --git a/tests/testgaction.c b/tests/testgaction.c index 8591eae2d59165ca78d1ec73bd63e9837ff226d3..3d1090d08ce15d9682725ed02ce827637ababa6e 100644 --- a/tests/testgaction.c +++ b/tests/testgaction.c @@ -1,31 +1,31 @@ #include -GtkWidget *label; +GtkLabel *label; static void change_label_button () { - gtk_label_set_label (GTK_LABEL (label), "Text set from button"); + gtk_label_set_label (label, "Text set from button"); } static void normal_menu_item () { - gtk_label_set_label (GTK_LABEL (label), "Text set from normal menu item"); + gtk_label_set_label (label, "Text set from normal menu item"); } static void toggle_menu_item () { - gtk_label_set_label (GTK_LABEL (label), "Text set from toggle menu item"); + gtk_label_set_label (label, "Text set from toggle menu item"); } static void submenu_item () { - gtk_label_set_label (GTK_LABEL (label), "Text set from submenu item"); + gtk_label_set_label (label, "Text set from submenu item"); } static void @@ -37,7 +37,7 @@ radio (GSimpleAction *action, GVariant *parameter, gpointer user_data) str = g_strdup_printf ("From Radio menu item %s", g_variant_get_string (new_state, NULL)); - gtk_label_set_label (GTK_LABEL (label), str); + gtk_label_set_label (label, str); g_free (str); } @@ -116,9 +116,9 @@ int main (int argc, char **argv) label = gtk_label_new ("Initial Text"); - gtk_widget_set_margin_top (label, 12); - gtk_widget_set_margin_bottom (label, 12); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_widget_set_margin_top (GTK_WIDGET (label), 12); + gtk_widget_set_margin_bottom (GTK_WIDGET (label), 12); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); gtk_widget_set_halign (menubutton, GTK_ALIGN_CENTER); { GMenuModel *menu_model; diff --git a/tests/testgiconpixbuf.c b/tests/testgiconpixbuf.c index 8a32943457d72108b6313d6fe350a70d0f6806bf..32db414973e75faec105059103d9742fad5e5a08 100644 --- a/tests/testgiconpixbuf.c +++ b/tests/testgiconpixbuf.c @@ -24,7 +24,9 @@ main (int argc, char **argv) { GdkPixbuf *pixbuf, *otherpix; - GtkWidget *image, *image2, *hbox, *vbox, *label, *toplevel; + GtkImage *image, *image2; + GtkWidget *hbox, *vbox, *toplevel; + GtkLabel *label; GIcon *emblemed; GEmblem *emblem; gchar *str; @@ -44,13 +46,13 @@ main (int argc, gtk_container_add (GTK_CONTAINER (hbox), vbox); image = gtk_image_new_from_gicon (G_ICON (pixbuf)); - gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE); - gtk_container_add (GTK_CONTAINER (vbox), image); + gtk_image_set_icon_size (image, GTK_ICON_SIZE_LARGE); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (image)); label = gtk_label_new (NULL); str = g_strdup_printf ("Normal icon, hash %u", g_icon_hash (G_ICON (pixbuf))); - gtk_label_set_label (GTK_LABEL (label), str); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_label_set_label (label, str); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); otherpix = gdk_pixbuf_new_from_file ("gnome-textfile.png", NULL); emblem = g_emblem_new (G_ICON (otherpix)); @@ -60,13 +62,13 @@ main (int argc, gtk_container_add (GTK_CONTAINER (hbox), vbox); image2 = gtk_image_new_from_gicon (emblemed); - gtk_image_set_icon_size (GTK_IMAGE (image2), GTK_ICON_SIZE_LARGE); - gtk_container_add (GTK_CONTAINER (vbox), image2); + gtk_image_set_icon_size (image2, GTK_ICON_SIZE_LARGE); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (image2)); label = gtk_label_new (NULL); str = g_strdup_printf ("Emblemed icon, hash %u", g_icon_hash (emblemed)); gtk_label_set_label (GTK_LABEL (label), str); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); gtk_widget_show (toplevel); diff --git a/tests/testglarea.c b/tests/testglarea.c index 08ed63ce73014726b84c50c50ae8677f3428560b..9bc9a9e533e2d34b8f9e6853d644a01b3944ff02 100644 --- a/tests/testglarea.c +++ b/tests/testglarea.c @@ -349,7 +349,8 @@ on_axis_value_change (GtkAdjustment *adjustment, static GtkWidget * create_axis_slider (int axis) { - GtkWidget *box, *label, *slider; + GtkWidget *box, *slider; + GtkLabel *label; GtkAdjustment *adj; const char *text; @@ -374,8 +375,8 @@ create_axis_slider (int axis) } label = gtk_label_new (text); - gtk_container_add (GTK_CONTAINER (box), label); - gtk_widget_show (label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); adj = gtk_adjustment_new (0.0, 0.0, 360.0, 1.0, 12.0, 0.0); g_signal_connect (adj, "value-changed", diff --git a/tests/testgmenu.c b/tests/testgmenu.c index ef4702165b16b87118d841e140fd67e50a380b4c..0d114c1afa13774648ec0fcd6c33611f6ae39f12 100644 --- a/tests/testgmenu.c +++ b/tests/testgmenu.c @@ -559,12 +559,12 @@ create_add_remove_buttons (GActionGroup *group, GtkWidget *treeview) { GtkWidget *box; - GtkWidget *button; + GtkCheckButton *button; box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); button = gtk_check_button_new_with_label ("Add Italic"); - gtk_container_add (GTK_CONTAINER (box), button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (button)); g_object_set_data (G_OBJECT (button), "group", group); g_object_set_data (G_OBJECT (button), "model", model); @@ -573,7 +573,7 @@ create_add_remove_buttons (GActionGroup *group, G_CALLBACK (toggle_italic), treeview); button = gtk_check_button_new_with_label ("Add Sumerian"); - gtk_container_add (GTK_CONTAINER (box), button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (button)); g_object_set_data (G_OBJECT (button), "group", group); g_object_set_data (G_OBJECT (button), "model", model); @@ -582,7 +582,7 @@ create_add_remove_buttons (GActionGroup *group, G_CALLBACK (toggle_sumerian), NULL); button = gtk_check_button_new_with_label ("Add Speed"); - gtk_container_add (GTK_CONTAINER (box), button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (button)); g_object_set_data (G_OBJECT (button), "group", group); g_object_set_data (G_OBJECT (button), "model", model); diff --git a/tests/testgrid.c b/tests/testgrid.c index 4b63268895b79d9d092dc07f44fdab1580f96cf6..d107468722e519b32d7340af8e9d3df0a706feed 100644 --- a/tests/testgrid.c +++ b/tests/testgrid.c @@ -4,7 +4,7 @@ static GtkWidget * oriented_test_widget (const gchar *label, const gchar *color) { GtkWidget *box; - GtkWidget *widget; + GtkLabel *widget; GtkCssProvider *provider; gchar *data; @@ -18,7 +18,7 @@ oriented_test_widget (const gchar *label, const gchar *color) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); g_free (data); g_object_unref (provider); - gtk_container_add (GTK_CONTAINER (box), widget); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (widget)); return box; } @@ -93,7 +93,7 @@ text_grid (void) GtkWidget *grid; GtkWidget *paned1; GtkWidget *box; - GtkWidget *label; + GtkLabel *label; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Height-for-Width"); @@ -102,28 +102,28 @@ text_grid (void) box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_paned_pack1 (GTK_PANED (paned1), box, TRUE, FALSE); - gtk_paned_pack2 (GTK_PANED (paned1), gtk_label_new ("Space"), TRUE, FALSE); + gtk_paned_pack2 (GTK_PANED (paned1), GTK_WIDGET (gtk_label_new ("Space")), TRUE, FALSE); grid = gtk_grid_new (); gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("Above")); - gtk_container_add (GTK_CONTAINER (box), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new ("Above"))); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); gtk_container_add (GTK_CONTAINER (box), grid); - gtk_container_add (GTK_CONTAINER (box), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); - gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("Below")); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (gtk_label_new ("Below"))); label = gtk_label_new ("Some text that may wrap if it has to"); - gtk_label_set_width_chars (GTK_LABEL (label), 10); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); + gtk_label_set_width_chars (label, 10); + gtk_label_set_wrap (label, TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); gtk_grid_attach (GTK_GRID (grid), test_widget ("1", "red"), 1, 0, 1, 1); gtk_grid_attach (GTK_GRID (grid), test_widget ("2", "blue"), 0, 1, 1, 1); label = gtk_label_new ("Some text that may wrap if it has to"); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_label_set_width_chars (GTK_LABEL (label), 10); - gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); + gtk_label_set_width_chars (label, 10); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 1, 1, 1, 1); gtk_widget_show (window); } @@ -134,7 +134,7 @@ box_comparison (void) GtkWidget *window; GtkWidget *vbox; GtkWidget *box; - GtkWidget *label; + GtkLabel *label; GtkWidget *grid; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -142,8 +142,8 @@ box_comparison (void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_add (GTK_CONTAINER (window), vbox); - gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Above")); - gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_label_new ("Above"))); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (vbox), box); @@ -151,44 +151,44 @@ box_comparison (void) gtk_container_add (GTK_CONTAINER (box), test_widget ("1", "white")); label = gtk_label_new ("Some ellipsizing text"); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_label_set_width_chars (GTK_LABEL (label), 10); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); + gtk_label_set_width_chars (label, 10); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (box), test_widget ("2", "green")); label = gtk_label_new ("Some text that may wrap if needed"); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_width_chars (GTK_LABEL (label), 10); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_width_chars (label, 10); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (box), test_widget ("3", "red")); grid = gtk_grid_new (); gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL); - gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); gtk_container_add (GTK_CONTAINER (vbox), grid); gtk_grid_attach (GTK_GRID (grid), test_widget ("1", "white"), 0, 0, 1, 1); label = gtk_label_new ("Some ellipsizing text"); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_label_set_width_chars (GTK_LABEL (label), 10); - gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1); - gtk_widget_set_hexpand (label, TRUE); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); + gtk_label_set_width_chars (label, 10); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 1, 0, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); gtk_grid_attach (GTK_GRID (grid), test_widget ("2", "green"), 2, 0, 1, 1); label = gtk_label_new ("Some text that may wrap if needed"); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_width_chars (GTK_LABEL (label), 10); - gtk_grid_attach (GTK_GRID (grid), label, 3, 0, 1, 1); - gtk_widget_set_hexpand (label, TRUE); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_width_chars (label, 10); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 3, 0, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); gtk_grid_attach (GTK_GRID (grid), test_widget ("3", "red"), 4, 0, 1, 1); - gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); - gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Below")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_label_new ("Below"))); gtk_widget_show (window); } diff --git a/tests/testgridbaseline.c b/tests/testgridbaseline.c index 8c097bfd9627c6d762619573b9f8693903b46785..6f5f76dfbf65caa1c880254d7e45204ee650fed0 100644 --- a/tests/testgridbaseline.c +++ b/tests/testgridbaseline.c @@ -7,10 +7,10 @@ main (int argc, char *argv[]) { GtkWidget *window; GtkWidget *grid; - GtkWidget *label1; - GtkWidget *label2; - GtkWidget *label3; - GtkWidget *label4; + GtkLabel *label1; + GtkLabel *label2; + GtkLabel *label3; + GtkLabel *label4; g_setenv ("GTK_DEBUG", "baselines,layout", TRUE); gtk_init (); @@ -31,14 +31,14 @@ main (int argc, char *argv[]) g_message ("label3: %p", label3); g_message ("label4: %p", label4); - gtk_widget_set_valign (label1, GTK_ALIGN_BASELINE); - gtk_widget_set_valign (label2, GTK_ALIGN_BASELINE); - gtk_widget_set_valign (label3, GTK_ALIGN_START); - gtk_widget_set_valign (label4, GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label1), GTK_ALIGN_BASELINE); + gtk_widget_set_valign (GTK_WIDGET (label2), GTK_ALIGN_BASELINE); + gtk_widget_set_valign (GTK_WIDGET (label3), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label4), GTK_ALIGN_START); - gtk_widget_set_margin_top (label1, 12); - gtk_widget_set_margin_bottom (label2, 18); - gtk_widget_set_margin_top (label3, 30); + gtk_widget_set_margin_top (GTK_WIDGET (label1), 12); + gtk_widget_set_margin_bottom (GTK_WIDGET (label2), 18); + gtk_widget_set_margin_top (GTK_WIDGET (label3), 30); /* @@ -47,10 +47,10 @@ main (int argc, char *argv[]) */ - gtk_grid_attach (GTK_GRID (grid), label1, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (grid), label2, 1, 0, 1, 1); - gtk_grid_attach (GTK_GRID (grid), label3, 0, 1, 1, 1); - gtk_grid_attach (GTK_GRID (grid), label4, 1, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label1), 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label2), 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label3), 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label4), 1, 1, 1, 1); gtk_widget_show (window); gtk_main (); diff --git a/tests/testgtk.c b/tests/testgtk.c index 998a13d2181cd7b7fe39449f06777f74758ddb13..4da3993d19d39a5c8f9604ab485c69a9c1f9c626 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -95,7 +95,7 @@ build_option_menu (gchar *items[], void (*func)(GtkWidget *widget, gpointer data), gpointer data) { - GtkWidget *omenu; + GtkComboBoxText *omenu; gint i; omenu = gtk_combo_box_text_new (); @@ -103,11 +103,11 @@ build_option_menu (gchar *items[], G_CALLBACK (func), data); for (i = 0; i < num_items; i++) - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (omenu), items[i]); + gtk_combo_box_text_append_text (omenu, items[i]); gtk_combo_box_set_active (GTK_COMBO_BOX (omenu), history); - return omenu; + return GTK_WIDGET (omenu); } /* @@ -118,10 +118,10 @@ build_alpha_widgets (void) { GtkWidget *grid; GtkWidget *radio_button; - GtkWidget *check_button; + GtkCheckButton *check_button; GtkWidget *hbox; - GtkWidget *label; - GtkWidget *entry; + GtkLabel *label; + GtkEntry *entry; grid = gtk_grid_new (); @@ -138,24 +138,24 @@ build_alpha_widgets (void) gtk_grid_attach (GTK_GRID (grid), radio_button, 0, 2, 1, 1); check_button = gtk_check_button_new_with_label ("Sedentary"), - gtk_widget_set_hexpand (check_button, TRUE); - gtk_grid_attach (GTK_GRID (grid), check_button, 1, 0, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (check_button), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check_button), 1, 0, 1, 1); check_button = gtk_check_button_new_with_label ("Nocturnal"), - gtk_widget_set_hexpand (check_button, TRUE); - gtk_grid_attach (GTK_GRID (grid), check_button, 1, 1, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (check_button), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check_button), 1, 1, 1, 1); check_button = gtk_check_button_new_with_label ("Compulsive"), - gtk_widget_set_hexpand (check_button, TRUE); - gtk_grid_attach (GTK_GRID (grid), check_button, 1, 2, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (check_button), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check_button), 1, 2, 1, 1); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), "Entry: "); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_label_set_markup (label, "Entry: "); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); entry = gtk_entry_new (); - gtk_widget_set_hexpand (entry, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_widget_set_hexpand (GTK_WIDGET (entry), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); gtk_widget_set_hexpand (hbox, TRUE); gtk_grid_attach (GTK_GRID (grid), hbox, 0, 3, 2, 1); @@ -187,7 +187,7 @@ create_alpha_window (GtkWidget *widget) { GtkWidget *content_area; GtkWidget *vbox; - GtkWidget *label; + GtkLabel *label; GdkDisplay *display; GtkCssProvider *provider; @@ -212,13 +212,13 @@ create_alpha_window (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (content_area), vbox); label = gtk_label_new (NULL); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); label = gtk_label_new (NULL); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); display = gtk_widget_get_display (window); - on_composited_changed (display, NULL, GTK_LABEL (label)); - g_signal_connect (display, "notify::composited", G_CALLBACK (on_composited_changed), label); + on_composited_changed (display, NULL, label); + g_signal_connect (display, "notify::composited", G_CALLBACK (on_composited_changed), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), build_alpha_widgets ()); @@ -258,7 +258,7 @@ create_buttons (GtkWidget *widget) GtkWidget *box1; GtkWidget *box2; GtkWidget *grid; - GtkWidget *separator; + GtkSeparator *separator; GtkWidget *button[10]; int button_x[9] = { 0, 1, 2, 0, 2, 1, 1, 2, 0 }; int button_y[9] = { 0, 1, 2, 2, 0, 2, 0, 1, 1 }; @@ -307,7 +307,7 @@ create_buttons (GtkWidget *widget) } separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_add (GTK_CONTAINER (box1), box2); @@ -336,8 +336,9 @@ create_toggle_buttons (GtkWidget *widget) static GtkWidget *window = NULL; GtkWidget *box1; GtkWidget *box2; + GtkToggleButton *toggle; GtkWidget *button; - GtkWidget *separator; + GtkSeparator *separator; if (!window) { @@ -357,17 +358,17 @@ create_toggle_buttons (GtkWidget *widget) box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_add (GTK_CONTAINER (box1), box2); - button = gtk_toggle_button_new_with_label ("button1"); - gtk_container_add (GTK_CONTAINER (box2), button); + toggle = gtk_toggle_button_new_with_label ("button1"); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (toggle)); - button = gtk_toggle_button_new_with_label ("button2"); - gtk_container_add (GTK_CONTAINER (box2), button); + toggle = gtk_toggle_button_new_with_label ("button2"); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (toggle)); - button = gtk_toggle_button_new_with_label ("button3"); - gtk_container_add (GTK_CONTAINER (box2), button); + toggle = gtk_toggle_button_new_with_label ("button3"); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (toggle)); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_add (GTK_CONTAINER (box1), box2); @@ -409,13 +410,13 @@ create_widget_grid (GType widget_type) else if (i == 0) { tmp = g_strdup_printf ("%d", j); - widget = gtk_label_new (tmp); + widget = GTK_WIDGET (gtk_label_new (tmp)); g_free (tmp); } else if (j == 0) { tmp = g_strdup_printf ("%c", 'A' + i - 1); - widget = gtk_label_new (tmp); + widget = GTK_WIDGET (gtk_label_new (tmp)); g_free (tmp); } else @@ -449,8 +450,8 @@ create_check_buttons (GtkWidget *widget) static GtkWidget *window = NULL; GtkWidget *box1; GtkWidget *box2; - GtkWidget *button; - GtkWidget *separator; + GtkCheckButton *button; + GtkSeparator *separator; GtkWidget *table; if (!window) @@ -477,20 +478,20 @@ create_check_buttons (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (box1), box2); button = gtk_check_button_new_with_mnemonic ("_button1"); - gtk_container_add (GTK_CONTAINER (box2), button); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (button)); button = gtk_check_button_new_with_label ("button2"); - gtk_container_add (GTK_CONTAINER (box2), button); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (button)); button = gtk_check_button_new_with_label ("button3"); - gtk_container_add (GTK_CONTAINER (box2), button); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (button)); button = gtk_check_button_new_with_label ("inconsistent"); - gtk_check_button_set_inconsistent (GTK_CHECK_BUTTON (button), TRUE); - gtk_container_add (GTK_CONTAINER (box2), button); + gtk_check_button_set_inconsistent (button, TRUE); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (button)); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); table = create_widget_grid (GTK_TYPE_CHECK_BUTTON); gtk_container_add (GTK_CONTAINER (box1), table); @@ -513,7 +514,7 @@ create_radio_buttons (GtkWidget *widget) GtkWidget *box1; GtkWidget *box2; GtkWidget *button; - GtkWidget *separator; + GtkSeparator *separator; GtkWidget *table; if (!window) @@ -560,7 +561,7 @@ create_radio_buttons (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (box2), button); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_add (GTK_CONTAINER (box1), box2); @@ -580,7 +581,7 @@ create_radio_buttons (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (box2), button); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); table = create_widget_grid (GTK_TYPE_RADIO_BUTTON); gtk_container_add (GTK_CONTAINER (box1), table); @@ -596,11 +597,11 @@ create_radio_buttons (GtkWidget *widget) * GtkToolBar */ -static GtkWidget* +static GtkImage* new_pixbuf (char *filename, GdkSurface *window) { - GtkWidget *widget; + GtkImage *widget; GdkPixbuf *pixbuf; if (strcmp (filename, "test.xpm") == 0) @@ -707,7 +708,7 @@ create_statusbar (GtkWidget *widget) GtkWidget *box1; GtkWidget *box2; GtkWidget *button; - GtkWidget *separator; + GtkSeparator *separator; GtkWidget *statusbar; if (!window) @@ -771,7 +772,7 @@ create_statusbar (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (box2), button); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_add (GTK_CONTAINER (box1), box2); @@ -805,11 +806,11 @@ sensitivity_toggled (GtkWidget *toggle, static GtkWidget* create_sensitivity_control (GtkWidget *widget) { - GtkWidget *button; + GtkToggleButton *button; button = gtk_toggle_button_new_with_label ("Sensitive"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), + gtk_toggle_button_set_active (button, gtk_widget_is_sensitive (widget)); g_signal_connect (button, @@ -817,9 +818,9 @@ create_sensitivity_control (GtkWidget *widget) G_CALLBACK (sensitivity_toggled), widget); - gtk_widget_show (button); + gtk_widget_show (GTK_WIDGET (button)); - return button; + return GTK_WIDGET (button); } static void @@ -858,11 +859,11 @@ selectable_toggled (GtkWidget *toggle, static GtkWidget* create_selectable_control (GtkWidget *widget) { - GtkWidget *button; + GtkToggleButton *button; button = gtk_toggle_button_new_with_label ("Selectable"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), + gtk_toggle_button_set_active (button, FALSE); g_signal_connect (button, @@ -870,9 +871,9 @@ create_selectable_control (GtkWidget *widget) G_CALLBACK (selectable_toggled), widget); - gtk_widget_show (button); + gtk_widget_show (GTK_WIDGET (button)); - return button; + return GTK_WIDGET (button); } static void @@ -906,7 +907,7 @@ activate_link (GtkWidget *label, const gchar *uri, gpointer data) gtk_window_present (GTK_WINDOW (dialog)); - g_signal_connect (dialog, "response", G_CALLBACK (dialog_response), label); + g_signal_connect (dialog, "response", G_CALLBACK (dialog_response), GTK_WIDGET (label)); return TRUE; } @@ -920,7 +921,7 @@ void create_labels (GtkWidget *widget) GtkWidget *hbox; GtkWidget *vbox; GtkWidget *frame; - GtkWidget *label; + GtkLabel *label; GtkWidget *button; if (!window) @@ -957,55 +958,55 @@ void create_labels (GtkWidget *widget) frame = gtk_frame_new ("Normal Label"); label = gtk_label_new ("This is a Normal label"); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_START); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); frame = gtk_frame_new ("Multi-line Label"); label = gtk_label_new ("This is a Multi-line label.\nSecond line\nThird line"); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); frame = gtk_frame_new ("Left Justified Label"); label = gtk_label_new ("This is a Left-Justified\nMulti-line label.\nThird line"); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE); + gtk_label_set_justify (label, GTK_JUSTIFY_LEFT); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); frame = gtk_frame_new ("Right Justified Label"); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_START); label = gtk_label_new ("This is a Right-Justified\nMulti-line label.\nFourth line, (j/k)"); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_label_set_justify (label, GTK_JUSTIFY_RIGHT); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); frame = gtk_frame_new ("Internationalized Label"); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), + gtk_label_set_markup (label, "French (Fran\303\247ais) Bonjour, Salut\n" "Korean (\355\225\234\352\270\200) \354\225\210\353\205\225\355\225\230\354\204\270\354\232\224, \354\225\210\353\205\225\355\225\230\354\213\255\353\213\210\352\271\214\n" "Russian (\320\240\321\203\321\201\321\201\320\272\320\270\320\271) \320\227\320\264\321\200\320\260\320\262\321\201\321\202\320\262\321\203\320\271\321\202\320\265!\n" "Chinese (Simplified) \345\205\203\346\260\224 \345\274\200\345\217\221\n" "Chinese (Traditional) \345\205\203\346\260\243 \351\226\213\347\231\274\n" "Japanese \345\205\203\346\260\227 \351\226\213\347\231\272"); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_label_set_justify (label, GTK_JUSTIFY_LEFT); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); frame = gtk_frame_new ("Bidirection Label"); label = gtk_label_new ("\342\200\217Arabic \330\247\331\204\330\263\331\204\330\247\331\205 \330\271\331\204\331\212\331\203\331\205\n" "\342\200\217Hebrew \327\251\327\234\327\225\327\235"); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); frame = gtk_frame_new ("Links in a label"); label = gtk_label_new ("Some text may be marked up\n" "as hyperlinks, which can be clicked\n" "or activated via keynav"); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_label_set_use_markup (label, TRUE); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL); @@ -1020,8 +1021,8 @@ void create_labels (GtkWidget *widget) " It supports multiple paragraphs correctly, and correctly adds "\ "many extra spaces. "); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_label_set_wrap (label, TRUE); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); frame = gtk_frame_new ("Filled, wrapped label"); @@ -1032,17 +1033,17 @@ void create_labels (GtkWidget *widget) " This is a new paragraph.\n"\ " This is another newer, longer, better paragraph. It is coming to an end, "\ "unfortunately."); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_FILL); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_label_set_justify (label, GTK_JUSTIFY_FILL); + gtk_label_set_wrap (label, TRUE); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); frame = gtk_frame_new ("Underlined label"); label = gtk_label_new ("This label is underlined!\n" "This one is underlined (\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257) in quite a funky fashion"); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_label_set_pattern (GTK_LABEL (label), "_________________________ _ _________ _ _____ _ __ __ ___ ____ _____"); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_label_set_justify (label, GTK_JUSTIFY_LEFT); + gtk_label_set_pattern (label, "_________________________ _ _________ _ _____ _ __ __ ___ ____ _____"); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); frame = gtk_frame_new ("Markup label"); @@ -1051,7 +1052,7 @@ void create_labels (GtkWidget *widget) /* There's also a gtk_label_set_markup() without accel if you * don't have an accelerator key */ - gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), + gtk_label_set_markup_with_mnemonic (label, "This label has " "markup _such as " "Big Italics\n" @@ -1067,9 +1068,9 @@ void create_labels (GtkWidget *widget) "but this _word is purple\n" "We like superscript and subscript too"); - g_assert (gtk_label_get_mnemonic_keyval (GTK_LABEL (label)) == GDK_KEY_s); + g_assert (gtk_label_get_mnemonic_keyval (label) == GDK_KEY_s); - gtk_container_add (GTK_CONTAINER (frame), label); + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (vbox), frame); } @@ -1214,9 +1215,9 @@ create_pixbuf (GtkWidget *widget) GtkWidget *box2; GtkWidget *box3; GtkWidget *button; - GtkWidget *label; - GtkWidget *separator; - GtkWidget *pixbufwid; + GtkLabel *label; + GtkSeparator *separator; + GtkImage *pixbufwid; GdkSurface *gdk_surface; if (!window) @@ -1248,8 +1249,8 @@ create_pixbuf (GtkWidget *widget) label = gtk_label_new ("Pixbuf\ntest"); box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_container_add (GTK_CONTAINER (box3), pixbufwid); - gtk_container_add (GTK_CONTAINER (box3), label); + gtk_container_add (GTK_CONTAINER (box3), GTK_WIDGET (pixbufwid)); + gtk_container_add (GTK_CONTAINER (box3), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (button), box3); button = gtk_button_new (); @@ -1259,14 +1260,14 @@ create_pixbuf (GtkWidget *widget) label = gtk_label_new ("Pixbuf\ntest"); box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_container_add (GTK_CONTAINER (box3), pixbufwid); - gtk_container_add (GTK_CONTAINER (box3), label); + gtk_container_add (GTK_CONTAINER (box3), GTK_WIDGET (pixbufwid)); + gtk_container_add (GTK_CONTAINER (box3), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (button), box3); gtk_widget_set_sensitive (button, FALSE); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_add (GTK_CONTAINER (box1), box2); @@ -1293,9 +1294,9 @@ create_tooltips (GtkWidget *widget) GtkWidget *box2; GtkWidget *box3; GtkWidget *button; - GtkWidget *toggle; + GtkToggleButton *toggle; GtkWidget *frame; - GtkWidget *separator; + GtkSeparator *separator; if (!window) { @@ -1315,23 +1316,23 @@ create_tooltips (GtkWidget *widget) box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_add (GTK_CONTAINER (box1), box2); - button = gtk_toggle_button_new_with_label ("button1"); - gtk_container_add (GTK_CONTAINER (box2), button); + toggle = gtk_toggle_button_new_with_label ("button1"); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (toggle)); - gtk_widget_set_tooltip_text (button, "This is button 1"); + gtk_widget_set_tooltip_text (GTK_WIDGET (toggle), "This is button 1"); - button = gtk_toggle_button_new_with_label ("button2"); - gtk_container_add (GTK_CONTAINER (box2), button); + toggle = gtk_toggle_button_new_with_label ("button2"); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (toggle)); - gtk_widget_set_tooltip_text (button, + gtk_widget_set_tooltip_text (GTK_WIDGET (toggle), "This is button 2. This is also a really long tooltip which probably " "won't fit on a single line and will therefore need to be wrapped. " "Hopefully the wrapping will work correctly."); toggle = gtk_toggle_button_new_with_label ("Override TipsQuery Label"); - gtk_container_add (GTK_CONTAINER (box2), toggle); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (toggle)); - gtk_widget_set_tooltip_text (toggle, "Toggle TipsQuery view."); + gtk_widget_set_tooltip_text (GTK_WIDGET (toggle), "Toggle TipsQuery view."); box3 = g_object_new (GTK_TYPE_BOX, @@ -1355,7 +1356,7 @@ create_tooltips (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (frame), box3); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_add (GTK_CONTAINER (box1), box2); @@ -1383,13 +1384,13 @@ create_tooltips (GtkWidget *widget) static void pack_image (GtkWidget *box, const gchar *text, - GtkWidget *image) + GtkImage *image) { gtk_container_add (GTK_CONTAINER (box), - gtk_label_new (text)); + GTK_WIDGET (gtk_label_new (text))); gtk_container_add (GTK_CONTAINER (box), - image); + GTK_WIDGET (image)); } static void @@ -1504,11 +1505,11 @@ add_placeholder_clicked_cb (GtkButton *button, gpointer data) { GtkListBox *list = data; - GtkWidget *label; + GtkLabel *label; label = gtk_label_new ("You filtered everything!!!"); - gtk_widget_show (label); - gtk_list_box_set_placeholder (GTK_LIST_BOX (list), label); + gtk_widget_show (GTK_WIDGET (label)); + gtk_list_box_set_placeholder (GTK_LIST_BOX (list), GTK_WIDGET (label)); } static void @@ -1528,7 +1529,8 @@ create_listbox (GtkWidget *widget) if (!window) { - GtkWidget *hbox, *vbox, *scrolled, *scrolled_box, *list, *label, *button; + GtkWidget *hbox, *vbox, *scrolled, *scrolled_box, *list, *button; + GtkLabel *label; GdkDisplay *display = gtk_widget_get_display (widget); int i; @@ -1551,7 +1553,7 @@ create_listbox (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (scrolled), scrolled_box); label = gtk_label_new ("This is \na LABEL\nwith rows"); - gtk_container_add (GTK_CONTAINER (scrolled_box), label); + gtk_container_add (GTK_CONTAINER (scrolled_box), GTK_WIDGET (label)); list = gtk_list_box_new(); gtk_list_box_set_adjustment (GTK_LIST_BOX (list), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled))); @@ -1561,9 +1563,9 @@ create_listbox (GtkWidget *widget) { gint value = g_random_int_range (0, 10000); label = gtk_label_new (g_strdup_printf ("Value %u", value)); - gtk_widget_show (label); - gtk_container_add (GTK_CONTAINER (list), label); - g_object_set_data (G_OBJECT (gtk_widget_get_parent (label)), "value", GINT_TO_POINTER (value)); + gtk_widget_show (GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (list), GTK_WIDGET (label)); + g_object_set_data (G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (label))), "value", GINT_TO_POINTER (value)); } vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); @@ -1620,9 +1622,9 @@ accel_button_new (GtkAccelGroup *accel_group, label = gtk_accel_label_new (text); gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), button); - gtk_widget_show (label); + gtk_widget_show (GTK_WIDGET (label)); - gtk_container_add (GTK_CONTAINER (button), label); + gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (label)); return button; } @@ -1710,7 +1712,7 @@ cmw_destroy_cb(GtkWidget *widget) static void cmw_color (GtkWidget *widget, GtkWidget *parent) { - GtkWidget *csd; + GtkColorChooserDialog *csd; csd = gtk_color_chooser_dialog_new ("This is a modal color selection dialog", GTK_WINDOW (parent)); @@ -1723,14 +1725,14 @@ cmw_color (GtkWidget *widget, GtkWidget *parent) G_CALLBACK (gtk_widget_destroy), NULL); /* wait until destroy calls gtk_main_quit */ - gtk_widget_show (csd); + gtk_widget_show (GTK_WIDGET (csd)); gtk_main (); } static void cmw_file (GtkWidget *widget, GtkWidget *parent) { - GtkWidget *fs; + GtkFileChooserDialog *fs; fs = gtk_file_chooser_dialog_new ("This is a modal file selection dialog", GTK_WINDOW (parent), @@ -1747,7 +1749,7 @@ cmw_file (GtkWidget *widget, GtkWidget *parent) G_CALLBACK (gtk_widget_destroy), fs); /* wait until destroy calls gtk_main_quit */ - gtk_widget_show (fs); + gtk_widget_show (GTK_WIDGET (fs)); gtk_main(); } @@ -1785,7 +1787,7 @@ create_modal_window (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (frame1), box2); gtk_container_add (GTK_CONTAINER (box2), btnColor); gtk_container_add (GTK_CONTAINER (box2), btnFile); - gtk_container_add (GTK_CONTAINER (box1), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); gtk_container_add (GTK_CONTAINER (box1), btnClose); /* connect signals */ @@ -1950,7 +1952,7 @@ create_scrolled_windows (GtkWidget *widget) static GtkWidget *window; GtkWidget *content_area; GtkWidget *scrolled_window; - GtkWidget *button; + GtkToggleButton *button; GtkWidget *grid; char buffer[32]; int i, j; @@ -1994,8 +1996,8 @@ create_scrolled_windows (GtkWidget *widget) { sprintf (buffer, "button (%d,%d)\n", i, j); button = gtk_toggle_button_new_with_label (buffer); - gtk_grid_attach (GTK_GRID (grid), button, i, j, 1, 1); - gtk_widget_show (button); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (button), i, j, 1, 1); + gtk_widget_show (GTK_WIDGET (button)); } gtk_dialog_add_button (GTK_DIALOG (window), @@ -2025,17 +2027,17 @@ create_scrolled_windows (GtkWidget *widget) static void entry_toggle_frame (GtkWidget *checkbutton, - GtkWidget *entry) + GtkEntry *entry) { - gtk_entry_set_has_frame (GTK_ENTRY(entry), + gtk_entry_set_has_frame (entry, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton))); } static void entry_toggle_sensitive (GtkWidget *checkbutton, - GtkWidget *entry) + GtkEntry *entry) { - gtk_widget_set_sensitive (entry, + gtk_widget_set_sensitive (GTK_WIDGET (entry), gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(checkbutton))); } @@ -2070,7 +2072,7 @@ entry_remove_timeout (gpointer data) static void entry_toggle_progress (GtkWidget *checkbutton, - GtkWidget *entry) + GtkEntry *entry) { if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton))) { @@ -2084,7 +2086,7 @@ entry_toggle_progress (GtkWidget *checkbutton, g_object_set_data (G_OBJECT (entry), "timeout-id", GUINT_TO_POINTER (0)); - gtk_entry_set_progress_fraction (GTK_ENTRY (entry), 0.0); + gtk_entry_set_progress_fraction (entry, 0.0); } } @@ -2103,14 +2105,14 @@ create_entry (GtkWidget *widget) GtkWidget *box1; GtkWidget *box2; GtkWidget *hbox; - GtkWidget *has_frame_check; - GtkWidget *sensitive_check; - GtkWidget *progress_check; - GtkWidget *entry; + GtkCheckButton *has_frame_check; + GtkCheckButton *sensitive_check; + GtkCheckButton *progress_check; + GtkEntry *entry; GtkComboBoxText *cb; GtkWidget *cb_entry; GtkWidget *button; - GtkWidget *separator; + GtkSeparator *separator; if (!window) { @@ -2138,9 +2140,9 @@ create_entry (GtkWidget *widget) entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "hello world \330\247\331\204\330\263\331\204\330\247\331\205 \330\271\331\204\331\212\331\203\331\205"); gtk_editable_select_region (GTK_EDITABLE (entry), 0, 5); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); - cb = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new_with_entry ()); + cb = gtk_combo_box_text_new_with_entry (); gtk_combo_box_text_append_text (cb, "item0"); gtk_combo_box_text_append_text (cb, "item0"); @@ -2160,29 +2162,29 @@ create_entry (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (cb)); sensitive_check = gtk_check_button_new_with_label("Sensitive"); - gtk_container_add (GTK_CONTAINER (box2), sensitive_check); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (sensitive_check)); g_signal_connect (sensitive_check, "toggled", G_CALLBACK (entry_toggle_sensitive), entry); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sensitive_check), TRUE); has_frame_check = gtk_check_button_new_with_label("Has Frame"); - gtk_container_add (GTK_CONTAINER (box2), has_frame_check); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (has_frame_check)); g_signal_connect (has_frame_check, "toggled", G_CALLBACK (entry_toggle_frame), entry); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (has_frame_check), TRUE); progress_check = gtk_check_button_new_with_label("Show Progress"); - gtk_container_add (GTK_CONTAINER (box2), progress_check); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (progress_check)); g_signal_connect (progress_check, "toggled", G_CALLBACK (entry_toggle_progress), entry); progress_check = gtk_check_button_new_with_label("Pulse Progress"); - gtk_container_add (GTK_CONTAINER (box2), progress_check); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (progress_check)); g_signal_connect (progress_check, "toggled", G_CALLBACK (entry_toggle_pulse), entry); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_add (GTK_CONTAINER (box1), box2); @@ -2205,8 +2207,8 @@ static void create_expander (GtkWidget *widget) { GtkWidget *box1; - GtkWidget *expander; - GtkWidget *hidden; + GtkExpander *expander; + GtkLabel *hidden; static GtkWidget *window = NULL; if (!window) @@ -2226,11 +2228,11 @@ create_expander (GtkWidget *widget) expander = gtk_expander_new ("The Hidden"); - gtk_container_add (GTK_CONTAINER (box1), expander); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (expander)); hidden = gtk_label_new ("Revealed!"); - gtk_container_add (GTK_CONTAINER (expander), hidden); + gtk_container_add (GTK_CONTAINER (expander), GTK_WIDGET (hidden)); } if (!gtk_widget_get_visible (window)) @@ -2600,8 +2602,9 @@ create_spins (GtkWidget *widget) GtkWidget *spinner2; GtkWidget *spinner; GtkWidget *button; - GtkWidget *label; - GtkWidget *val_label; + GtkCheckButton *check; + GtkLabel *label; + GtkLabel *val_label; GtkAdjustment *adjustment; if (!window) @@ -2634,9 +2637,9 @@ create_spins (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (hbox), vbox2); label = gtk_label_new ("Time :"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (vbox2), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (vbox2), GTK_WIDGET (label)); adjustment = gtk_adjustment_new (0, 0, 1410, 30, 60, 0); spinner = gtk_spin_button_new (adjustment, 0, 0); @@ -2653,9 +2656,9 @@ create_spins (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (hbox), vbox2); label = gtk_label_new ("Month :"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (vbox2), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (vbox2), GTK_WIDGET (label)); adjustment = gtk_adjustment_new (1.0, 1.0, 12.0, 1.0, 5.0, 0.0); @@ -2678,9 +2681,9 @@ create_spins (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (hbox), vbox2); label = gtk_label_new ("Hex :"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (vbox2), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (vbox2), GTK_WIDGET (label)); adjustment = gtk_adjustment_new (0, 0, 255, 1, 16, 0); spinner = gtk_spin_button_new (adjustment, 0, 0); @@ -2710,9 +2713,9 @@ create_spins (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (hbox), vbox2); label = gtk_label_new ("Value :"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (vbox2), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (vbox2), GTK_WIDGET (label)); adjustment = gtk_adjustment_new (0.0, -10000.0, 10000.0, 0.5, 100.0, 0.0); @@ -2724,9 +2727,9 @@ create_spins (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (hbox), vbox2); label = gtk_label_new ("Digits :"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (vbox2), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (vbox2), GTK_WIDGET (label)); adjustment = gtk_adjustment_new (2, 1, 15, 1, 1, 0); spinner2 = gtk_spin_button_new (adjustment, 0.0, 0); @@ -2738,19 +2741,19 @@ create_spins (GtkWidget *widget) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (vbox), hbox); - button = gtk_check_button_new_with_label ("Snap to 0.5-ticks"); - g_signal_connect (button, "clicked", + check = gtk_check_button_new_with_label ("Snap to 0.5-ticks"); + g_signal_connect (check, "clicked", G_CALLBACK (toggle_snap), spinner1); - gtk_container_add (GTK_CONTAINER (vbox), button); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (check)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); - button = gtk_check_button_new_with_label ("Numeric only input mode"); - g_signal_connect (button, "clicked", + check = gtk_check_button_new_with_label ("Numeric only input mode"); + g_signal_connect (check, "clicked", G_CALLBACK (toggle_numeric), spinner1); - gtk_container_add (GTK_CONTAINER (vbox), button); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (check)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); val_label = gtk_label_new (""); @@ -2771,8 +2774,8 @@ create_spins (GtkWidget *widget) GINT_TO_POINTER (2)); gtk_container_add (GTK_CONTAINER (hbox), button); - gtk_container_add (GTK_CONTAINER (vbox), val_label); - gtk_label_set_text (GTK_LABEL (val_label), "0"); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (val_label)); + gtk_label_set_text (val_label, "0"); frame = gtk_frame_new ("Using Convenience Constructor"); gtk_container_add (GTK_CONTAINER (main_vbox), frame); @@ -2787,7 +2790,7 @@ create_spins (GtkWidget *widget) g_signal_connect (spinner, "value_changed", G_CALLBACK (get_spin_value), val_label); gtk_container_add (GTK_CONTAINER (hbox), spinner); - gtk_container_add (GTK_CONTAINER (hbox), val_label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (val_label)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (main_vbox), hbox); @@ -2949,7 +2952,7 @@ cursor_pressed_cb (GtkGesture *gesture, int n_pressed, double x, double y, - GtkWidget *entry) + GtkEntry *entry) { GtkWidget *widget; const gchar *name; @@ -3037,9 +3040,9 @@ create_cursors (GtkWidget *widget) GtkWidget *vbox; GtkWidget *darea; GtkWidget *button; - GtkWidget *label; - GtkWidget *any; - GtkWidget *entry; + GtkLabel *label; + GtkSeparator *any; + GtkEntry *entry; GtkWidget *size; GtkEntryCompletion *completion; GtkTreeModel *model; @@ -3083,13 +3086,13 @@ create_cursors (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (vbox), hbox); label = gtk_label_new ("Cursor Theme:"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "default"); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); size = gtk_spin_button_new_with_range (1.0, 128.0, 1.0); gtk_spin_button_set_value (GTK_SPIN_BUTTON (size), 24.0); @@ -3105,9 +3108,9 @@ create_cursors (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (vbox), hbox); label = gtk_label_new ("Cursor Name:"); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); entry = gtk_entry_new (); completion = gtk_entry_completion_new (); @@ -3116,7 +3119,7 @@ create_cursors (GtkWidget *widget) gtk_entry_completion_set_text_column (completion, 0); gtk_entry_set_completion (GTK_ENTRY (entry), completion); g_object_unref (model); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); frame = g_object_new (gtk_frame_get_type (), @@ -3141,7 +3144,7 @@ create_cursors (GtkWidget *widget) any = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (main_vbox), any); + gtk_container_add (GTK_CONTAINER (main_vbox), GTK_WIDGET (any)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (main_vbox), hbox); @@ -3171,9 +3174,9 @@ create_color_selection (GtkWidget *widget) if (!window) { - GtkWidget *picker; + GtkColorButton *picker; GtkWidget *hbox; - GtkWidget *label; + GtkLabel *label; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_display (GTK_WINDOW (window), @@ -3189,11 +3192,11 @@ create_color_selection (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), hbox); label = gtk_label_new ("Pick a color"); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); picker = gtk_color_button_new (); gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (picker), TRUE); - gtk_container_add (GTK_CONTAINER (hbox), picker); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (picker)); } if (!gtk_widget_get_visible (window)) @@ -3285,7 +3288,7 @@ void create_flipping (GtkWidget *widget) { static GtkWidget *window = NULL; - GtkWidget *check_button; + GtkCheckButton *check_button; GtkWidget *content_area; if (!window) @@ -3304,7 +3307,7 @@ create_flipping (GtkWidget *widget) gtk_window_set_title (GTK_WINDOW (window), "Bidirectional Flipping"); check_button = gtk_check_button_new_with_label ("Right-to-left global direction"); - gtk_container_add (GTK_CONTAINER (content_area), check_button); + gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET (check_button)); if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); @@ -3313,7 +3316,7 @@ create_flipping (GtkWidget *widget) G_CALLBACK (flipping_toggled_cb), NULL); check_button = gtk_check_button_new_with_label ("Toggle orientation of all boxes"); - gtk_container_add (GTK_CONTAINER (content_area), check_button); + gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET (check_button)); g_signal_connect (check_button, "toggled", G_CALLBACK (flipping_orientation_toggled_cb), NULL); @@ -3350,7 +3353,7 @@ create_font_selection (GtkWidget *widget) { GtkWidget *picker; GtkWidget *hbox; - GtkWidget *label; + GtkLabel *label; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_display (GTK_WINDOW (window), @@ -3366,7 +3369,7 @@ create_font_selection (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), hbox); label = gtk_label_new ("Pick a font"); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); picker = gtk_font_button_new (); gtk_font_button_set_use_font (GTK_FONT_BUTTON (picker), TRUE); @@ -3408,13 +3411,13 @@ dialog_response_cb (GtkWidget *widget, gint response, gpointer unused) /* no label removed, so add one */ if (l == NULL) { - GtkWidget *label; + GtkLabel *label; label = gtk_label_new ("Dialog Test"); g_object_set (label, "margin", 10, NULL); gtk_container_add (GTK_CONTAINER (content_area), - label); - gtk_widget_show (label); + GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); } g_list_free (children); @@ -3466,7 +3469,7 @@ create_dialog (GtkWidget *widget) typedef struct { - GtkWidget *combo; + GtkComboBoxText *combo; GtkWidget *entry; GtkWidget *toplevel; GtkWidget *dialog_window; @@ -3515,7 +3518,7 @@ screen_display_check (GtkWidget *widget, ScreenDisplaySelection *data) break; } if (!found) - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (data->combo), display_name); + gtk_combo_box_text_append_text (data->combo, display_name); new_display = display; gtk_window_set_display (GTK_WINDOW (data->toplevel), new_display); @@ -3532,8 +3535,10 @@ screen_display_destroy_diag (GtkWidget *widget, GtkWidget *data) void create_display_screen (GtkWidget *widget) { - GtkWidget *grid, *frame, *window, *combo_dpy, *vbox; - GtkWidget *label_dpy, *applyb, *cancelb; + GtkWidget *grid, *frame, *window, *vbox; + GtkComboBoxText *combo_dpy; + GtkWidget *applyb, *cancelb; + GtkLabel *label_dpy; GtkWidget *bbox; ScreenDisplaySelection *scr_dpy_data; GdkDisplay *display = gtk_widget_get_display (widget); @@ -3560,13 +3565,13 @@ create_display_screen (GtkWidget *widget) label_dpy = gtk_label_new ("move to another X display"); combo_dpy = gtk_combo_box_text_new_with_entry (); - gtk_widget_set_hexpand (combo_dpy, TRUE); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_dpy), "diabolo:0.0"); + gtk_widget_set_hexpand (GTK_WIDGET (combo_dpy), TRUE); + gtk_combo_box_text_append_text (combo_dpy, "diabolo:0.0"); gtk_editable_set_text (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (combo_dpy))), ":."); - gtk_grid_attach (GTK_GRID (grid), label_dpy, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (grid), combo_dpy, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label_dpy), 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (combo_dpy), 0, 1, 1, 1); bbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_halign (bbox, GTK_ALIGN_END); @@ -3612,7 +3617,7 @@ create_range_controls (GtkWidget *widget) GtkWidget *button; GtkWidget *scrollbar; GtkWidget *scale; - GtkWidget *separator; + GtkSeparator *separator; GtkAdjustment *adjustment; GtkWidget *hbox; @@ -3693,8 +3698,8 @@ create_range_controls (GtkWidget *widget) gtk_widget_show (hbox); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); - gtk_widget_show (separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); + gtk_widget_show (GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); @@ -3777,15 +3782,15 @@ static void set_page_image (GtkNotebook *notebook, gint page_num, GdkPixbuf *pixbuf) { GtkWidget *page_widget; - GtkWidget *pixwid; + GtkImage *pixwid; page_widget = gtk_notebook_get_nth_page (notebook, page_num); - pixwid = g_object_get_data (G_OBJECT (page_widget), "tab_pixmap"); - gtk_image_set_from_pixbuf (GTK_IMAGE (pixwid), pixbuf); + pixwid = GTK_IMAGE (g_object_get_data (G_OBJECT (page_widget), "tab_pixmap")); + gtk_image_set_from_pixbuf (pixwid, pixbuf); - pixwid = g_object_get_data (G_OBJECT (page_widget), "menu_pixmap"); - gtk_image_set_from_pixbuf (GTK_IMAGE (pixwid), pixbuf); + pixwid = GTK_IMAGE (g_object_get_data (G_OBJECT (page_widget), "menu_pixmap")); + gtk_image_set_from_pixbuf (pixwid, pixbuf); } static void @@ -3822,12 +3827,13 @@ create_pages (GtkNotebook *notebook, gint start, gint end) { GtkWidget *child = NULL; GtkWidget *button; - GtkWidget *label; + GtkCheckButton *check; + GtkLabel *label; GtkWidget *hbox; GtkWidget *vbox; GtkWidget *label_box; GtkWidget *menu_box; - GtkWidget *pixwid; + GtkImage *pixwid; gint i; char buffer[32]; char accel_buffer[32]; @@ -3847,15 +3853,15 @@ create_pages (GtkNotebook *notebook, gint start, gint end) gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE); gtk_container_add (GTK_CONTAINER (vbox), hbox); - button = gtk_check_button_new_with_label ("Fill Tab"); - gtk_container_add (GTK_CONTAINER (hbox), button); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_signal_connect (button, "toggled", + check = gtk_check_button_new_with_label ("Fill Tab"); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (check)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); + g_signal_connect (check, "toggled", G_CALLBACK (tab_fill), child); - button = gtk_check_button_new_with_label ("Expand Tab"); - gtk_container_add (GTK_CONTAINER (hbox), button); - g_signal_connect (button, "toggled", + check = gtk_check_button_new_with_label ("Expand Tab"); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (check)); + g_signal_connect (check, "toggled", G_CALLBACK (tab_expand), child); button = gtk_button_new_with_label ("Hide Page"); @@ -3869,13 +3875,13 @@ create_pages (GtkNotebook *notebook, gint start, gint end) pixwid = gtk_image_new_from_pixbuf (book_closed); g_object_set_data (G_OBJECT (child), "tab_pixmap", pixwid); - gtk_container_add (GTK_CONTAINER (label_box), pixwid); - gtk_widget_set_margin_start (pixwid, 3); - gtk_widget_set_margin_end (pixwid, 3); - gtk_widget_set_margin_bottom (pixwid, 1); - gtk_widget_set_margin_top (pixwid, 1); + gtk_container_add (GTK_CONTAINER (label_box), GTK_WIDGET (pixwid)); + gtk_widget_set_margin_start (GTK_WIDGET (pixwid), 3); + gtk_widget_set_margin_end (GTK_WIDGET (pixwid), 3); + gtk_widget_set_margin_bottom (GTK_WIDGET (pixwid), 1); + gtk_widget_set_margin_top (GTK_WIDGET (pixwid), 1); label = gtk_label_new_with_mnemonic (accel_buffer); - gtk_container_add (GTK_CONTAINER (label_box), label); + gtk_container_add (GTK_CONTAINER (label_box), GTK_WIDGET (label)); gtk_widget_show (label_box); @@ -3883,13 +3889,13 @@ create_pages (GtkNotebook *notebook, gint start, gint end) pixwid = gtk_image_new_from_pixbuf (book_closed); g_object_set_data (G_OBJECT (child), "menu_pixmap", pixwid); - gtk_container_add (GTK_CONTAINER (menu_box), pixwid); - gtk_widget_set_margin_start (pixwid, 3); - gtk_widget_set_margin_end (pixwid, 3); - gtk_widget_set_margin_bottom (pixwid, 1); - gtk_widget_set_margin_top (pixwid, 1); + gtk_container_add (GTK_CONTAINER (menu_box), GTK_WIDGET (pixwid)); + gtk_widget_set_margin_start (GTK_WIDGET (pixwid), 3); + gtk_widget_set_margin_end (GTK_WIDGET (pixwid), 3); + gtk_widget_set_margin_bottom (GTK_WIDGET (pixwid), 1); + gtk_widget_set_margin_top (GTK_WIDGET (pixwid), 1); label = gtk_label_new (buffer); - gtk_container_add (GTK_CONTAINER (menu_box), label); + gtk_container_add (GTK_CONTAINER (menu_box), GTK_WIDGET (label)); gtk_widget_show (menu_box); gtk_notebook_append_page_menu (notebook, child, label_box, menu_box); @@ -3984,9 +3990,10 @@ create_notebook (GtkWidget *widget) GtkWidget *box1; GtkWidget *box2; GtkWidget *button; - GtkWidget *separator; + GtkCheckButton *check; + GtkSeparator *separator; GtkWidget *omenu; - GtkWidget *label; + GtkLabel *label; static gchar *items[] = { @@ -4028,14 +4035,14 @@ create_notebook (GtkWidget *widget) create_pages (GTK_NOTEBOOK (sample_notebook), 1, 5); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); gtk_container_add (GTK_CONTAINER (box1), box2); - button = gtk_check_button_new_with_label ("popup menu"); - gtk_container_add (GTK_CONTAINER (box2), button); - g_signal_connect (button, "clicked", + check = gtk_check_button_new_with_label ("popup menu"); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (check)); + g_signal_connect (check, "clicked", G_CALLBACK (notebook_popup), sample_notebook); @@ -4043,7 +4050,7 @@ create_notebook (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (box1), box2); label = gtk_label_new ("Notebook Style :"); - gtk_container_add (GTK_CONTAINER (box2), label); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (label)); omenu = build_option_menu (items, G_N_ELEMENTS (items), 0, notebook_type_changed, @@ -4077,7 +4084,7 @@ create_notebook (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (box2), button); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); button = gtk_button_new_with_label ("close"); g_signal_connect_swapped (button, "clicked", @@ -4134,8 +4141,8 @@ create_pane_options (GtkPaned *paned, GtkWidget *child1, *child2; GtkWidget *frame; GtkWidget *grid; - GtkWidget *label; - GtkWidget *check_button; + GtkLabel *label; + GtkCheckButton *check_button; child1 = gtk_paned_get_child1 (paned); child2 = gtk_paned_get_child2 (paned); @@ -4146,16 +4153,16 @@ create_pane_options (GtkPaned *paned, gtk_container_add (GTK_CONTAINER (frame), grid); label = gtk_label_new (label1); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); check_button = gtk_check_button_new_with_label ("Resize"); - gtk_grid_attach (GTK_GRID (grid), check_button, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check_button), 0, 1, 1, 1); g_signal_connect (check_button, "toggled", G_CALLBACK (toggle_resize), child1); check_button = gtk_check_button_new_with_label ("Shrink"); - gtk_grid_attach (GTK_GRID (grid), check_button, 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check_button), 0, 2, 1, 1); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); g_signal_connect (check_button, "toggled", @@ -4163,10 +4170,10 @@ create_pane_options (GtkPaned *paned, child1); label = gtk_label_new (label2); - gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 1, 0, 1, 1); check_button = gtk_check_button_new_with_label ("Resize"); - gtk_grid_attach (GTK_GRID (grid), check_button, 1, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check_button), 1, 1, 1, 1); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); g_signal_connect (check_button, "toggled", @@ -4174,7 +4181,7 @@ create_pane_options (GtkPaned *paned, child2); check_button = gtk_check_button_new_with_label ("Shrink"); - gtk_grid_attach (GTK_GRID (grid), check_button, 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check_button), 1, 2, 1, 1); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); g_signal_connect (check_button, "toggled", @@ -4415,7 +4422,7 @@ paned_keyboard_window3 (GtkWidget *widget) { GtkWidget *window3; GtkWidget *vbox2; - GtkWidget *label1; + GtkLabel *label1; GtkWidget *hpaned3; GtkWidget *frame9; GtkWidget *button14; @@ -4440,7 +4447,7 @@ paned_keyboard_window3 (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window3), vbox2); label1 = gtk_label_new ("Three panes nested inside each other"); - gtk_container_add (GTK_CONTAINER (vbox2), label1); + gtk_container_add (GTK_CONTAINER (vbox2), GTK_WIDGET (label1)); hpaned3 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_container_add (GTK_CONTAINER (vbox2), hpaned3); @@ -4487,7 +4494,7 @@ paned_keyboard_window4 (GtkWidget *widget) { GtkWidget *window4; GtkWidget *vbox3; - GtkWidget *label2; + GtkLabel *label2; GtkWidget *hpaned6; GtkWidget *vpaned3; GtkWidget *button19; @@ -4514,8 +4521,8 @@ paned_keyboard_window4 (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window4), vbox3); label2 = gtk_label_new ("Widget tree:\n\nhpaned \n - vpaned\n - hbox\n - vpaned\n - vpaned\n - vpaned\n"); - gtk_container_add (GTK_CONTAINER (vbox3), label2); - gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT); + gtk_container_add (GTK_CONTAINER (vbox3), GTK_WIDGET (label2)); + gtk_label_set_justify (label2, GTK_JUSTIFY_LEFT); hpaned6 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_container_add (GTK_CONTAINER (vbox3), hpaned6); @@ -4640,8 +4647,8 @@ void create_wmhints (GtkWidget *widget) { static GtkWidget *window = NULL; - GtkWidget *label; - GtkWidget *separator; + GtkLabel *label; + GtkSeparator *separator; GtkWidget *button; GtkWidget *box1; GtkWidget *box2; @@ -4686,14 +4693,14 @@ create_wmhints (GtkWidget *widget) gtk_widget_show (box1); label = gtk_label_new ("Try iconizing me!"); - gtk_widget_set_size_request (label, 150, 50); - gtk_container_add (GTK_CONTAINER (box1), label); - gtk_widget_show (label); + gtk_widget_set_size_request (GTK_WIDGET (label), 150, 50); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); - gtk_widget_show (separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); + gtk_widget_show (GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); @@ -4725,7 +4732,7 @@ create_wmhints (GtkWidget *widget) static void surface_state_callback (GdkSurface *window, GParamSpec *pspec, - GtkWidget *label) + GtkLabel *label) { gchar *msg; GdkSurfaceState new_state; @@ -4748,7 +4755,7 @@ surface_state_callback (GdkSurface *window, "below" : "not below", ", ", NULL); - gtk_label_set_text (GTK_LABEL (label), msg); + gtk_label_set_text (label, msg); g_free (msg); } @@ -4756,7 +4763,7 @@ surface_state_callback (GdkSurface *window, static GtkWidget* tracking_label (GtkWidget *window) { - GtkWidget *label; + GtkLabel *label; GtkWidget *hbox; GtkWidget *button; @@ -4769,8 +4776,8 @@ tracking_label (GtkWidget *window) G_CONNECT_SWAPPED); label = gtk_label_new (""); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_label_set_wrap (label, TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); g_object_set_data (G_OBJECT (label), "title", (gpointer)gtk_window_get_title (GTK_WINDOW (window))); g_signal_connect (gtk_native_get_surface (GTK_NATIVE (window)), "notify::state", @@ -4860,8 +4867,8 @@ get_state_controls (GtkWidget *window) { GtkWidget *vbox; GtkWidget *button; - GtkWidget *button_above; - GtkWidget *button_below; + GtkToggleButton *button_above; + GtkToggleButton *button_below; vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); @@ -4926,14 +4933,14 @@ get_state_controls (GtkWidget *window) "toggled", G_CALLBACK (keep_window_above), window); - gtk_container_add (GTK_CONTAINER (vbox), button_above); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (button_above)); button_below = gtk_toggle_button_new_with_label ("Keep below"); g_signal_connect (button_below, "toggled", G_CALLBACK (keep_window_below), window); - gtk_container_add (GTK_CONTAINER (vbox), button_below); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (button_below)); g_object_set_data (G_OBJECT (button_above), "radio", button_below); g_object_set_data (G_OBJECT (button_below), "radio", button_above); @@ -5008,10 +5015,10 @@ create_surface_states (GtkWidget *widget) gtk_widget_realize (normal); label = tracking_label (iconified); - gtk_container_add (GTK_CONTAINER (box1), label); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (label)); label = tracking_label (normal); - gtk_container_add (GTK_CONTAINER (box1), label); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (label)); gtk_widget_show (iconified); gtk_widget_show (normal); @@ -5035,12 +5042,12 @@ size_allocate_callback (GtkWidget *widget, int baseline, gpointer data) { - GtkWidget *label = data; + GtkLabel *label = data; gchar *msg; msg = g_strdup_printf ("size: %d x %d\n", width, height); - gtk_label_set_text (GTK_LABEL (label), msg); + gtk_label_set_text (label, msg); g_free (msg); } @@ -5124,9 +5131,10 @@ static GtkWidget* window_controls (GtkWidget *window) { GtkWidget *control_window; - GtkWidget *label; + GtkLabel *label; GtkWidget *vbox; GtkWidget *button; + GtkCheckButton *check; GtkWidget *spin; GtkAdjustment *adjustment; @@ -5152,9 +5160,9 @@ window_controls (GtkWidget *window) gtk_container_add (GTK_CONTAINER (control_window), vbox); label = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); - g_signal_connect_after (window, "size-allocate", G_CALLBACK (size_allocate_callback), label); + g_signal_connect_after (window, "size-allocate", G_CALLBACK (size_allocate_callback), GTK_WIDGET (label)); adjustment = gtk_adjustment_new (10.0, -2000.0, 2000.0, 1.0, 5.0, 0.0); spin = gtk_spin_button_new (adjustment, 0, 0); @@ -5213,13 +5221,13 @@ window_controls (GtkWidget *window) control_window); gtk_container_add (GTK_CONTAINER (vbox), button); - button = gtk_check_button_new_with_label ("Allow resize"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_signal_connect (button, + check = gtk_check_button_new_with_label ("Allow resize"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); + g_signal_connect (check, "toggled", G_CALLBACK (resizable_callback), control_window); - gtk_container_add (GTK_CONTAINER (vbox), button); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (check)); button = gtk_button_new_with_mnemonic ("_Show"); g_signal_connect_object (button, @@ -5250,15 +5258,15 @@ create_window_sizing (GtkWidget *widget) if (!target_window) { - GtkWidget *label; + GtkLabel *label; target_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_display (GTK_WINDOW (target_window), gtk_widget_get_display (widget)); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), "Window being resized\nBlah blah blah blah\nblah blah blah\nblah blah blah blah blah"); - gtk_container_add (GTK_CONTAINER (target_window), label); - gtk_widget_show (label); + gtk_label_set_markup (label, "Window being resized\nBlah blah blah blah\nblah blah blah\nblah blah blah blah blah"); + gtk_container_add (GTK_CONTAINER (target_window), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); g_signal_connect (target_window, "destroy", G_CALLBACK (gtk_widget_destroyed), @@ -5295,11 +5303,11 @@ typedef struct _ProgressData { GtkWidget *y_align_spin; GtkWidget *step_spin; GtkWidget *act_blocks_spin; - GtkWidget *label; + GtkLabel *label; GtkWidget *omenu1; GtkWidget *elmenu; GtkWidget *omenu2; - GtkWidget *entry; + GtkEntry *entry; int timer; gboolean activity; } ProgressData; @@ -5327,7 +5335,7 @@ progress_timeout (gpointer data) text = g_strdup_printf ("%.0f%%", 100 * new_val); } - gtk_label_set_text (GTK_LABEL (pdata->label), text); + gtk_label_set_text (pdata->label, text); g_free (text); return TRUE; @@ -5430,10 +5438,10 @@ create_progress_bar (GtkWidget *widget) GtkWidget *vbox; GtkWidget *vbox2; GtkWidget *hbox; - GtkWidget *check; + GtkCheckButton *check; GtkWidget *frame; GtkWidget *grid; - GtkWidget *label; + GtkLabel *label; static ProgressData *pdata = NULL; static gchar *items1[] = @@ -5493,9 +5501,9 @@ create_progress_bar (GtkWidget *widget) gtk_widget_set_valign (hbox, GTK_ALIGN_CENTER); gtk_container_add (GTK_CONTAINER (vbox2), hbox); label = gtk_label_new ("Label updated by user :"); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); pdata->label = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (hbox), pdata->label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (pdata->label)); frame = gtk_frame_new ("Options"); gtk_container_add (GTK_CONTAINER (vbox), frame); @@ -5509,9 +5517,9 @@ create_progress_bar (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (vbox2), grid); label = gtk_label_new ("Orientation :"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); pdata->omenu1 = build_option_menu (items1, 4, 0, progressbar_toggle_orientation, @@ -5522,34 +5530,34 @@ create_progress_bar (GtkWidget *widget) g_signal_connect (check, "toggled", G_CALLBACK (toggle_running), pdata); - gtk_grid_attach (GTK_GRID (grid), check, 0, 1, 2, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check), 0, 1, 2, 1); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); check = gtk_check_button_new_with_label ("Show text"); g_signal_connect (check, "clicked", G_CALLBACK (toggle_show_text), pdata); - gtk_grid_attach (GTK_GRID (grid), check, 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check), 0, 2, 1, 1); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_grid_attach (GTK_GRID (grid), hbox, 1, 2, 1, 1); label = gtk_label_new ("Text: "); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); pdata->entry = gtk_entry_new (); - gtk_widget_set_hexpand (pdata->entry, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (pdata->entry), TRUE); g_signal_connect (pdata->entry, "changed", G_CALLBACK (entry_changed), pdata); - gtk_container_add (GTK_CONTAINER (hbox), pdata->entry); - gtk_widget_set_size_request (pdata->entry, 100, -1); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (pdata->entry)); + gtk_widget_set_size_request (GTK_WIDGET (pdata->entry), 100, -1); label = gtk_label_new ("Ellipsize text :"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 10, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 10, 1, 1); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); pdata->elmenu = build_option_menu (ellipsize_items, sizeof (ellipsize_items) / sizeof (ellipsize_items[0]), 2, // PANGO_ELLIPSIZE_MIDDLE @@ -5560,7 +5568,7 @@ create_progress_bar (GtkWidget *widget) check = gtk_check_button_new_with_label ("Activity mode"); g_signal_connect (check, "clicked", G_CALLBACK (toggle_activity_mode), pdata); - gtk_grid_attach (GTK_GRID (grid), check, 0, 15, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check), 0, 15, 1, 1); gtk_dialog_add_button (GTK_DIALOG (pdata->window), "Close", GTK_RESPONSE_CLOSE); g_signal_connect (pdata->window, "response", @@ -5581,24 +5589,24 @@ create_progress_bar (GtkWidget *widget) static int timer = 0; gint -timeout_test (GtkWidget *label) +timeout_test (GtkLabel *label) { static int count = 0; static char buffer[32]; sprintf (buffer, "count: %d", ++count); - gtk_label_set_text (GTK_LABEL (label), buffer); + gtk_label_set_text (label, buffer); return TRUE; } void start_timeout_test (GtkWidget *widget, - GtkWidget *label) + GtkLabel *label) { if (!timer) { - timer = g_timeout_add (100, (GSourceFunc)timeout_test, label); + timer = g_timeout_add (100, (GSourceFunc)timeout_test, GTK_WIDGET (label)); } } @@ -5628,7 +5636,7 @@ create_timeout_test (GtkWidget *widget) static GtkWidget *window = NULL; GtkWidget *action_area, *content_area; GtkWidget *button; - GtkWidget *label; + GtkLabel *label; if (!window) { @@ -5648,8 +5656,8 @@ create_timeout_test (GtkWidget *widget) label = gtk_label_new ("count: 0"); g_object_set (label, "margin", 10, NULL); - gtk_container_add (GTK_CONTAINER (content_area), label); - gtk_widget_show (label); + gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); button = gtk_button_new_with_label ("close"); g_signal_connect_swapped (button, "clicked", @@ -5696,7 +5704,7 @@ create_mainloop (GtkWidget *widget) { static GtkWidget *window = NULL; GtkWidget *content_area; - GtkWidget *label; + GtkLabel *label; if (!window) { @@ -5716,8 +5724,8 @@ create_mainloop (GtkWidget *widget) label = gtk_label_new ("In recursive main loop..."); g_object_set (label, "margin", 20, NULL); - gtk_container_add (GTK_CONTAINER (content_area), label); - gtk_widget_show (label); + gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET (label)); + gtk_widget_show (GTK_WIDGET (label)); gtk_dialog_add_button (GTK_DIALOG (window), "Leave", @@ -5756,7 +5764,7 @@ hide_native (GtkWidget *button, static void native_response (GtkNativeDialog *self, gint response_id, - GtkWidget *label) + GtkLabel *label) { static int count = 0; char *res; @@ -5810,7 +5818,7 @@ native_response (GtkNativeDialog *self, ++count, response, s->str); - gtk_label_set_text (GTK_LABEL (label), res); + gtk_label_set_text (label, res); g_free (response); g_string_free (s, TRUE); } @@ -5847,9 +5855,9 @@ native_extra_widget_toggle (GtkWidget *checkbutton, if (extra_widget) { - GtkWidget *extra = gtk_check_button_new_with_label ("Extra toggle"); - gtk_widget_show (extra); - gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (native), extra); + GtkCheckButton *extra = gtk_check_button_new_with_label ("Extra toggle"); + gtk_widget_show (GTK_WIDGET (extra)); + gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (native), GTK_WIDGET (extra)); } else { @@ -6011,10 +6019,12 @@ void create_native_dialogs (GtkWidget *widget) { static GtkWidget *window = NULL; - GtkWidget *box, *label; - GtkWidget *show_button, *hide_button, *check_button; + GtkWidget *box; + GtkLabel *label; + GtkWidget *show_button, *hide_button; + GtkCheckButton *check_button; GtkFileChooserNative *native; - GtkWidget *combo; + GtkComboBoxText *combo; if (!window) { @@ -6040,51 +6050,51 @@ create_native_dialogs (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), box); label = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Open"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Save"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Select Folder"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Create Folder"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Save as"); + gtk_combo_box_text_append_text (combo, "Open"); + gtk_combo_box_text_append_text (combo, "Save"); + gtk_combo_box_text_append_text (combo, "Select Folder"); + gtk_combo_box_text_append_text (combo, "Create Folder"); + gtk_combo_box_text_append_text (combo, "Save as"); g_signal_connect (combo, "changed", G_CALLBACK (native_action_changed), native); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), GTK_FILE_CHOOSER_ACTION_OPEN); - gtk_container_add (GTK_CONTAINER (box), combo); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo)); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "No filters"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Pattern filter"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Mimetype filter"); + gtk_combo_box_text_append_text (combo, "No filters"); + gtk_combo_box_text_append_text (combo, "Pattern filter"); + gtk_combo_box_text_append_text (combo, "Mimetype filter"); g_signal_connect (combo, "changed", G_CALLBACK (native_filter_changed), native); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - gtk_container_add (GTK_CONTAINER (box), combo); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo)); check_button = gtk_check_button_new_with_label ("Modal"); g_signal_connect (check_button, "toggled", G_CALLBACK (native_modal_toggle), native); - gtk_container_add (GTK_CONTAINER (box), check_button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (check_button)); check_button = gtk_check_button_new_with_label ("Multiple select"); g_signal_connect (check_button, "toggled", G_CALLBACK (native_multi_select_toggle), native); - gtk_container_add (GTK_CONTAINER (box), check_button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (check_button)); check_button = gtk_check_button_new_with_label ("Confirm overwrite"); g_signal_connect (check_button, "toggled", G_CALLBACK (native_overwrite_confirmation_toggle), native); - gtk_container_add (GTK_CONTAINER (box), check_button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (check_button)); check_button = gtk_check_button_new_with_label ("Extra widget"); g_signal_connect (check_button, "toggled", G_CALLBACK (native_extra_widget_toggle), native); - gtk_container_add (GTK_CONTAINER (box), check_button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (check_button)); show_button = gtk_button_new_with_label ("Show"); hide_button = gtk_button_new_with_label ("Hide"); @@ -6095,7 +6105,7 @@ create_native_dialogs (GtkWidget *widget) /* connect signals */ g_signal_connect (native, "response", - G_CALLBACK (native_response), label); + G_CALLBACK (native_response), GTK_WIDGET (label)); g_signal_connect (show_button, "clicked", G_CALLBACK (show_native), native); g_signal_connect (hide_button, "clicked", @@ -6182,9 +6192,9 @@ create_main_window (void) GtkWidget *box2; GtkWidget *scrolled_window; GtkWidget *button; - GtkWidget *label; + GtkLabel *label; gchar buffer[64]; - GtkWidget *separator; + GtkSeparator *separator; int i; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -6209,8 +6219,8 @@ create_main_window (void) gtk_get_minor_version ()); label = gtk_label_new (buffer); - gtk_container_add (GTK_CONTAINER (box1), label); - gtk_widget_set_name (label, "testgtk-version-label"); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (label)); + gtk_widget_set_name (GTK_WIDGET (label), "testgtk-version-label"); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_widget_set_vexpand (scrolled_window, TRUE); @@ -6237,7 +6247,7 @@ create_main_window (void) } separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box1), separator); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (separator)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_add (GTK_CONTAINER (box1), box2); diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c index 51f5a97a13d5b22ab8b0c9f87dfd03587ddf9f65..92de27253175c983a73968f0226b240bf72abd42 100644 --- a/tests/testheaderbar.c +++ b/tests/testheaderbar.c @@ -19,7 +19,7 @@ static void on_bookmark_clicked (GtkButton *button, gpointer data) { GtkWindow *window = GTK_WINDOW (data); - GtkWidget *chooser; + GtkFileChooserDialog *chooser; chooser = gtk_file_chooser_dialog_new ("File Chooser Test", window, @@ -31,7 +31,7 @@ on_bookmark_clicked (GtkButton *button, gpointer data) g_signal_connect (chooser, "response", G_CALLBACK (gtk_widget_destroy), NULL); - gtk_widget_show (chooser); + gtk_widget_show (GTK_WIDGET (chooser)); } static GtkWidget *header; @@ -74,9 +74,9 @@ static void change_header (GtkButton *button, gpointer data) { GtkWidget *window = GTK_WIDGET (data); - GtkWidget *label; + GtkLabel *label; GtkWidget *widget; - GtkWidget *image; + GtkImage *image; if (button && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) { @@ -85,7 +85,7 @@ change_header (GtkButton *button, gpointer data) gtk_style_context_add_class (gtk_widget_get_style_context (header), "header-bar"); g_object_set (header, "margin", 10, NULL); label = gtk_label_new ("Label"); - gtk_container_add (GTK_CONTAINER (header), label); + gtk_container_add (GTK_CONTAINER (header), GTK_WIDGET (label)); widget = gtk_level_bar_new (); gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.4); gtk_widget_set_hexpand (widget, TRUE); @@ -107,7 +107,7 @@ change_header (GtkButton *button, gpointer data) widget= gtk_button_new (); image = gtk_image_new_from_icon_name ("bookmark-new-symbolic"); g_signal_connect (widget, "clicked", G_CALLBACK (on_bookmark_clicked), window); - gtk_container_add (GTK_CONTAINER (widget), image); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (image)); gtk_header_bar_pack_start (GTK_HEADER_BAR (header), widget); } @@ -120,9 +120,10 @@ main (int argc, char *argv[]) { GtkWidget *window; GtkWidget *box; - GtkWidget *footer; + GtkActionBar *footer; GtkWidget *button; - GtkWidget *content; + GtkToggleButton *toggle; + GtkImage *content; GtkCssProvider *provider; gtk_init (); @@ -144,22 +145,22 @@ main (int argc, char *argv[]) content = gtk_image_new_from_icon_name ("start-here-symbolic"); - gtk_image_set_pixel_size (GTK_IMAGE (content), 512); + gtk_image_set_pixel_size (content, 512); - gtk_container_add (GTK_CONTAINER (box), content); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (content)); footer = gtk_action_bar_new (); - gtk_action_bar_set_center_widget (GTK_ACTION_BAR (footer), gtk_check_button_new_with_label ("Middle")); - button = gtk_toggle_button_new_with_label ("Custom"); - g_signal_connect (button, "clicked", G_CALLBACK (change_header), window); - gtk_action_bar_pack_start (GTK_ACTION_BAR (footer), button); + gtk_action_bar_set_center_widget (footer, GTK_WIDGET (gtk_check_button_new_with_label ("Middle"))); + toggle = gtk_toggle_button_new_with_label ("Custom"); + g_signal_connect (toggle, "clicked", G_CALLBACK (change_header), window); + gtk_action_bar_pack_start (footer, GTK_WIDGET (toggle)); button = gtk_button_new_with_label ("Subtitle"); g_signal_connect (button, "clicked", G_CALLBACK (change_subtitle), NULL); - gtk_action_bar_pack_end (GTK_ACTION_BAR (footer), button); + gtk_action_bar_pack_end (footer, button); button = gtk_button_new_with_label ("Fullscreen"); - gtk_action_bar_pack_end (GTK_ACTION_BAR (footer), button); + gtk_action_bar_pack_end (footer, button); g_signal_connect (button, "clicked", G_CALLBACK (toggle_fullscreen), window); - gtk_container_add (GTK_CONTAINER (box), footer); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (footer)); gtk_widget_show (window); gtk_main (); diff --git a/tests/testicontheme.c b/tests/testicontheme.c index 8b3d4628642d33f17e7f531845d06a8d73b88720..ec4307a55ab7b09cf949bc24e7c12783fd5aa297 100644 --- a/tests/testicontheme.c +++ b/tests/testicontheme.c @@ -92,7 +92,8 @@ main (int argc, char *argv[]) { GError *error; GdkPaintable *paintable; - GtkWidget *window, *image; + GtkWidget *window; + GtkImage *image; if (argc < 4) { @@ -117,9 +118,9 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); image = gtk_image_new (); - gtk_image_set_from_paintable (GTK_IMAGE (image), paintable); + gtk_image_set_from_paintable (image, paintable); g_object_unref (paintable); - gtk_container_add (GTK_CONTAINER (window), image); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (image)); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); @@ -127,7 +128,8 @@ main (int argc, char *argv[]) } else if (strcmp (argv[1], "display-async") == 0) { - GtkWidget *window, *image; + GtkWidget *window; + GtkImage *image; GtkIconInfo *info; if (argc < 4) @@ -145,7 +147,7 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); image = gtk_image_new (); - gtk_container_add (GTK_CONTAINER (window), image); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (image)); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); diff --git a/tests/testinfobar.c b/tests/testinfobar.c index 0fa3163410fadef5c5f05350cfb8c14965bc4e82..6146a0898a5199443eae74e620166eb1838557c5 100644 --- a/tests/testinfobar.c +++ b/tests/testinfobar.c @@ -31,50 +31,52 @@ on_activate (GApplication *application, GtkWidget *box; GtkWidget *info_bar; GtkWidget *widget; + GtkToggleButton *toggle; + GtkComboBoxText *combo; box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); info_bar = gtk_info_bar_new (); gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar))), - gtk_label_new ("Hello!\nI am a GtkInfoBar")); + GTK_WIDGET (gtk_label_new ("Hello!\nI am a GtkInfoBar"))); - widget = gtk_toggle_button_new_with_label ("Toggle :visible"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - g_object_bind_property (widget, "active", + toggle = gtk_toggle_button_new_with_label ("Toggle :visible"); + gtk_toggle_button_set_active (toggle, TRUE); + g_object_bind_property (toggle, "active", info_bar, "visible", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); - gtk_container_add (GTK_CONTAINER (box), widget); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (toggle)); - widget = gtk_toggle_button_new_with_label ("Toggle :revealed"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - g_object_bind_property (widget, "active", + toggle = gtk_toggle_button_new_with_label ("Toggle :revealed"); + gtk_toggle_button_set_active (toggle, TRUE); + g_object_bind_property (toggle, "active", info_bar, "revealed", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); - gtk_container_add (GTK_CONTAINER (box), widget); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (toggle)); - widget = gtk_toggle_button_new_with_label ("Toggle :show-close-button"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - g_object_bind_property (widget, "active", + toggle = gtk_toggle_button_new_with_label ("Toggle :show-close-button"); + gtk_toggle_button_set_active (toggle, TRUE); + g_object_bind_property (toggle, "active", info_bar, "show-close-button", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); - gtk_container_add (GTK_CONTAINER (box), widget); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (toggle)); - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (widget), + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append (combo, NULL, "GTK_MESSAGE_INFO"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (widget), + gtk_combo_box_text_append (combo, NULL, "GTK_MESSAGE_WARNING"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (widget), + gtk_combo_box_text_append (combo, NULL, "GTK_MESSAGE_QUESTION"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (widget), + gtk_combo_box_text_append (combo, NULL, "GTK_MESSAGE_ERROR"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (widget), + gtk_combo_box_text_append (combo, NULL, "GTK_MESSAGE_OTHER"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - g_object_bind_property (widget, "active", + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + g_object_bind_property (combo, "active", info_bar, "message-type", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); - gtk_container_add (GTK_CONTAINER (box), widget); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo)); gtk_container_add (GTK_CONTAINER (box), info_bar); diff --git a/tests/testkineticscrolling.c b/tests/testkineticscrolling.c index cc866e5f51d599fa4a386e2006163019c31695c1..0bab0b4d2f441466f6da60d5cac8f26f9b8c9594 100644 --- a/tests/testkineticscrolling.c +++ b/tests/testkineticscrolling.c @@ -15,7 +15,7 @@ static void kinetic_scrolling (void) { GtkWidget *window, *swindow, *grid; - GtkWidget *label; + GtkLabel *label; GtkWidget *button_grid, *button; GtkWidget *treeview; GtkCellRenderer *renderer; @@ -31,19 +31,19 @@ kinetic_scrolling (void) grid = gtk_grid_new (); label = gtk_label_new ("Non scrollable widget using viewport"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); - gtk_widget_set_hexpand (label, TRUE); - gtk_widget_show (label); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_show (GTK_WIDGET (label)); label = gtk_label_new ("Scrollable widget: TreeView"); - gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1); - gtk_widget_set_hexpand (label, TRUE); - gtk_widget_show (label); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 1, 0, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_show (GTK_WIDGET (label)); label = gtk_label_new ("Scrollable widget: TextView"); - gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 1, 1); - gtk_widget_set_hexpand (label, TRUE); - gtk_widget_show (label); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 2, 0, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_show (GTK_WIDGET (label)); button_grid = gtk_grid_new (); for (i = 0; i < 80; i++) diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c index 255bd1d5235b0685e3ce2f0dc67dcef71fcb155d..f5ec88811bdbcbafddec3b8bbc2e0549aa8ffb9f 100644 --- a/tests/testlevelbar.c +++ b/tests/testlevelbar.c @@ -71,7 +71,7 @@ main (int argc, char *argv[]) GtkWidget *box; GtkWidget *bar; GtkWidget *box2; - GtkWidget *sw; + GtkSwitch *sw; gtk_init (); @@ -86,9 +86,9 @@ main (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (box), bar); box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_container_add (GTK_CONTAINER (box), box2); - gtk_container_add (GTK_CONTAINER (box2), gtk_label_new ("Discrete")); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (gtk_label_new ("Discrete"))); sw = gtk_switch_new (); - gtk_container_add (GTK_CONTAINER (box2), sw); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (sw)); g_signal_connect (sw, "notify::active", G_CALLBACK (toggle), bar); gtk_widget_show (window); diff --git a/tests/testlist.c b/tests/testlist.c index 8e3f8b9007abdf5ef4fbd0f28e187f11c4de6be4..382f583600b5bab59ff1b4b4eeb03a1b049cab27 100644 --- a/tests/testlist.c +++ b/tests/testlist.c @@ -8,7 +8,7 @@ typedef struct _RowClass RowClass; struct _Row { GtkListBoxRow parent_instance; - GtkWidget *label; + GtkLabel *label; gint sort_id; }; @@ -50,8 +50,8 @@ row_new (const gchar* text, gint sort_id) { if (text != NULL) { row->label = gtk_label_new (text); - gtk_container_add (GTK_CONTAINER (row), row->label); - gtk_widget_show (row->label); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (row->label)); + gtk_widget_show (GTK_WIDGET (row->label)); } row->sort_id = sort_id; @@ -62,22 +62,23 @@ row_new (const gchar* text, gint sort_id) { static void update_header_cb (Row *row, Row *before, gpointer data) { - GtkWidget *hbox, *l, *b; + GtkWidget *hbox, *b; + GtkLabel *l; GList *children; if (before == NULL || (row->label != NULL && - strcmp (gtk_label_get_text (GTK_LABEL (row->label)), "blah3") == 0)) + strcmp (gtk_label_get_text (row->label), "blah3") == 0)) { /* Create header if needed */ if (gtk_list_box_row_get_header (GTK_LIST_BOX_ROW (row)) == NULL) { hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); l = gtk_label_new ("Header"); - gtk_container_add (GTK_CONTAINER (hbox), l); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (l)); b = gtk_button_new_with_label ("button"); gtk_container_add (GTK_CONTAINER (hbox), b); - gtk_widget_show (l); + gtk_widget_show (GTK_WIDGET (l)); gtk_widget_show (b); gtk_list_box_row_set_header (GTK_LIST_BOX_ROW (row), hbox); } @@ -114,7 +115,7 @@ filter_cb (Row *row, gpointer data) if (row->label != NULL) { - text = gtk_label_get_text (GTK_LABEL (row->label)); + text = gtk_label_get_text (row->label); return strcmp (text, "blah3") != 0; } @@ -177,14 +178,14 @@ change_clicked_cb (GtkButton *button, { Row *row = data; - if (strcmp (gtk_label_get_text (GTK_LABEL (row->label)), "blah3") == 0) + if (strcmp (gtk_label_get_text (row->label), "blah3") == 0) { - gtk_label_set_text (GTK_LABEL (row->label), "blah5"); + gtk_label_set_text (row->label, "blah5"); row->sort_id = 5; } else { - gtk_label_set_text (GTK_LABEL (row->label), "blah3"); + gtk_label_set_text (row->label, "blah3"); row->sort_id = 3; } gtk_list_box_row_changed (GTK_LIST_BOX_ROW (row)); @@ -251,8 +252,11 @@ int main (int argc, char *argv[]) { GtkCssProvider *provider; - GtkWidget *window, *hbox, *vbox, *list, *row, *row3, *row_vbox, *row_hbox, *l; - GtkWidget *check, *button, *combo, *scrolled; + GtkWidget *window, *hbox, *vbox, *list, *row, *row3, *row_vbox, *row_hbox; + GtkWidget *button, *scrolled; + GtkCheckButton *check; + GtkComboBoxText *combo; + GtkLabel *l; gtk_init (); @@ -273,19 +277,19 @@ main (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (hbox), vbox); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), + gtk_combo_box_text_append_text (combo, "GTK_SELECTION_NONE"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), + gtk_combo_box_text_append_text (combo, "GTK_SELECTION_SINGLE"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), + gtk_combo_box_text_append_text (combo, "GTK_SELECTION_BROWSE"); g_signal_connect (combo, "changed", G_CALLBACK (selection_mode_changed), list); - gtk_container_add (GTK_CONTAINER (vbox), combo); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (combo)); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), gtk_list_box_get_selection_mode (GTK_LIST_BOX (list))); check = gtk_check_button_new_with_label ("single click mode"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gtk_list_box_get_activate_on_single_click (GTK_LIST_BOX (list))); g_signal_connect (check, "toggled", G_CALLBACK (single_click_clicked), list); - gtk_container_add (GTK_CONTAINER (vbox), check); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (check)); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); @@ -308,14 +312,14 @@ main (int argc, char *argv[]) row_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); row_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); l = gtk_label_new ("da box for da man"); - gtk_container_add (GTK_CONTAINER (row_hbox), l); + gtk_container_add (GTK_CONTAINER (row_hbox), GTK_WIDGET (l)); check = gtk_check_button_new (); - gtk_container_add (GTK_CONTAINER (row_hbox), check); + gtk_container_add (GTK_CONTAINER (row_hbox), GTK_WIDGET (check)); button = gtk_button_new_with_label ("ya!"); gtk_container_add (GTK_CONTAINER (row_hbox), button); gtk_container_add (GTK_CONTAINER (row_vbox), row_hbox); check = gtk_check_button_new (); - gtk_container_add (GTK_CONTAINER (row_vbox), check); + gtk_container_add (GTK_CONTAINER (row_vbox), GTK_WIDGET (check)); gtk_container_add (GTK_CONTAINER (row), row_vbox); gtk_container_add (GTK_CONTAINER (list), row); diff --git a/tests/testlist2.c b/tests/testlist2.c index c329f06fe580bbff0cc25b52d5217af463129133..1ef810bcb7f3224f4084b0c4d7e0e78b87c4c343 100644 --- a/tests/testlist2.c +++ b/tests/testlist2.c @@ -70,17 +70,18 @@ add_separator (GtkListBoxRow *row, GtkListBoxRow *before, gpointer data) if (!before) return; - gtk_list_box_row_set_header (row, gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_list_box_row_set_header (row, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); } static GtkWidget * create_row (const gchar *text) { - GtkWidget *row, *label, *button; + GtkWidget *row, *button; + GtkLabel *label; row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); label = gtk_label_new (text); - gtk_container_add (GTK_CONTAINER (row), label); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (label)); button = gtk_button_new_with_label ("x"); gtk_widget_set_hexpand (button, TRUE); gtk_widget_set_halign (button, GTK_ALIGN_END); diff --git a/tests/testlist3.c b/tests/testlist3.c index 59120cc6bbe758154d1235a324e9de794b35fa59..13e56deb4dccf4085b074a462da133f7d9ca0110 100644 --- a/tests/testlist3.c +++ b/tests/testlist3.c @@ -66,7 +66,9 @@ drag_drop (GtkDropTarget *dest, static GtkWidget * create_row (const gchar *text) { - GtkWidget *row, *box, *label, *image; + GtkWidget *row, *box; + GtkImage *image; + GtkLabel *label; GBytes *bytes; GdkContentProvider *content; GdkContentFormats *targets; @@ -79,9 +81,9 @@ create_row (const gchar *text) g_object_set (box, "margin-start", 10, "margin-end", 10, NULL); label = gtk_label_new (text); gtk_container_add (GTK_CONTAINER (row), box); - gtk_widget_set_hexpand (label, TRUE); - gtk_container_add (GTK_CONTAINER (box), label); - gtk_container_add (GTK_CONTAINER (box), image); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (image)); bytes = g_bytes_new (&row, sizeof (gpointer)); content = gdk_content_provider_new_for_bytes ("GTK_LIST_BOX_ROW", bytes); @@ -89,7 +91,7 @@ create_row (const gchar *text) gtk_drag_source_set_content (source, content); gtk_drag_source_set_actions (source, GDK_ACTION_MOVE); g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image); - gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source)); + gtk_widget_add_controller (GTK_WIDGET (image), GTK_EVENT_CONTROLLER (source)); targets = gdk_content_formats_new (entries, 1); dest = gtk_drop_target_new (targets, GDK_ACTION_MOVE); @@ -140,7 +142,9 @@ int main (int argc, char *argv[]) { GtkWidget *window, *list, *sw, *row; - GtkWidget *hbox, *vbox, *combo, *button; + GtkWidget *hbox, *vbox; + GtkCheckButton *button; + GtkComboBoxText *combo; gint i; gchar *text; GtkCssProvider *provider; @@ -176,15 +180,15 @@ main (int argc, char *argv[]) g_object_bind_property (list, "activate-on-single-click", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - gtk_container_add (GTK_CONTAINER (vbox), button); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (button)); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "None"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Single"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Browse"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Multiple"); + gtk_combo_box_text_append_text (combo, "None"); + gtk_combo_box_text_append_text (combo, "Single"); + gtk_combo_box_text_append_text (combo, "Browse"); + gtk_combo_box_text_append_text (combo, "Multiple"); g_signal_connect (combo, "changed", G_CALLBACK (selection_mode_changed), list); - gtk_container_add (GTK_CONTAINER (vbox), combo); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (combo)); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), gtk_list_box_get_selection_mode (GTK_LIST_BOX (list))); for (i = 0; i < 20; i++) diff --git a/tests/testlist4.c b/tests/testlist4.c index 0349458e8bed6239460545195188094831b7c1c3..6c1fb53e4959b269942b64036e87575b69004a00 100644 --- a/tests/testlist4.c +++ b/tests/testlist4.c @@ -67,18 +67,19 @@ add_separator (GtkListBoxRow *row, GtkListBoxRow *before, gpointer data) if (!before) return; - gtk_list_box_row_set_header (row, gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_list_box_row_set_header (row, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); } static GtkWidget * create_row (const gchar *text) { - GtkWidget *row_content, *label; + GtkWidget *row_content; + GtkLabel *label; row_content = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); label = gtk_label_new (text); - gtk_container_add (GTK_CONTAINER (row_content), label); + gtk_container_add (GTK_CONTAINER (row_content), GTK_WIDGET (label)); return row_content; } @@ -86,7 +87,8 @@ create_row (const gchar *text) static void new_window (GApplication *app) { - GtkWidget *window, *grid, *sw, *list, *label; + GtkWidget *window, *grid, *sw, *list; + GtkLabel *label; GSimpleAction *action; GtkWidget *row_content; @@ -112,7 +114,7 @@ new_window (GApplication *app) gtk_container_add (GTK_CONTAINER (sw), list); label = gtk_label_new ("No row activated"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 1, 1, 1); /* no parameter action row */ action = g_simple_action_new ("first-row-action", NULL); diff --git a/tests/testlockbutton.c b/tests/testlockbutton.c index 732f8bdbd1b92bc4319053d76c2cbbe96e573c71..9e25baebb75cd43dbe0cbe66f878d6da83c06fde 100644 --- a/tests/testlockbutton.c +++ b/tests/testlockbutton.c @@ -165,10 +165,10 @@ g_test_permission_set_success (GTestPermission *permission, permission->success = success; } -static GtkWidget *allowed_button; -static GtkWidget *can_acquire_button; -static GtkWidget *can_release_button; -static GtkWidget *success_button; +static GtkCheckButton *allowed_button; +static GtkCheckButton *can_acquire_button; +static GtkCheckButton *can_release_button; +static GtkCheckButton *success_button; static void update_clicked (GtkButton *button, GtkLockButton *lockbutton) @@ -229,13 +229,13 @@ main (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (window), box); allowed_button = gtk_check_button_new_with_label ("Allowed"); - gtk_container_add (GTK_CONTAINER (box), allowed_button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (allowed_button)); can_acquire_button = gtk_check_button_new_with_label ("Can acquire"); - gtk_container_add (GTK_CONTAINER (box), can_acquire_button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (can_acquire_button)); can_release_button = gtk_check_button_new_with_label ("Can release"); - gtk_container_add (GTK_CONTAINER (box), can_release_button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (can_release_button)); success_button = gtk_check_button_new_with_label ("Will succeed"); - gtk_container_add (GTK_CONTAINER (box), success_button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (success_button)); update = gtk_button_new_with_label ("Update"); gtk_container_add (GTK_CONTAINER (box), update); g_signal_connect (permission, "notify", @@ -253,8 +253,8 @@ main (int argc, char *argv[]) gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); content = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_container_add (GTK_CONTAINER (content), gtk_check_button_new_with_label ("Control 1")); - gtk_container_add (GTK_CONTAINER (content), gtk_check_button_new_with_label ("Control 2")); + gtk_container_add (GTK_CONTAINER (content), GTK_WIDGET (gtk_check_button_new_with_label ("Control 1"))); + gtk_container_add (GTK_CONTAINER (content), GTK_WIDGET (gtk_check_button_new_with_label ("Control 2"))); gtk_widget_set_sensitive (content, FALSE); gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), content); diff --git a/tests/testlogout.c b/tests/testlogout.c index 78236e82ff43ffc4cbbb6b28e2c8e77cb5e3992b..44898137b05279a863c5fdd8d4b15035441ec4be 100644 --- a/tests/testlogout.c +++ b/tests/testlogout.c @@ -1,12 +1,12 @@ #include static GtkWidget *win; -static GtkWidget *inhibit_entry; -static GtkWidget *inhibit_logout; -static GtkWidget *inhibit_switch; -static GtkWidget *inhibit_suspend; -static GtkWidget *inhibit_idle; -static GtkWidget *inhibit_label; +static GtkEntry *inhibit_entry; +static GtkCheckButton *inhibit_logout; +static GtkCheckButton *inhibit_switch; +static GtkCheckButton *inhibit_suspend; +static GtkCheckButton *inhibit_idle; +static GtkLabel *inhibit_label; static void inhibitor_toggled (GtkToggleButton *button, GtkApplication *app) @@ -50,7 +50,7 @@ inhibitor_toggled (GtkToggleButton *button, GtkApplication *app) else { text = g_strdup_printf ("%#x", cookie); - gtk_label_set_label (GTK_LABEL (inhibit_label), text); + gtk_label_set_label (inhibit_label, text); g_free (text); } } @@ -59,14 +59,14 @@ inhibitor_toggled (GtkToggleButton *button, GtkApplication *app) cookie = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (button), "cookie")); g_print ("Calling gtk_application_uninhibit: %#x\n", cookie); gtk_application_uninhibit (app, cookie); - gtk_label_set_label (GTK_LABEL (inhibit_label), ""); + gtk_label_set_label (inhibit_label, ""); } - gtk_widget_set_sensitive (inhibit_entry, !active); - gtk_widget_set_sensitive (inhibit_logout, !active); - gtk_widget_set_sensitive (inhibit_switch, !active); - gtk_widget_set_sensitive (inhibit_suspend, !active); - gtk_widget_set_sensitive (inhibit_idle, !active); + gtk_widget_set_sensitive (GTK_WIDGET (inhibit_entry), !active); + gtk_widget_set_sensitive (GTK_WIDGET (inhibit_logout), !active); + gtk_widget_set_sensitive (GTK_WIDGET (inhibit_switch), !active); + gtk_widget_set_sensitive (GTK_WIDGET (inhibit_suspend), !active); + gtk_widget_set_sensitive (GTK_WIDGET (inhibit_idle), !active); } static void @@ -74,10 +74,10 @@ activate (GtkApplication *app, gpointer data) { GtkWidget *box; - GtkWidget *separator; + GtkSeparator *separator; GtkWidget *grid; - GtkWidget *button; - GtkWidget *label; + GtkToggleButton *button; + GtkLabel *label; win = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -92,33 +92,33 @@ activate (GtkApplication *app, gtk_container_add (GTK_CONTAINER (box), grid); label = gtk_label_new ("Inhibitor"); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); inhibit_label = gtk_label_new (""); - gtk_grid_attach (GTK_GRID (grid), inhibit_label, 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (inhibit_label), 1, 0, 1, 1); inhibit_logout = gtk_check_button_new_with_label ("Logout"); - gtk_grid_attach (GTK_GRID (grid), inhibit_logout, 1, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (inhibit_logout), 1, 1, 1, 1); inhibit_switch = gtk_check_button_new_with_label ("User switching"); - gtk_grid_attach (GTK_GRID (grid), inhibit_switch, 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (inhibit_switch), 1, 2, 1, 1); inhibit_suspend = gtk_check_button_new_with_label ("Suspend"); - gtk_grid_attach (GTK_GRID (grid), inhibit_suspend, 1, 4, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (inhibit_suspend), 1, 4, 1, 1); inhibit_idle = gtk_check_button_new_with_label ("Idle"); - gtk_grid_attach (GTK_GRID (grid), inhibit_idle, 1, 5, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (inhibit_idle), 1, 5, 1, 1); inhibit_entry = gtk_entry_new (); - gtk_grid_attach (GTK_GRID (grid), inhibit_entry, 1, 6, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (inhibit_entry), 1, 6, 1, 1); button = gtk_toggle_button_new_with_label ("Inhibit"); g_signal_connect (button, "toggled", G_CALLBACK (inhibitor_toggled), app); - gtk_grid_attach (GTK_GRID (grid), button, 2, 6, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (button), 2, 6, 1, 1); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_container_add (GTK_CONTAINER (box), separator); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (separator)); grid = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (grid), 6); diff --git a/tests/testmenubutton.c b/tests/testmenubutton.c index 7e3d945b73e364d5fa2892721d3193c64bf24297..756e5f3f3812cd2806b0947a6271e90f0a690394 100644 --- a/tests/testmenubutton.c +++ b/tests/testmenubutton.c @@ -36,10 +36,10 @@ int main (int argc, char **argv) GtkWidget *window; GtkWidget *button; GtkWidget *grid; - GtkWidget *entry; - GtkWidget *label; - GtkWidget *check; - GtkWidget *combo; + GtkEntry *entry; + GtkLabel *label; + GtkCheckButton *check; + GtkComboBoxText *combo; GtkAccelGroup *accel_group; guint i; guint row = 0; @@ -60,50 +60,50 @@ int main (int argc, char **argv) /* horizontal alignment */ label = gtk_label_new ("Horizontal Alignment:"); - gtk_widget_show (label); - gtk_grid_attach (GTK_GRID (grid), label, 0, row++, 1, 1); + gtk_widget_show (GTK_WIDGET (label)); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, row++, 1, 1); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Fill"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Start"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "End"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Center"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Baseline"); + gtk_combo_box_text_append_text (combo, "Fill"); + gtk_combo_box_text_append_text (combo, "Start"); + gtk_combo_box_text_append_text (combo, "End"); + gtk_combo_box_text_append_text (combo, "Center"); + gtk_combo_box_text_append_text (combo, "Baseline"); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), INITIAL_HALIGN); - gtk_widget_show (combo); - gtk_grid_attach_next_to (GTK_GRID (grid), combo, label, GTK_POS_RIGHT, 1, 1); + gtk_widget_show (GTK_WIDGET (combo)); + gtk_grid_attach_next_to (GTK_GRID (grid), GTK_WIDGET (combo), GTK_WIDGET (label), GTK_POS_RIGHT, 1, 1); g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (horizontal_alignment_changed), menubuttons); /* vertical alignment */ label = gtk_label_new ("Vertical Alignment:"); - gtk_widget_show (label); - gtk_grid_attach (GTK_GRID (grid), label, 0, row++, 1, 1); + gtk_widget_show (GTK_WIDGET (label)); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, row++, 1, 1); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Fill"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Start"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "End"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Center"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Baseline"); + gtk_combo_box_text_append_text (combo, "Fill"); + gtk_combo_box_text_append_text (combo, "Start"); + gtk_combo_box_text_append_text (combo, "End"); + gtk_combo_box_text_append_text (combo, "Center"); + gtk_combo_box_text_append_text (combo, "Baseline"); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), INITIAL_HALIGN); - gtk_widget_show (combo); - gtk_grid_attach_next_to (GTK_GRID (grid), combo, label, GTK_POS_RIGHT, 1, 1); + gtk_widget_show (GTK_WIDGET (combo)); + gtk_grid_attach_next_to (GTK_GRID (grid), GTK_WIDGET (combo), GTK_WIDGET (label), GTK_POS_RIGHT, 1, 1); g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (vertical_alignment_changed), menubuttons); /* Button next to entry */ entry = gtk_entry_new (); - gtk_grid_attach (GTK_GRID (grid), entry, 0, row++, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (entry), 0, row++, 1, 1); button = gtk_menu_button_new (); gtk_widget_set_halign (button, GTK_ALIGN_START); - gtk_grid_attach_next_to (GTK_GRID (grid), button, entry, GTK_POS_RIGHT, 1, 1); + gtk_grid_attach_next_to (GTK_GRID (grid), button, GTK_WIDGET (entry), GTK_POS_RIGHT, 1, 1); menubuttons = g_list_prepend (menubuttons, button); check = gtk_check_button_new_with_label ("Popover"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); - gtk_grid_attach (GTK_GRID (grid), check, 0, row, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check), 0, row, 1, 1); /* Button with GMenuModel */ menu = g_menu_new (); diff --git a/tests/testmodelbutton.c b/tests/testmodelbutton.c index bea494faa6cddb5a966a8a36ccee424668af3c1c..a9bf2f37f4f36a78925c50c6d2a3a6a1d4822451 100644 --- a/tests/testmodelbutton.c +++ b/tests/testmodelbutton.c @@ -22,6 +22,8 @@ on_application_activate (GApplication *gapplication, GtkWidget *box; GIcon *gicon; GtkWidget *model_button; + GtkComboBoxText *combo; + GtkToggleButton *toggle; GtkWidget *widget; gtk_css_provider_load_from_data (css_provider, @@ -56,24 +58,24 @@ on_application_activate (GApplication *gapplication, g_object_unref (gicon); - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (widget), + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append (combo, NULL, "GTK_BUTTON_ROLE_NORMAL"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (widget), + gtk_combo_box_text_append (combo, NULL, "GTK_BUTTON_ROLE_CHECK"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (widget), + gtk_combo_box_text_append (combo, NULL, "GTK_BUTTON_ROLE_RADIO"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - g_object_bind_property (widget, "active", + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + g_object_bind_property (combo, "active", model_button, "role", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); - gtk_container_add (GTK_CONTAINER (box), widget); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo)); - widget = gtk_toggle_button_new_with_label (":iconic"); - g_object_bind_property (widget, "active", + toggle = gtk_toggle_button_new_with_label (":iconic"); + g_object_bind_property (toggle, "active", model_button, "iconic", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); - gtk_container_add (GTK_CONTAINER (box), widget); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (toggle)); widget = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_container_add (GTK_CONTAINER (widget), box); diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c index fe99dfc21db10be6ac587cd71ba28ed56d09abf7..487497a924e37182961eb185850b1e834d4e0ae3 100644 --- a/tests/testnotebookdnd.c +++ b/tests/testnotebookdnd.c @@ -150,16 +150,17 @@ static void action_clicked_cb (GtkWidget *button, GtkWidget *notebook) { - GtkWidget *page, *title; + GtkEntry *page; + GtkLabel *title; page = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (page), "Addition"); title = gtk_label_new ("Addition"); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, title); - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), page, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (notebook), page, TRUE); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), GTK_WIDGET (page), GTK_WIDGET (title)); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), GTK_WIDGET (page), TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (notebook), GTK_WIDGET (page), TRUE); } static GtkWidget* @@ -167,7 +168,9 @@ create_notebook (gchar **labels, const gchar *group, GtkPositionType pos) { - GtkWidget *notebook, *title, *page, *action_widget; + GtkWidget *notebook, *action_widget; + GtkEntry *page; + GtkLabel *title; notebook = gtk_notebook_new (); gtk_widget_set_vexpand (notebook, TRUE); @@ -191,9 +194,9 @@ create_notebook (gchar **labels, title = gtk_label_new (*labels); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, title); - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), page, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (notebook), page, TRUE); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), GTK_WIDGET (page), GTK_WIDGET (title)); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), GTK_WIDGET (page), TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (notebook), GTK_WIDGET (page), TRUE); labels++; } @@ -208,7 +211,8 @@ create_notebook_non_dragable_content (gchar **labels, const gchar *group, GtkPositionType pos) { - GtkWidget *notebook, *title, *page, *action_widget; + GtkWidget *notebook, *page, *action_widget; + GtkLabel *title; notebook = gtk_notebook_new (); gtk_widget_set_vexpand (notebook, TRUE); @@ -242,7 +246,7 @@ create_notebook_non_dragable_content (gchar **labels, title = gtk_label_new (*labels); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, title); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, GTK_WIDGET (title)); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), page, TRUE); gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (notebook), page, TRUE); @@ -259,7 +263,8 @@ create_notebook_with_notebooks (gchar **labels, const gchar *group, GtkPositionType pos) { - GtkWidget *notebook, *title, *page; + GtkWidget *notebook, *page; + GtkLabel *title; gint count = 0; notebook = gtk_notebook_new (); @@ -277,7 +282,7 @@ create_notebook_with_notebooks (gchar **labels, title = gtk_label_new (*labels); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, title); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, GTK_WIDGET (title)); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), page, TRUE); gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (notebook), page, TRUE); diff --git a/tests/testorientable.c b/tests/testorientable.c index c002eebd9636e872911646bcfd5b3da82c8aed0c..cce5d299c3f351ad03e45d25f804a2e5115990b5 100644 --- a/tests/testorientable.c +++ b/tests/testorientable.c @@ -48,7 +48,9 @@ main (int argc, char **argv) { GtkWidget *window; GtkWidget *grid; - GtkWidget *box, *button; + GtkWidget *box; + GtkToggleButton *button; + GtkSeparator *separator; GList *orientables = NULL; gtk_init (); @@ -70,12 +72,12 @@ main (int argc, char **argv) gtk_button_new_with_label ("GtkBox 3")); /* GtkSeparator */ - box = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - orientables = g_list_prepend (orientables, box); - gtk_grid_attach (GTK_GRID (grid), box, 2, 1, 1, 1); + separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + orientables = g_list_prepend (orientables, separator); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (separator), 2, 1, 1, 1); button = gtk_toggle_button_new_with_label ("Horizontal"); - gtk_grid_attach (GTK_GRID (grid), button, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (button), 0, 0, 1, 1); g_signal_connect (button, "toggled", G_CALLBACK (orient_toggled), orientables); diff --git a/tests/testoverlay.c b/tests/testoverlay.c index b73b0fc7839fac692e853c10fe7f5bd7715228c7..1cf8ae2dc421f17f4c51ada7fdb5763b8adefd86 100644 --- a/tests/testoverlay.c +++ b/tests/testoverlay.c @@ -39,7 +39,7 @@ test_nonzerox (void) GtkWidget *grid; GtkWidget *overlay; GtkWidget *text; - GtkWidget *child; + GtkLabel *child; win = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (win), "Non-zero X"); @@ -47,10 +47,10 @@ test_nonzerox (void) grid = gtk_grid_new (); g_object_set (grid, "margin", 5, NULL); gtk_container_add (GTK_CONTAINER (win), grid); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Above"), 1, 0, 1, 1); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Below"), 1, 2, 1, 1); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Left"), 0, 1, 1, 1); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Right"), 2, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Above")), 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Below")), 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Left")), 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Right")), 2, 1, 1, 1); overlay = gtk_overlay_new (); gtk_grid_attach (GTK_GRID (grid), overlay, 1, 1, 1, 1); @@ -62,15 +62,15 @@ test_nonzerox (void) gtk_container_add (GTK_CONTAINER (overlay), text); child = gtk_label_new ("I'm the overlay"); - gtk_widget_set_halign (child, GTK_ALIGN_START); - gtk_widget_set_valign (child, GTK_ALIGN_START); + gtk_widget_set_halign (GTK_WIDGET (child), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (child), GTK_ALIGN_START); g_object_set (child, "margin", 3, NULL); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (child)); child = gtk_label_new ("No, I'm the overlay"); - gtk_widget_set_halign (child, GTK_ALIGN_END); - gtk_widget_set_valign (child, GTK_ALIGN_END); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + gtk_widget_set_halign (GTK_WIDGET (child), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (child), GTK_ALIGN_END); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (child)); g_object_set (child, "margin", 3, NULL); return win; @@ -118,7 +118,7 @@ test_relative (void) GtkWidget *grid; GtkWidget *overlay; GtkWidget *text; - GtkWidget *child; + GtkLabel *child; win = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (win), "Custom positioning"); @@ -128,10 +128,10 @@ test_relative (void) grid = gtk_grid_new (); gtk_container_add (GTK_CONTAINER (overlay), grid); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Above"), 1, 0, 1, 1); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Below"), 1, 2, 1, 1); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Left"), 0, 1, 1, 1); - gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Right"), 2, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Above")), 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Below")), 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Left")), 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gtk_label_new ("Right")), 2, 1, 1, 1); text = gtk_text_view_new (); gtk_widget_set_size_request (text, 200, 200); @@ -143,15 +143,15 @@ test_relative (void) G_CALLBACK (get_child_position), text); child = gtk_label_new ("Top left overlay"); - gtk_widget_set_halign (child, GTK_ALIGN_START); - gtk_widget_set_valign (child, GTK_ALIGN_START); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + gtk_widget_set_halign (GTK_WIDGET (child), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (child), GTK_ALIGN_START); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (child)); g_object_set (child, "margin", 1, NULL); child = gtk_label_new ("Bottom right overlay"); - gtk_widget_set_halign (child, GTK_ALIGN_END); - gtk_widget_set_valign (child, GTK_ALIGN_END); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + gtk_widget_set_halign (GTK_WIDGET (child), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (child), GTK_ALIGN_END); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (child)); g_object_set (child, "margin", 1, NULL); return win; @@ -164,7 +164,7 @@ test_fullwidth (void) GtkWidget *win; GtkWidget *overlay; GtkWidget *text; - GtkWidget *child; + GtkLabel *child; win = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (win), "Full-width"); @@ -179,9 +179,9 @@ test_fullwidth (void) gtk_container_add (GTK_CONTAINER (overlay), text); child = gtk_label_new ("Fullwidth top overlay"); - gtk_widget_set_halign (child, GTK_ALIGN_FILL); - gtk_widget_set_valign (child, GTK_ALIGN_START); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + gtk_widget_set_halign (GTK_WIDGET (child), GTK_ALIGN_FILL); + gtk_widget_set_valign (GTK_WIDGET (child), GTK_ALIGN_START); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (child)); g_object_set (child, "margin", 4, NULL); return win; @@ -195,7 +195,7 @@ test_scrolling (void) GtkWidget *overlay; GtkWidget *sw; GtkWidget *text; - GtkWidget *child; + GtkLabel *child; GtkTextBuffer *buffer; gchar *contents; gsize len; @@ -227,9 +227,9 @@ test_scrolling (void) gtk_container_add (GTK_CONTAINER (sw), text); child = gtk_label_new ("This should be visible"); - gtk_widget_set_halign (child, GTK_ALIGN_CENTER); - gtk_widget_set_valign (child, GTK_ALIGN_END); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + gtk_widget_set_halign (GTK_WIDGET (child), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (child), GTK_ALIGN_END); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (child)); g_object_set (child, "margin", 4, NULL); return win; @@ -337,7 +337,7 @@ test_chase (void) GtkWidget *overlay; GtkWidget *sw; GtkWidget *text; - GtkWidget *child; + GtkLabel *child; GtkTextBuffer *buffer; gchar *contents; gsize len; @@ -370,14 +370,14 @@ test_chase (void) gtk_container_add (GTK_CONTAINER (sw), text); child = gtk_label_new ("Try to enter"); - gtk_widget_set_halign (child, GTK_ALIGN_START); - gtk_widget_set_valign (child, GTK_ALIGN_END); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + gtk_widget_set_halign (GTK_WIDGET (child), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (child), GTK_ALIGN_END); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (child)); g_object_set (child, "margin", 4, NULL); controller = gtk_event_controller_motion_new (); g_signal_connect (controller, "enter", G_CALLBACK (on_enter), overlay); - gtk_widget_add_controller (child, controller); + gtk_widget_add_controller (GTK_WIDGET (child), controller); return win; } @@ -388,11 +388,11 @@ test_stacking (void) GtkWidget *win; GtkWidget *overlay; GtkWidget *main_child; - GtkWidget *label; - GtkWidget *child; + GtkLabel *label; + GtkLabel *child; GtkWidget *grid; - GtkWidget *check1; - GtkWidget *check2; + GtkCheckButton *check1; + GtkCheckButton *check2; win = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (win), "Stacking"); @@ -405,25 +405,25 @@ test_stacking (void) gtk_widget_set_vexpand (main_child, TRUE); label = gtk_label_new ("Main child"); child = gtk_label_new ("Overlay"); - gtk_widget_set_halign (child, GTK_ALIGN_END); - gtk_widget_set_valign (child, GTK_ALIGN_END); + gtk_widget_set_halign (GTK_WIDGET (child), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (child), GTK_ALIGN_END); check1 = gtk_check_button_new_with_label ("Show main"); g_object_bind_property (main_child, "visible", check1, "active", G_BINDING_BIDIRECTIONAL); check2 = gtk_check_button_new_with_label ("Show overlay"); - g_object_bind_property (child, "visible", check2, "active", G_BINDING_BIDIRECTIONAL); - gtk_container_add (GTK_CONTAINER (main_child), label); + g_object_bind_property (GTK_WIDGET (child), "visible", check2, "active", G_BINDING_BIDIRECTIONAL); + gtk_container_add (GTK_CONTAINER (main_child), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (overlay), main_child); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (child)); gtk_grid_attach (GTK_GRID (grid), overlay, 1, 0, 1, 3); gtk_container_add (GTK_CONTAINER (win), grid); - gtk_grid_attach (GTK_GRID (grid), check1, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (grid), check2, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check1), 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check2), 0, 1, 1, 1); child = gtk_label_new (""); - gtk_widget_set_vexpand (child, TRUE); - gtk_grid_attach (GTK_GRID (grid), child, 0, 2, 1, 1); + gtk_widget_set_vexpand (GTK_WIDGET (child), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (child), 0, 2, 1, 1); return win; } @@ -433,7 +433,8 @@ test_input_stacking (void) { GtkWidget *win; GtkWidget *overlay; - GtkWidget *label, *entry; + GtkLabel *label; + GtkEntry *entry; GtkWidget *grid; GtkWidget *button; GtkWidget *vbox; @@ -466,14 +467,14 @@ test_input_stacking (void) label = gtk_label_new ("This is some overlaid text\n" "It does not get input\n" "But the entry does"); - gtk_widget_set_margin_top (label, 8); - gtk_widget_set_margin_bottom (label, 8); - gtk_container_add (GTK_CONTAINER (vbox), label); + gtk_widget_set_margin_top (GTK_WIDGET (label), 8); + gtk_widget_set_margin_bottom (GTK_WIDGET (label), 8); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (label)); entry = gtk_entry_new (); - gtk_widget_set_margin_top (entry, 8); - gtk_widget_set_margin_bottom (entry, 8); - gtk_container_add (GTK_CONTAINER (vbox), entry); + gtk_widget_set_margin_top (GTK_WIDGET (entry), 8); + gtk_widget_set_margin_bottom (GTK_WIDGET (entry), 8); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (entry)); gtk_container_add (GTK_CONTAINER (win), overlay); diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c index 37a857d2653224c6b7abf92b87d2a1f6c9dcd56d..a2d737dbf272ed6a09081071e769ad2fbf1c978f 100644 --- a/tests/testoverlaystyleclass.c +++ b/tests/testoverlaystyleclass.c @@ -42,7 +42,8 @@ overlay_get_child_position (GtkOverlay *overlay, int main (int argc, char *argv[]) { - GtkWidget *win, *overlay, *grid, *main_child, *child, *label, *sw; + GtkWidget *win, *overlay, *grid, *main_child, *sw; + GtkLabel *label; GtkCssProvider *provider; gchar *str; @@ -65,9 +66,9 @@ main (int argc, char *argv[]) grid = gtk_grid_new (); label = gtk_label_new ("Out of overlay"); - gtk_widget_set_hexpand (label, TRUE); - gtk_widget_set_vexpand (label, TRUE); - gtk_container_add (GTK_CONTAINER (grid), label); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (grid), GTK_WIDGET (label)); overlay = gtk_overlay_new (); sw = gtk_scrolled_window_new (NULL, NULL); @@ -81,73 +82,73 @@ main (int argc, char *argv[]) gtk_widget_set_hexpand (main_child, TRUE); gtk_widget_set_vexpand (main_child, TRUE); label = gtk_label_new ("Main child"); - gtk_widget_set_halign (label, GTK_ALIGN_CENTER); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (main_child), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (main_child), GTK_WIDGET (label)); - child = gtk_label_new (NULL); - str = g_strdup_printf ("%p", child); - gtk_label_set_text (GTK_LABEL (child), str); + label = gtk_label_new (NULL); + str = g_strdup_printf ("%p", label); + gtk_label_set_text (GTK_LABEL (label), str); g_free (str); - g_print ("Bottom/Right child: %p\n", child); - gtk_widget_set_halign (child, GTK_ALIGN_END); - gtk_widget_set_valign (child, GTK_ALIGN_END); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + g_print ("Bottom/Right child: %p\n", GTK_WIDGET (label)); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_END); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (label)); - g_signal_connect (child, "size-allocate", + g_signal_connect (label, "size-allocate", G_CALLBACK (child_size_allocate), overlay); - child = gtk_label_new (NULL); - str = g_strdup_printf ("%p", child); - gtk_label_set_text (GTK_LABEL (child), str); + label = gtk_label_new (NULL); + str = g_strdup_printf ("%p", label); + gtk_label_set_text (GTK_LABEL (label), str); g_free (str); - g_print ("Left/Top child: %p\n", child); - gtk_widget_set_halign (child, GTK_ALIGN_START); - gtk_widget_set_valign (child, GTK_ALIGN_START); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + g_print ("Left/Top label: %p\n", label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (label)); - g_signal_connect (child, "size-allocate", + g_signal_connect (label, "size-allocate", G_CALLBACK (child_size_allocate), overlay); - child = gtk_label_new (NULL); - str = g_strdup_printf ("%p", child); - gtk_label_set_text (GTK_LABEL (child), str); + label = gtk_label_new (NULL); + str = g_strdup_printf ("%p", label); + gtk_label_set_text (GTK_LABEL (label), str); g_free (str); - g_print ("Right/Center child: %p\n", child); - gtk_widget_set_halign (child, GTK_ALIGN_END); - gtk_widget_set_valign (child, GTK_ALIGN_CENTER); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + g_print ("Right/Center label: %p\n", label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_END); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (label)); - g_signal_connect (child, "size-allocate", + g_signal_connect (label, "size-allocate", G_CALLBACK (child_size_allocate), overlay); - child = gtk_label_new (NULL); - str = g_strdup_printf ("%p", child); - gtk_label_set_text (GTK_LABEL (child), str); + label = gtk_label_new (NULL); + str = g_strdup_printf ("%p", label); + gtk_label_set_text (GTK_LABEL (label), str); g_free (str); - gtk_widget_set_margin_start (child, 55); - gtk_widget_set_margin_top (child, 4); - g_print ("Left/Top margined child: %p\n", child); - gtk_widget_set_halign (child, GTK_ALIGN_START); - gtk_widget_set_valign (child, GTK_ALIGN_START); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); - - g_signal_connect (child, "size-allocate", + gtk_widget_set_margin_start (GTK_WIDGET (label), 55); + gtk_widget_set_margin_top (GTK_WIDGET (label), 4); + g_print ("Left/Top margined label: %p\n", label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (label)); + + g_signal_connect (label, "size-allocate", G_CALLBACK (child_size_allocate), overlay); - child = gtk_label_new (NULL); - str = g_strdup_printf ("%p", child); - gtk_label_set_text (GTK_LABEL (child), str); + label = gtk_label_new (NULL); + str = g_strdup_printf ("%p", label); + gtk_label_set_text (GTK_LABEL (label), str); g_free (str); - g_print ("Custom get-child-position child: %p\n", child); - gtk_widget_set_halign (child, GTK_ALIGN_START); - gtk_widget_set_valign (child, GTK_ALIGN_START); - gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child); + g_print ("Custom get-label-position label: %p\n", label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), GTK_WIDGET (label)); - g_signal_connect (child, "size-allocate", + g_signal_connect (label, "size-allocate", G_CALLBACK (child_size_allocate), overlay); g_signal_connect (overlay, "get-child-position", - G_CALLBACK (overlay_get_child_position), child); + G_CALLBACK (overlay_get_child_position), label); gtk_grid_attach (GTK_GRID (grid), overlay, 1, 0, 1, 3); gtk_container_add (GTK_CONTAINER (win), grid); diff --git a/tests/testpixbuf-scale.c b/tests/testpixbuf-scale.c index 5e48ef8bd132d96770bb47fda95921eb939699ef..6338a7425918a757138b3957550617c6390ecdea 100644 --- a/tests/testpixbuf-scale.c +++ b/tests/testpixbuf-scale.c @@ -60,8 +60,9 @@ int main(int argc, char **argv) { GtkWidget *window, *vbox; - GtkWidget *combo_box; - GtkWidget *hbox, *label, *hscale; + GtkComboBoxText *combo_box; + GtkWidget *hbox,*hscale; + GtkLabel *label; GtkAdjustment *adjustment; GtkRequisition scratch_requisition; const gchar *creator; @@ -96,10 +97,10 @@ main(int argc, char **argv) combo_box = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "NEAREST"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "BILINEAR"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "TILES"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "HYPER"); + gtk_combo_box_text_append_text (combo_box, "NEAREST"); + gtk_combo_box_text_append_text (combo_box, "BILINEAR"); + gtk_combo_box_text_append_text (combo_box, "TILES"); + gtk_combo_box_text_append_text (combo_box, "HYPER"); gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1); @@ -107,14 +108,14 @@ main(int argc, char **argv) G_CALLBACK (set_interp_type), NULL); - gtk_widget_set_halign (combo_box, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (vbox), combo_box); + gtk_widget_set_halign (GTK_WIDGET (combo_box), GTK_ALIGN_START); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (combo_box)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_container_add (GTK_CONTAINER (vbox), hbox); label = gtk_label_new ("Overall Alpha:"); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); adjustment = gtk_adjustment_new (overall_alpha, 0, 255, 1, 10, 0); g_signal_connect (adjustment, "value_changed", diff --git a/tests/testpopover.c b/tests/testpopover.c index 7927362d57340e41f08c72bcd95291427d4de8cb..46c6f1be1d12b4004c707236da8238b7407e0101 100644 --- a/tests/testpopover.c +++ b/tests/testpopover.c @@ -47,9 +47,9 @@ main (int argc, char *argv[]) GtkWidget *popover; GtkWidget *popover1; GtkWidget *popover2; - GtkWidget *label; - GtkWidget *check; - GtkWidget *combo; + GtkLabel *label; + GtkCheckButton *check; + GtkComboBoxText *combo; GtkWidget *header_bar; #ifdef GTK_SRCDIR @@ -80,14 +80,14 @@ main (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (overlay), grid); label = gtk_label_new (""); - gtk_widget_set_hexpand (label, TRUE); - gtk_widget_set_vexpand (label, TRUE); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (label), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); label = gtk_label_new (""); - gtk_widget_set_hexpand (label, TRUE); - gtk_widget_set_vexpand (label, TRUE); - gtk_grid_attach (GTK_GRID (grid), label, 3, 6, 1, 1); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (label), TRUE); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 3, 6, 1, 1); builder = gtk_builder_new_from_file ("popover.ui"); model = (GMenuModel *)gtk_builder_get_object (builder, "menu"); @@ -119,51 +119,51 @@ main (int argc, char *argv[]) g_object_bind_property (check, "active", popover, "hexpand", G_BINDING_SYNC_CREATE); g_object_bind_property (check, "active", popover1, "hexpand", G_BINDING_SYNC_CREATE); g_object_bind_property (check, "active", popover2, "hexpand", G_BINDING_SYNC_CREATE); - gtk_grid_attach (GTK_GRID (grid), label , 1, 1, 1, 1); - gtk_grid_attach (GTK_GRID (grid), check, 2, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label) , 1, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check), 2, 1, 1, 1); label = gtk_label_new ("Popover vexpand"); check = gtk_check_button_new (); g_object_bind_property (check, "active", popover, "vexpand", G_BINDING_SYNC_CREATE); g_object_bind_property (check, "active", popover1, "vexpand", G_BINDING_SYNC_CREATE); g_object_bind_property (check, "active", popover2, "vexpand", G_BINDING_SYNC_CREATE); - gtk_grid_attach (GTK_GRID (grid), label , 1, 2, 1, 1); - gtk_grid_attach (GTK_GRID (grid), check, 2, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label) , 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (check), 2, 2, 1, 1); label = gtk_label_new ("Button direction"); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "up", "Up"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "down", "Down"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "left", "Left"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "right", "Right"); + gtk_combo_box_text_append (combo, "up", "Up"); + gtk_combo_box_text_append (combo, "down", "Down"); + gtk_combo_box_text_append (combo, "left", "Left"); + gtk_combo_box_text_append (combo, "right", "Right"); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 1); g_object_bind_property (combo, "active", button, "direction", G_BINDING_SYNC_CREATE); g_object_bind_property (combo, "active", button1, "direction", G_BINDING_SYNC_CREATE); g_object_bind_property (combo, "active", button2, "direction", G_BINDING_SYNC_CREATE); - gtk_grid_attach (GTK_GRID (grid), label , 1, 3, 1, 1); - gtk_grid_attach (GTK_GRID (grid), combo, 2, 3, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label) , 1, 3, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (combo), 2, 3, 1, 1); label = gtk_label_new ("Button halign"); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "fill", "Fill"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "start", "Start"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "end", "End"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center", "Center"); + gtk_combo_box_text_append (combo, "fill", "Fill"); + gtk_combo_box_text_append (combo, "start", "Start"); + gtk_combo_box_text_append (combo, "end", "End"); + gtk_combo_box_text_append (combo, "center", "Center"); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 2); g_object_bind_property (combo, "active", box, "halign", G_BINDING_SYNC_CREATE); - gtk_grid_attach (GTK_GRID (grid), label , 1, 4, 1, 1); - gtk_grid_attach (GTK_GRID (grid), combo, 2, 4, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label) , 1, 4, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (combo), 2, 4, 1, 1); label = gtk_label_new ("Button valign"); combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "fill", "Fill"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "start", "Start"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "end", "End"); - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center", "Center"); + gtk_combo_box_text_append (combo, "fill", "Fill"); + gtk_combo_box_text_append (combo, "start", "Start"); + gtk_combo_box_text_append (combo, "end", "End"); + gtk_combo_box_text_append (combo, "center", "Center"); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 1); g_object_bind_property (combo, "active", box, "valign", G_BINDING_SYNC_CREATE); - gtk_grid_attach (GTK_GRID (grid), label , 1, 5, 1, 1); - gtk_grid_attach (GTK_GRID (grid), combo, 2, 5, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label) , 1, 5, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (combo), 2, 5, 1, 1); g_object_unref (builder); diff --git a/tests/testrevealer.c b/tests/testrevealer.c index cb2cf9b95201f745edd4aa82260b04c803d64df1..a33ba34a46ee4a3656251d2c4beb21d86ac7a462 100644 --- a/tests/testrevealer.c +++ b/tests/testrevealer.c @@ -4,7 +4,10 @@ gint main (gint argc, gchar ** argv) { - GtkWidget *window, *revealer, *box, *widget, *entry; + GtkWidget *window, *revealer, *box; + GtkToggleButton *widget; + GtkEntry *entry; + GtkLabel *label; gtk_init (); @@ -14,149 +17,149 @@ main (gint argc, box = gtk_grid_new (); gtk_container_add (GTK_CONTAINER (window), box); - widget = gtk_label_new ("Some filler text to avoid\nresizing of the window"); - gtk_widget_set_margin_top (widget, 10); - gtk_widget_set_margin_bottom (widget, 10); - gtk_widget_set_margin_start (widget, 10); - gtk_widget_set_margin_end (widget, 10); - gtk_grid_attach (GTK_GRID (box), widget, 1, 1, 1, 1); + label = gtk_label_new ("Some filler text to avoid\nresizing of the window"); + gtk_widget_set_margin_top (GTK_WIDGET (label), 10); + gtk_widget_set_margin_bottom (GTK_WIDGET (label), 10); + gtk_widget_set_margin_start (GTK_WIDGET (label), 10); + gtk_widget_set_margin_end (GTK_WIDGET (label), 10); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (label), 1, 1, 1, 1); - widget = gtk_label_new ("Some filler text to avoid\nresizing of the window"); - gtk_widget_set_margin_top (widget, 10); - gtk_widget_set_margin_bottom (widget, 10); - gtk_widget_set_margin_start (widget, 10); - gtk_widget_set_margin_end (widget, 10); - gtk_grid_attach (GTK_GRID (box), widget, 4, 4, 1, 1); + label = gtk_label_new ("Some filler text to avoid\nresizing of the window"); + gtk_widget_set_margin_top (GTK_WIDGET (label), 10); + gtk_widget_set_margin_bottom (GTK_WIDGET (label), 10); + gtk_widget_set_margin_start (GTK_WIDGET (label), 10); + gtk_widget_set_margin_end (GTK_WIDGET (label), 10); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (label), 4, 4, 1, 1); widget = gtk_toggle_button_new_with_label ("None"); - gtk_grid_attach (GTK_GRID (box), widget, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (widget), 0, 0, 1, 1); revealer = gtk_revealer_new (); gtk_widget_set_halign (revealer, GTK_ALIGN_START); gtk_widget_set_valign (revealer, GTK_ALIGN_START); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "00000"); - gtk_container_add (GTK_CONTAINER (revealer), entry); + gtk_container_add (GTK_CONTAINER (revealer), GTK_WIDGET (entry)); g_object_bind_property (widget, "active", revealer, "reveal-child", 0); gtk_revealer_set_transition_type (GTK_REVEALER (revealer), GTK_REVEALER_TRANSITION_TYPE_NONE); gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000); gtk_grid_attach (GTK_GRID (box), revealer, 1, 0, 1, 1); widget = gtk_toggle_button_new_with_label ("Fade"); - gtk_grid_attach (GTK_GRID (box), widget, 5, 5, 1, 1); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (widget), 5, 5, 1, 1); revealer = gtk_revealer_new (); gtk_widget_set_halign (revealer, GTK_ALIGN_END); gtk_widget_set_valign (revealer, GTK_ALIGN_END); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "00000"); - gtk_container_add (GTK_CONTAINER (revealer), entry); + gtk_container_add (GTK_CONTAINER (revealer), GTK_WIDGET (entry)); g_object_bind_property (widget, "active", revealer, "reveal-child", 0); gtk_revealer_set_transition_type (GTK_REVEALER (revealer), GTK_REVEALER_TRANSITION_TYPE_CROSSFADE); gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000); gtk_grid_attach (GTK_GRID (box), revealer, 4, 5, 1, 1); widget = gtk_toggle_button_new_with_label ("Slide"); - gtk_grid_attach (GTK_GRID (box), widget, 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (widget), 0, 2, 1, 1); revealer = gtk_revealer_new (); gtk_widget_set_hexpand (revealer, TRUE); gtk_widget_set_halign (revealer, GTK_ALIGN_START); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "12345"); - gtk_container_add (GTK_CONTAINER (revealer), entry); + gtk_container_add (GTK_CONTAINER (revealer), GTK_WIDGET (entry)); g_object_bind_property (widget, "active", revealer, "reveal-child", 0); gtk_revealer_set_transition_type (GTK_REVEALER (revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT); gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000); gtk_grid_attach (GTK_GRID (box), revealer, 1, 2, 1, 1); widget = gtk_toggle_button_new_with_label ("Swing"); - gtk_widget_set_valign (widget, GTK_ALIGN_START); - gtk_grid_attach (GTK_GRID (box), widget, 0, 3, 1, 1); + gtk_widget_set_valign (GTK_WIDGET (widget), GTK_ALIGN_START); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (widget), 0, 3, 1, 1); revealer = gtk_revealer_new (); gtk_widget_set_hexpand (revealer, TRUE); gtk_widget_set_halign (revealer, GTK_ALIGN_START); gtk_widget_set_valign (revealer, GTK_ALIGN_START); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "12345"); - gtk_container_add (GTK_CONTAINER (revealer), entry); + gtk_container_add (GTK_CONTAINER (revealer), GTK_WIDGET (entry)); g_object_bind_property (widget, "active", revealer, "reveal-child", 0); gtk_revealer_set_transition_type (GTK_REVEALER (revealer), GTK_REVEALER_TRANSITION_TYPE_SWING_RIGHT); gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000); gtk_grid_attach (GTK_GRID (box), revealer, 1, 3, 1, 1); widget = gtk_toggle_button_new_with_label ("Slide"); - gtk_grid_attach (GTK_GRID (box), widget, 2, 0, 1, 1); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (widget), 2, 0, 1, 1); revealer = gtk_revealer_new (); gtk_widget_set_vexpand (revealer, TRUE); gtk_widget_set_valign (revealer, GTK_ALIGN_START); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "23456"); - gtk_container_add (GTK_CONTAINER (revealer), entry); + gtk_container_add (GTK_CONTAINER (revealer), GTK_WIDGET (entry)); g_object_bind_property (widget, "active", revealer, "reveal-child", 0); gtk_revealer_set_transition_type (GTK_REVEALER (revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN); gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000); gtk_grid_attach (GTK_GRID (box), revealer, 2, 1, 1, 1); widget = gtk_toggle_button_new_with_label ("Swing"); - gtk_grid_attach (GTK_GRID (box), widget, 3, 0, 1, 1); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (widget), 3, 0, 1, 1); revealer = gtk_revealer_new (); gtk_widget_set_vexpand (revealer, TRUE); gtk_widget_set_valign (revealer, GTK_ALIGN_START); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "23456"); - gtk_container_add (GTK_CONTAINER (revealer), entry); + gtk_container_add (GTK_CONTAINER (revealer), GTK_WIDGET (entry)); g_object_bind_property (widget, "active", revealer, "reveal-child", 0); gtk_revealer_set_transition_type (GTK_REVEALER (revealer), GTK_REVEALER_TRANSITION_TYPE_SWING_DOWN); gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000); gtk_grid_attach (GTK_GRID (box), revealer, 3, 1, 1, 1); widget = gtk_toggle_button_new_with_label ("Slide"); - gtk_grid_attach (GTK_GRID (box), widget, 5, 2, 1, 1); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (widget), 5, 2, 1, 1); revealer = gtk_revealer_new (); gtk_widget_set_hexpand (revealer, TRUE); gtk_widget_set_halign (revealer, GTK_ALIGN_END); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "34567"); - gtk_container_add (GTK_CONTAINER (revealer), entry); + gtk_container_add (GTK_CONTAINER (revealer), GTK_WIDGET (entry)); g_object_bind_property (widget, "active", revealer, "reveal-child", 0); gtk_revealer_set_transition_type (GTK_REVEALER (revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_LEFT); gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000); gtk_grid_attach (GTK_GRID (box), revealer, 4, 2, 1, 1); widget = gtk_toggle_button_new_with_label ("Swing"); - gtk_widget_set_valign (widget, GTK_ALIGN_START); - gtk_grid_attach (GTK_GRID (box), widget, 5, 3, 1, 1); + gtk_widget_set_valign (GTK_WIDGET (widget), GTK_ALIGN_START); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (widget), 5, 3, 1, 1); revealer = gtk_revealer_new (); gtk_widget_set_hexpand (revealer, TRUE); gtk_widget_set_halign (revealer, GTK_ALIGN_END); gtk_widget_set_valign (revealer, GTK_ALIGN_START); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "34567"); - gtk_container_add (GTK_CONTAINER (revealer), entry); + gtk_container_add (GTK_CONTAINER (revealer), GTK_WIDGET (entry)); g_object_bind_property (widget, "active", revealer, "reveal-child", 0); gtk_revealer_set_transition_type (GTK_REVEALER (revealer), GTK_REVEALER_TRANSITION_TYPE_SWING_LEFT); gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000); gtk_grid_attach (GTK_GRID (box), revealer, 4, 3, 1, 1); widget = gtk_toggle_button_new_with_label ("Slide"); - gtk_grid_attach (GTK_GRID (box), widget, 2, 5, 1, 1); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (widget), 2, 5, 1, 1); revealer = gtk_revealer_new (); gtk_widget_set_vexpand (revealer, TRUE); gtk_widget_set_valign (revealer, GTK_ALIGN_END); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "45678"); - gtk_container_add (GTK_CONTAINER (revealer), entry); + gtk_container_add (GTK_CONTAINER (revealer), GTK_WIDGET (entry)); g_object_bind_property (widget, "active", revealer, "reveal-child", 0); gtk_revealer_set_transition_type (GTK_REVEALER (revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP); gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000); gtk_grid_attach (GTK_GRID (box), revealer, 2, 4, 1, 1); widget = gtk_toggle_button_new_with_label ("Swing"); - gtk_grid_attach (GTK_GRID (box), widget, 3, 5, 1, 1); + gtk_grid_attach (GTK_GRID (box), GTK_WIDGET (widget), 3, 5, 1, 1); revealer = gtk_revealer_new (); gtk_widget_set_vexpand (revealer, TRUE); gtk_widget_set_valign (revealer, GTK_ALIGN_END); entry = gtk_entry_new (); gtk_editable_set_text (GTK_EDITABLE (entry), "45678"); - gtk_container_add (GTK_CONTAINER (revealer), entry); + gtk_container_add (GTK_CONTAINER (revealer), GTK_WIDGET (entry)); g_object_bind_property (widget, "active", revealer, "reveal-child", 0); gtk_revealer_set_transition_type (GTK_REVEALER (revealer), GTK_REVEALER_TRANSITION_TYPE_SWING_UP); gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000); diff --git a/tests/testrevealer2.c b/tests/testrevealer2.c index 7bb08adf7a0d25dde8a96a1e937ad357d99e3868..1b1187444e6de3d41c0de85a05f4be4f855d033b 100644 --- a/tests/testrevealer2.c +++ b/tests/testrevealer2.c @@ -12,8 +12,11 @@ on_activate (GApplication *app, if (window == NULL) { - GtkWidget *header, *sidebar_toggle, *animation_switch; - GtkWidget *hbox, *revealer, *sidebar, *img; + GtkWidget *header; + GtkToggleButton *sidebar_toggle; + GtkSwitch *animation_switch; + GtkWidget *hbox, *revealer, *sidebar; + GtkImage *img; window = gtk_application_window_new (GTK_APPLICATION (app)); gtk_window_set_default_size (GTK_WINDOW (window), 400, 300); @@ -24,13 +27,13 @@ on_activate (GApplication *app, gtk_window_set_titlebar (GTK_WINDOW (window), header); sidebar_toggle = gtk_toggle_button_new_with_label ("Show Sidebar"); - gtk_header_bar_pack_start (GTK_HEADER_BAR (header), sidebar_toggle); + gtk_header_bar_pack_start (GTK_HEADER_BAR (header), GTK_WIDGET (sidebar_toggle)); animation_switch = gtk_switch_new (); - gtk_widget_set_valign (animation_switch, GTK_ALIGN_CENTER); - gtk_header_bar_pack_end (GTK_HEADER_BAR (header), animation_switch); + gtk_widget_set_valign (GTK_WIDGET (animation_switch), GTK_ALIGN_CENTER); + gtk_header_bar_pack_end (GTK_HEADER_BAR (header), GTK_WIDGET (animation_switch)); gtk_header_bar_pack_end (GTK_HEADER_BAR (header), - gtk_label_new ("Animations")); + GTK_WIDGET (gtk_label_new ("Animations"))); /* content */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); @@ -54,7 +57,7 @@ on_activate (GApplication *app, "halign", GTK_ALIGN_CENTER, "valign", GTK_ALIGN_CENTER, NULL); - gtk_container_add (GTK_CONTAINER (hbox), img); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (img)); g_object_bind_property (sidebar_toggle, "active", revealer, "reveal-child", diff --git a/tests/testscale.c b/tests/testscale.c index 33280dcf37e2fd27fd4715d8f0525e159e4b81d0..ee8f361501acea2f4a422813acec62a607facd04 100644 --- a/tests/testscale.c +++ b/tests/testscale.c @@ -95,6 +95,7 @@ int main (int argc, char *argv[]) GtkWidget *box1; GtkWidget *box2; GtkWidget *button; + GtkToggleButton *toggle; GtkWidget *frame; GtkWidget *scale; const gchar *labels[3] = { @@ -216,16 +217,16 @@ int main (int argc, char *argv[]) g_signal_connect (button, "clicked", G_CALLBACK (invert), NULL); gtk_container_add (GTK_CONTAINER (box2), button); - button = gtk_toggle_button_new_with_label ("Trough"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_signal_connect (button, "toggled", G_CALLBACK (trough), NULL); - gtk_container_add (GTK_CONTAINER (box2), button); + toggle = gtk_toggle_button_new_with_label ("Trough"); + gtk_toggle_button_set_active (toggle, TRUE); + g_signal_connect (toggle, "toggled", G_CALLBACK (trough), NULL); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (toggle)); gtk_widget_show (window); - button = gtk_toggle_button_new_with_label ("Extra"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE); - g_signal_connect (button, "toggled", G_CALLBACK (extra), NULL); - gtk_container_add (GTK_CONTAINER (box2), button); + toggle = gtk_toggle_button_new_with_label ("Extra"); + gtk_toggle_button_set_active (toggle, FALSE); + g_signal_connect (toggle, "toggled", G_CALLBACK (extra), NULL); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (toggle)); gtk_widget_show (window); gtk_main (); diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c index 03a0b669fe10608829fb5986fd28bb0a2feea73d..ab8e35b52ef1e172a50453b5952f5fafbfcf6840 100644 --- a/tests/testscrolledge.c +++ b/tests/testscrolledge.c @@ -25,7 +25,8 @@ populate_list (GtkListBox *list) { gint i; gchar *text; - GtkWidget *row, *label; + GtkWidget *row; + GtkLabel *label; gint n; GList *l; @@ -41,8 +42,8 @@ populate_list (GtkListBox *list) g_free (text); g_object_set (label, "margin", 10, NULL); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (row), label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (list), row); } } @@ -94,7 +95,7 @@ main (int argc, char *argv[]) GtkWidget *sw; GtkWidget *list; GtkWidget *overlay; - GtkWidget *label; + GtkLabel *label; gtk_init (); @@ -108,7 +109,7 @@ main (int argc, char *argv[]) g_object_set (popup, "margin", 40, NULL); label = gtk_label_new ("Getting more rows..."); spinner = gtk_spinner_new (); - gtk_container_add (GTK_CONTAINER (popup), label); + gtk_container_add (GTK_CONTAINER (popup), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (popup), spinner); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), popup); diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c index 417f1722179e5a0d97a462acb2cbaf30ee4e08fe..50b4afb4f97c3666786042bde7025a41d5580728 100644 --- a/tests/testscrolledwindow.c +++ b/tests/testscrolledwindow.c @@ -58,7 +58,7 @@ add_row (GtkButton *button, GtkWidget *row; row = g_object_new (GTK_TYPE_LIST_BOX_ROW, NULL); - gtk_container_add (GTK_CONTAINER (row), gtk_label_new ("test")); + gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (gtk_label_new ("test"))); gtk_container_add (GTK_CONTAINER (listbox), row); } @@ -81,7 +81,11 @@ static void scrollable_policy (void) { GtkWidget *window, *swindow, *hbox, *vbox, *frame, *cntl, *listbox; - GtkWidget *viewport, *label, *expander, *widget, *popover; + GtkCheckButton *checkbutton; + GtkComboBoxText *combo; + GtkWidget *viewport, *widget, *popover; + GtkExpander *expander; + GtkLabel *label; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); @@ -112,70 +116,70 @@ scrollable_policy (void) "is enough height to fit the content vertically if the window were " "to be allocated a width without a vscrollbar present"); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_width_chars (GTK_LABEL (label), 40); - gtk_label_set_max_width_chars (GTK_LABEL (label), 100); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_width_chars (label, 40); + gtk_label_set_max_width_chars (label, 100); - gtk_widget_show (label); + gtk_widget_show (GTK_WIDGET (label)); gtk_widget_show (viewport); - gtk_container_add (GTK_CONTAINER (viewport), label); + gtk_container_add (GTK_CONTAINER (viewport), GTK_WIDGET (label)); gtk_container_add (GTK_CONTAINER (swindow), viewport); /* Add controls here */ expander = gtk_expander_new ("Controls"); - gtk_expander_set_expanded (GTK_EXPANDER (expander), TRUE); + gtk_expander_set_expanded (expander, TRUE); cntl = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); gtk_widget_show (cntl); - gtk_widget_show (expander); + gtk_widget_show (GTK_WIDGET (expander)); gtk_container_add (GTK_CONTAINER (expander), cntl); - gtk_container_add (GTK_CONTAINER (vbox), expander); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (expander)); /* Add Horizontal policy control here */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_widget_show (hbox); - widget = gtk_label_new ("hscroll-policy"); - gtk_widget_set_hexpand (widget, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), widget); + label = gtk_label_new ("hscroll-policy"); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Minimum"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Natural"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_set_hexpand (widget, TRUE); + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (combo, "Minimum"); + gtk_combo_box_text_append_text (combo, "Natural"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + gtk_widget_set_hexpand (GTK_WIDGET (combo), TRUE); - gtk_container_add (GTK_CONTAINER (hbox), widget); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (combo)); gtk_container_add (GTK_CONTAINER (cntl), hbox); - g_signal_connect (G_OBJECT (widget), "changed", + g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (horizontal_policy_changed), viewport); /* Add Vertical policy control here */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_widget_show (hbox); - widget = gtk_label_new ("vscroll-policy"); - gtk_widget_set_hexpand (widget, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), widget); + label = gtk_label_new ("vscroll-policy"); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); - widget = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Minimum"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Natural"); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_set_hexpand (widget, TRUE); + combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (combo, "Minimum"); + gtk_combo_box_text_append_text (combo, "Natural"); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + gtk_widget_set_hexpand (GTK_WIDGET (combo), TRUE); - gtk_container_add (GTK_CONTAINER (hbox), widget); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (combo)); gtk_container_add (GTK_CONTAINER (cntl), hbox); - g_signal_connect (G_OBJECT (widget), "changed", + g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (vertical_policy_changed), viewport); /* Content size controls */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); - widget = gtk_label_new ("min-content-width"); - gtk_widget_set_hexpand (widget, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), widget); + label = gtk_label_new ("min-content-width"); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); widget = gtk_spin_button_new_with_range (100.0, 1000.0, 10.0); gtk_widget_set_hexpand (widget, TRUE); @@ -189,9 +193,9 @@ scrollable_policy (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); - widget = gtk_label_new ("min-content-height"); - gtk_widget_set_hexpand (widget, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), widget); + label = gtk_label_new ("min-content-height"); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); widget = gtk_spin_button_new_with_range (100.0, 1000.0, 10.0); gtk_widget_set_hexpand (widget, TRUE); @@ -204,10 +208,10 @@ scrollable_policy (void) G_CALLBACK (content_height_changed), swindow); /* Add Kinetic scrolling control here */ - widget = gtk_check_button_new_with_label ("Kinetic scrolling"); - gtk_widget_set_hexpand (widget, TRUE); - gtk_container_add (GTK_CONTAINER (cntl), widget); - g_signal_connect (G_OBJECT (widget), "toggled", + checkbutton = gtk_check_button_new_with_label ("Kinetic scrolling"); + gtk_widget_set_hexpand (GTK_WIDGET (checkbutton), TRUE); + gtk_container_add (GTK_CONTAINER (cntl), GTK_WIDGET (checkbutton)); + g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (kinetic_scrolling_changed), swindow); gtk_widget_show (window); @@ -238,9 +242,9 @@ scrollable_policy (void) /* Min content */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); - widget = gtk_label_new ("min-content-width"); - gtk_widget_set_hexpand (widget, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), widget); + label = gtk_label_new ("min-content-width"); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); widget = gtk_spin_button_new_with_range (0.0, 150.0, 10.0); gtk_widget_set_hexpand (widget, TRUE); @@ -252,9 +256,9 @@ scrollable_policy (void) "min-content-width", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); - widget = gtk_label_new ("min-content-height"); - gtk_widget_set_hexpand (widget, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), widget); + label = gtk_label_new ("min-content-height"); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); widget = gtk_spin_button_new_with_range (0.0, 150.0, 10.0); @@ -271,9 +275,9 @@ scrollable_policy (void) /* Max content */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); - widget = gtk_label_new ("max-content-width"); - gtk_widget_set_hexpand (widget, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), widget); + label = gtk_label_new ("max-content-width"); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); widget = gtk_spin_button_new_with_range (250.0, 1000.0, 10.0); gtk_widget_set_hexpand (widget, TRUE); @@ -285,9 +289,9 @@ scrollable_policy (void) "max-content-width", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); - widget = gtk_label_new ("max-content-height"); - gtk_widget_set_hexpand (widget, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), widget); + label = gtk_label_new ("max-content-height"); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); widget = gtk_spin_button_new_with_range (250.0, 1000.0, 10.0); gtk_widget_set_hexpand (widget, TRUE); diff --git a/tests/testselectionmode.c b/tests/testselectionmode.c index 2174d195de4e96ba97c93fd5f9c849d881940652..8c7532e288e301e37315daead675f52a7b93c06b 100644 --- a/tests/testselectionmode.c +++ b/tests/testselectionmode.c @@ -5,7 +5,7 @@ typedef struct { GtkListBoxRow parent; GtkWidget *box; GtkWidget *revealer; - GtkWidget *check; + GtkCheckButton *check; } SelectableRow; typedef struct { @@ -24,11 +24,11 @@ selectable_row_init (SelectableRow *row) g_object_set (row->check, "margin", 10, NULL); gtk_widget_show (row->box); - gtk_widget_show (row->check); + gtk_widget_show (GTK_WIDGET (row->check)); gtk_container_add (GTK_CONTAINER (row), row->box); gtk_container_add (GTK_CONTAINER (row->box), row->revealer); - gtk_container_add (GTK_CONTAINER (row->revealer), row->check); + gtk_container_add (GTK_CONTAINER (row->revealer), GTK_WIDGET (row->check)); } void @@ -80,14 +80,14 @@ static void add_row (GtkWidget *list, gint i) { GtkWidget *row; - GtkWidget *label; + GtkLabel *label; gchar *text; row = selectable_row_new (); text = g_strdup_printf ("Docker %d", i); label = gtk_label_new (text); - gtk_widget_set_halign (label, GTK_ALIGN_START); - selectable_row_add ((SelectableRow*)row, label); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + selectable_row_add ((SelectableRow*)row, GTK_WIDGET (label)); g_free (text); gtk_list_box_insert (GTK_LIST_BOX (list), row, -1); diff --git a/tests/testsensitive.c b/tests/testsensitive.c index 4085b51373abded5afd9364506be163fa03c032e..b1fbd34fe9f9206e18b7d1c34624bf54474b4932 100644 --- a/tests/testsensitive.c +++ b/tests/testsensitive.c @@ -56,7 +56,8 @@ int main (int argc, char *argv[]) GtkWidget *window; GtkWidget *box; GtkWidget *bu; - GtkWidget *w, *c; + GtkWidget *w; + GtkSwitch *c; gtk_init (); @@ -66,14 +67,14 @@ int main (int argc, char *argv[]) w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 15); gtk_container_add (GTK_CONTAINER (box), w); - gtk_container_add (GTK_CONTAINER (w), gtk_entry_new ()); + gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (gtk_entry_new ())); bu = gtk_button_new_with_label ("Bu"); gtk_container_add (GTK_CONTAINER (w), bu); c = gtk_switch_new (); - gtk_switch_set_active (GTK_SWITCH (c), TRUE); - gtk_widget_set_halign (c, GTK_ALIGN_CENTER); - gtk_widget_set_valign (c, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (box), c); + gtk_switch_set_active (c, TRUE); + gtk_widget_set_halign (GTK_WIDGET (c), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (c), GTK_ALIGN_CENTER); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (c)); g_signal_connect (bu, "clicked", G_CALLBACK (set_insensitive), w); g_signal_connect (bu, "state-flags-changed", G_CALLBACK (state_flags_changed), NULL); diff --git a/tests/testspinbutton.c b/tests/testspinbutton.c index 49420a69a538731f44ef3ae28f9170d21cf2754e..57e1a63a28a82aa85653868e535ac1d8467e3d12 100644 --- a/tests/testspinbutton.c +++ b/tests/testspinbutton.c @@ -33,7 +33,8 @@ on_delete (GtkWindow *w) static void prepare_window_for_orientation (GtkOrientation orientation) { - GtkWidget *window, *mainbox, *wrap_button; + GtkWidget *window, *mainbox; + GtkToggleButton *wrap_button; int max; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -43,7 +44,7 @@ prepare_window_for_orientation (GtkOrientation orientation) gtk_container_add (GTK_CONTAINER (window), mainbox); wrap_button = gtk_toggle_button_new_with_label ("Wrap"); - gtk_container_add (GTK_CONTAINER (mainbox), wrap_button); + gtk_container_add (GTK_CONTAINER (mainbox), GTK_WIDGET (wrap_button)); for (max = 9; max <= 999999999; max = max * 10 + 9) { diff --git a/tests/teststack.c b/tests/teststack.c index 672a12fd1218b7c122d682f6199d35f45e6e285d..01877f5c893b089a13fbe37f5ada87415f67de94 100644 --- a/tests/teststack.c +++ b/tests/teststack.c @@ -108,7 +108,10 @@ gint main (gint argc, gchar ** argv) { - GtkWidget *window, *box, *button, *hbox, *combo, *layout; + GtkWidget *window, *box, *button, *hbox, *layout; + GtkToggleButton *toggle; + GtkCheckButton *checkbutton; + GtkComboBoxText *combo; GtkWidget *w2, *w3; GtkListStore* store; GtkWidget *tree_view; @@ -214,29 +217,29 @@ main (gint argc, gtk_container_add (GTK_CONTAINER (hbox), button); g_signal_connect (button, "clicked", (GCallback) set_visible_child_name, (gpointer) "3"); - button = gtk_check_button_new (); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), + checkbutton = gtk_check_button_new (); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), gtk_stack_get_hhomogeneous (GTK_STACK (stack))); - gtk_container_add (GTK_CONTAINER (hbox), button); - g_signal_connect (button, "clicked", (GCallback) toggle_hhomogeneous, NULL); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (checkbutton)); + g_signal_connect (checkbutton, "clicked", (GCallback) toggle_hhomogeneous, NULL); - button = gtk_check_button_new_with_label ("homogeneous"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), + checkbutton = gtk_check_button_new_with_label ("homogeneous"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), gtk_stack_get_vhomogeneous (GTK_STACK (stack))); - gtk_container_add (GTK_CONTAINER (hbox), button); - g_signal_connect (button, "clicked", (GCallback) toggle_vhomogeneous, NULL); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (checkbutton)); + g_signal_connect (checkbutton, "clicked", (GCallback) toggle_vhomogeneous, NULL); - button = gtk_toggle_button_new_with_label ("Add icon"); - g_signal_connect (button, "toggled", (GCallback) toggle_icon_name, NULL); - gtk_container_add (GTK_CONTAINER (hbox), button); + toggle = gtk_toggle_button_new_with_label ("Add icon"); + g_signal_connect (toggle, "toggled", (GCallback) toggle_icon_name, NULL); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (toggle)); combo = gtk_combo_box_text_new (); class = g_type_class_ref (GTK_TYPE_STACK_TRANSITION_TYPE); for (i = 0; i < class->n_values; i++) - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), class->values[i].value_nick); + gtk_combo_box_text_append_text (combo, class->values[i].value_nick); g_type_class_unref (class); - gtk_container_add (GTK_CONTAINER (hbox), combo); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (combo)); g_signal_connect (combo, "changed", (GCallback) toggle_transitions, NULL); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); diff --git a/tests/testswitch.c b/tests/testswitch.c index 9d9ded6d45445ec01c75caadee0027f7d686cc73..3100f3d129a0229871ace8a853678910b6aeb4bd 100644 --- a/tests/testswitch.c +++ b/tests/testswitch.c @@ -20,18 +20,19 @@ make_switch (gboolean is_on, gboolean is_sensitive) { GtkWidget *hbox; - GtkWidget *sw, *label; + GtkSwitch *sw; + GtkLabel *label; hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); sw = gtk_switch_new (); - gtk_switch_set_active (GTK_SWITCH (sw), is_on); - gtk_container_add (GTK_CONTAINER (hbox), sw); - gtk_widget_set_sensitive (sw, is_sensitive); + gtk_switch_set_active (sw, is_on); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (sw)); + gtk_widget_set_sensitive (GTK_WIDGET (sw), is_sensitive); label = gtk_label_new (is_on ? "Enabled" : "Disabled"); - gtk_widget_set_hexpand (label, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); g_object_bind_property_full (sw, "active", label, "label", @@ -110,14 +111,17 @@ make_delayed_switch (gboolean is_on, gboolean is_sensitive) { GtkWidget *hbox; - GtkWidget *sw, *label, *spinner, *check; + GtkSwitch *sw; + GtkWidget *spinner; + GtkCheckButton *check; + GtkLabel *label; hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); sw = gtk_switch_new (); - gtk_switch_set_active (GTK_SWITCH (sw), is_on); - gtk_container_add (GTK_CONTAINER (hbox), sw); - gtk_widget_set_sensitive (sw, is_sensitive); + gtk_switch_set_active (sw, is_on); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (sw)); + gtk_widget_set_sensitive (GTK_WIDGET (sw), is_sensitive); g_signal_connect (sw, "state-set", G_CALLBACK (set_state), NULL); @@ -126,8 +130,8 @@ make_delayed_switch (gboolean is_on, gtk_widget_set_opacity (spinner, 0.0); label = gtk_label_new (is_on ? "Enabled" : "Disabled"); - gtk_widget_set_hexpand (label, TRUE); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); g_object_bind_property_full (sw, "active", label, "label", @@ -137,7 +141,7 @@ make_delayed_switch (gboolean is_on, NULL, NULL); check = gtk_check_button_new (); - gtk_container_add (GTK_CONTAINER (hbox), check); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (check)); g_object_bind_property (sw, "state", check, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); diff --git a/tests/testtextview2.c b/tests/testtextview2.c index 83431bfc3128f192b19777a041c61df10abf6fec..cf4bc604b1ebd9a56aa6dec8332855ae2d3a8016 100644 --- a/tests/testtextview2.c +++ b/tests/testtextview2.c @@ -134,8 +134,8 @@ toggle_cursor (GtkToggleButton *button) } static GtkTextMark *the_mark; -static GtkWidget *mark_check; -static GtkWidget *mark_visible; +static GtkCheckButton *mark_check; +static GtkCheckButton *mark_visible; static GtkWidget *position_spin; static void @@ -174,7 +174,8 @@ update_mark_position (void) int main (int argc, char *argv[]) { - GtkWidget *window, *sw, *box, *box2, *button; + GtkWidget *window, *sw, *box, *box2; + GtkToggleButton *button; gtk_init (); @@ -209,11 +210,11 @@ main (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (box), box2); mark_check = gtk_check_button_new_with_label ("Mark"); g_signal_connect (mark_check, "notify::active", G_CALLBACK (update_mark_exists), NULL); - gtk_container_add (GTK_CONTAINER (box2), mark_check); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (mark_check)); mark_visible = gtk_check_button_new_with_label ("Visible"); g_signal_connect (mark_visible, "notify::active", G_CALLBACK (update_mark_visible), NULL); - gtk_container_add (GTK_CONTAINER (box2), mark_visible); - gtk_container_add (GTK_CONTAINER (box2), gtk_label_new ("Position:")); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (mark_visible)); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (gtk_label_new ("Position:"))); position_spin = gtk_spin_button_new_with_range (0, len, 1); g_signal_connect (position_spin, "value-changed", G_CALLBACK (update_mark_position), NULL); gtk_container_add (GTK_CONTAINER (box2), position_spin); @@ -224,11 +225,11 @@ main (int argc, char *argv[]) button = gtk_toggle_button_new_with_label ("Random marks"); g_signal_connect (button, "notify::active", G_CALLBACK (toggle_marks), NULL); - gtk_container_add (GTK_CONTAINER (box2), button); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (button)); button = gtk_toggle_button_new_with_label ("Wandering cursor"); g_signal_connect (button, "notify::active", G_CALLBACK (toggle_cursor), NULL); - gtk_container_add (GTK_CONTAINER (box2), button); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (button)); gtk_widget_show (window); diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c index 458ca2e21c5ee09c7f60cbe694bd02d9e88d165a..1e5f6c0e4da5de8932c8df22b3a0114bbaa238fa 100644 --- a/tests/testtoolbar.c +++ b/tests/testtoolbar.c @@ -296,14 +296,14 @@ static gboolean toolbar_drag_drop (GtkDropTarget *dest, GdkDrop *drop, gint x, gint y, - GtkWidget *label) + GtkLabel *label) { GtkWidget *widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest)); gchar buf[32]; g_snprintf(buf, sizeof(buf), "%d", gtk_toolbar_get_drop_index (GTK_TOOLBAR (widget), x, y)); - gtk_label_set_label (GTK_LABEL (label), buf); + gtk_label_set_label (label, buf); return TRUE; } @@ -385,8 +385,11 @@ timeout_cb1 (GtkWidget *widget) gint main (gint argc, gchar **argv) { - GtkWidget *window, *toolbar, *grid, *treeview, *scrolled_window; - GtkWidget *hbox, *hbox1, *hbox2, *checkbox, *option_menu, *menu; + GtkWidget *window, *grid, *treeview, *scrolled_window; + GtkToolbar *toolbar; + GtkWidget *hbox, *hbox1, *hbox2, *menu; + GtkCheckButton *checkbox; + GtkComboBoxText *option_menu; gint i; GdkContentFormats *targets; GdkContentProvider *content; @@ -396,11 +399,12 @@ main (gint argc, gchar **argv) "both (horizontal)" }; GtkToolItem *item; GtkListStore *store; - GtkWidget *image; + GtkImage *image; + GtkWidget *spinner; GtkWidget *menuitem; GtkWidget *box; GtkWidget *button; - GtkWidget *label; + GtkLabel *label; GIcon *gicon; GSList *group; @@ -414,7 +418,7 @@ main (gint argc, gchar **argv) gtk_container_add (GTK_CONTAINER (window), grid); toolbar = gtk_toolbar_new (); - gtk_grid_attach (GTK_GRID (grid), toolbar, 0, 0, 2, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (toolbar), 0, 0, 2, 1); hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_grid_attach (GTK_GRID (grid), hbox1, 1, 1, 1, 1); @@ -423,29 +427,29 @@ main (gint argc, gchar **argv) gtk_grid_attach (GTK_GRID (grid), hbox2, 1, 2, 1, 1); checkbox = gtk_check_button_new_with_mnemonic("_Vertical"); - gtk_container_add (GTK_CONTAINER (hbox1), checkbox); + gtk_container_add (GTK_CONTAINER (hbox1), GTK_WIDGET (checkbox)); g_signal_connect (checkbox, "toggled", G_CALLBACK (change_orientation), toolbar); checkbox = gtk_check_button_new_with_mnemonic("_Show Arrow"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE); - gtk_container_add (GTK_CONTAINER (hbox1), checkbox); + gtk_container_add (GTK_CONTAINER (hbox1), GTK_WIDGET (checkbox)); g_signal_connect (checkbox, "toggled", G_CALLBACK (change_show_arrow), toolbar); checkbox = gtk_check_button_new_with_mnemonic("_Set Toolbar Style:"); g_signal_connect (checkbox, "toggled", G_CALLBACK (set_toolbar_style_toggled), toolbar); - gtk_container_add (GTK_CONTAINER (hbox1), checkbox); + gtk_container_add (GTK_CONTAINER (hbox1), GTK_WIDGET (checkbox)); option_menu = gtk_combo_box_text_new (); - gtk_widget_set_sensitive (option_menu, FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (option_menu), FALSE); g_object_set_data (G_OBJECT (checkbox), "option-menu", option_menu); for (i = 0; i < G_N_ELEMENTS (toolbar_styles); i++) - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), toolbar_styles[i]); + gtk_combo_box_text_append_text (option_menu, toolbar_styles[i]); gtk_combo_box_set_active (GTK_COMBO_BOX (option_menu), - gtk_toolbar_get_style (GTK_TOOLBAR (toolbar))); - gtk_container_add (GTK_CONTAINER (hbox2), option_menu); + gtk_toolbar_get_style (toolbar)); + gtk_container_add (GTK_CONTAINER (hbox2), GTK_WIDGET (option_menu)); g_signal_connect (option_menu, "changed", G_CALLBACK (change_toolbar_style), toolbar); @@ -463,7 +467,7 @@ main (gint argc, gchar **argv) gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "document-new"); gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), "Custom label"); add_item_to_list (store, item, "New"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); g_timeout_add (3000, (GSourceFunc) timeout_cb, item); gtk_tool_item_set_expand (item, TRUE); @@ -484,7 +488,7 @@ main (gint argc, gchar **argv) gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), "Open"); gtk_menu_tool_button_set_popover (GTK_MENU_TOOL_BUTTON (item), menu); add_item_to_list (store, item, "Open"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); g_timeout_add (3000, (GSourceFunc) timeout_cb1, item); menu = gtk_popover_new (NULL); @@ -504,57 +508,57 @@ main (gint argc, gchar **argv) gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), "Back"); gtk_menu_tool_button_set_popover (GTK_MENU_TOOL_BUTTON (item), menu); add_item_to_list (store, item, "BackWithHistory"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); item = gtk_separator_tool_item_new (); add_item_to_list (store, item, "-----"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); image = gtk_image_new_from_icon_name ("dialog-warning"); - gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE); + gtk_image_set_icon_size (image, GTK_ICON_SIZE_LARGE); item = gtk_tool_item_new (); - gtk_widget_show (image); - gtk_container_add (GTK_CONTAINER (item), image); + gtk_widget_show (GTK_WIDGET (image)); + gtk_container_add (GTK_CONTAINER (item), GTK_WIDGET (image)); add_item_to_list (store, item, "(Custom Item)"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); item = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "go-previous"); gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), "Back"); add_item_to_list (store, item, "Back"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); item = gtk_separator_tool_item_new (); add_item_to_list (store, item, "-----"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); item = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "go-next"); gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), "Forward"); add_item_to_list (store, item, "Forward"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); item = gtk_toggle_tool_button_new (); gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), "Bold"); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "format-text-bold"); g_signal_connect (item, "toggled", G_CALLBACK (bold_toggled), NULL); add_item_to_list (store, item, "Bold"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE); item = gtk_separator_tool_item_new (); add_item_to_list (store, item, "-----"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); gtk_tool_item_set_expand (item, TRUE); gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (item), FALSE); - g_assert (gtk_toolbar_get_nth_item (GTK_TOOLBAR (toolbar), 0) != 0); + g_assert (gtk_toolbar_get_nth_item (toolbar, 0) != 0); item = gtk_radio_tool_button_new (NULL); gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), "Left"); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "format-justify-left"); group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (item)); add_item_to_list (store, item, "Left"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); item = gtk_radio_tool_button_new (group); @@ -562,36 +566,36 @@ main (gint argc, gchar **argv) gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "format-justify-center"); group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (item)); add_item_to_list (store, item, "Center"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); item = gtk_radio_tool_button_new (group); gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), "Right"); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "format-justify-right"); add_item_to_list (store, item, "Right"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); - item = gtk_tool_button_new (gtk_image_new_from_file ("apple-red.png"), "_Apple"); + item = gtk_tool_button_new (GTK_WIDGET (gtk_image_new_from_file ("apple-red.png")), "_Apple"); add_item_to_list (store, item, "Apple"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (item), TRUE); gicon = g_content_type_get_icon ("video/ogg"); image = gtk_image_new_from_gicon (gicon); g_object_unref (gicon); - item = gtk_tool_button_new (image, "Video"); + item = gtk_tool_button_new (GTK_WIDGET (image), "Video"); add_item_to_list (store, item, "Video"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); image = gtk_image_new_from_icon_name ("utilities-terminal"); - item = gtk_tool_button_new (image, "Terminal"); + item = gtk_tool_button_new (GTK_WIDGET (image), "Terminal"); add_item_to_list (store, item, "Terminal"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); - image = gtk_spinner_new (); - gtk_spinner_start (GTK_SPINNER (image)); - item = gtk_tool_button_new (image, "Spinner"); + spinner = gtk_spinner_new (); + gtk_spinner_start (GTK_SPINNER (spinner)); + item = gtk_tool_button_new (spinner, "Spinner"); add_item_to_list (store, item, "Spinner"); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + gtk_toolbar_insert (toolbar, item, -1); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); gtk_widget_set_hexpand (hbox, TRUE); @@ -601,12 +605,12 @@ main (gint argc, gchar **argv) gtk_container_add (GTK_CONTAINER (hbox), button); label = gtk_label_new ("Drop index:"); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); label = gtk_label_new (""); - gtk_widget_set_hexpand (label, TRUE); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (hbox), label); + gtk_widget_set_hexpand (GTK_WIDGET (label), TRUE); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); checkbox = gtk_check_button_new_with_mnemonic("_Right to left"); @@ -616,7 +620,7 @@ main (gint argc, gchar **argv) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), FALSE); g_signal_connect (checkbox, "toggled", G_CALLBACK (rtl_toggled), NULL); - gtk_container_add (GTK_CONTAINER (hbox), checkbox); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (checkbox)); targets = gdk_content_formats_new (target_table, G_N_ELEMENTS (target_table)); content = gdk_content_provider_new_for_bytes (target_table[0], g_bytes_new ("", 1)); @@ -629,7 +633,7 @@ main (gint argc, gchar **argv) g_signal_connect (dest, "drag_motion", G_CALLBACK (toolbar_drag_motion), toolbar); g_signal_connect (dest, "drag_leave", G_CALLBACK (toolbar_drag_leave), toolbar); g_signal_connect (dest, "drag_drop", G_CALLBACK (toolbar_drag_drop), label); - gtk_widget_add_controller (toolbar, GTK_EVENT_CONTROLLER (dest)); + gtk_widget_add_controller (GTK_WIDGET (toolbar), GTK_EVENT_CONTROLLER (dest)); gdk_content_formats_unref (targets); gtk_widget_show (window); diff --git a/tests/testtooltips.c b/tests/testtooltips.c index 0f9af5ce053d9feb6cc368c7c1922ca08682d49b..1abff638dc75b3c6060f82deda477222db0a4904 100644 --- a/tests/testtooltips.c +++ b/tests/testtooltips.c @@ -42,9 +42,9 @@ G_DEFINE_TYPE (MyTooltip, my_tooltip, GTK_TYPE_BIN) static void my_tooltip_init (MyTooltip *tt) { - GtkWidget *label = gtk_label_new ("Some text in a tooltip"); + GtkLabel *label = gtk_label_new ("Some text in a tooltip"); - gtk_container_add (GTK_CONTAINER (tt), label); + gtk_container_add (GTK_CONTAINER (tt), GTK_WIDGET (label)); gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (tt)), "background"); } @@ -266,8 +266,10 @@ main (int argc, char *argv[]) GtkWidget *window; GtkWidget *box; GtkWidget *drawing_area; + GtkCheckButton *checkbutton; GtkWidget *button; GtkWidget *tooltip; + GtkLabel *label; GtkWidget *popover; GtkWidget *box2; GtkWidget *custom; @@ -299,43 +301,43 @@ main (int argc, char *argv[]) /* A check button using the tooltip-markup property */ - button = gtk_check_button_new_with_label ("This one uses the tooltip-markup property"); - gtk_widget_set_tooltip_text (button, "Hello, I am a static tooltip."); - gtk_container_add (GTK_CONTAINER (box), button); + checkbutton = gtk_check_button_new_with_label ("This one uses the tooltip-markup property"); + gtk_widget_set_tooltip_text (GTK_WIDGET (checkbutton), "Hello, I am a static tooltip."); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (checkbutton)); - text = gtk_widget_get_tooltip_text (button); - markup = gtk_widget_get_tooltip_markup (button); + text = gtk_widget_get_tooltip_text (GTK_WIDGET (checkbutton)); + markup = gtk_widget_get_tooltip_markup (GTK_WIDGET (checkbutton)); g_assert (g_str_equal ("Hello, I am a static tooltip.", text)); g_assert (g_str_equal ("Hello, I am a static tooltip.", markup)); g_free (text); g_free (markup); /* A check button using the query-tooltip signal */ - button = gtk_check_button_new_with_label ("I use the query-tooltip signal"); - g_object_set (button, "has-tooltip", TRUE, NULL); - g_signal_connect (button, "query-tooltip", + checkbutton = gtk_check_button_new_with_label ("I use the query-tooltip signal"); + g_object_set (checkbutton, "has-tooltip", TRUE, NULL); + g_signal_connect (checkbutton, "query-tooltip", G_CALLBACK (query_tooltip_cb), NULL); - gtk_container_add (GTK_CONTAINER (box), button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (checkbutton)); /* A label */ - button = gtk_label_new ("I am just a label"); - gtk_label_set_selectable (GTK_LABEL (button), FALSE); - gtk_widget_set_tooltip_text (button, "Label & and tooltip"); - gtk_container_add (GTK_CONTAINER (box), button); + label = gtk_label_new ("I am just a label"); + gtk_label_set_selectable (label, FALSE); + gtk_widget_set_tooltip_text (GTK_WIDGET (label), "Label & and tooltip"); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); - text = gtk_widget_get_tooltip_text (button); - markup = gtk_widget_get_tooltip_markup (button); + text = gtk_widget_get_tooltip_text (GTK_WIDGET (label)); + markup = gtk_widget_get_tooltip_markup (GTK_WIDGET (label)); g_assert (g_str_equal ("Label & and tooltip", text)); g_assert (g_str_equal ("Label & and tooltip", markup)); g_free (text); g_free (markup); /* A selectable label */ - button = gtk_label_new ("I am a selectable label"); - gtk_label_set_selectable (GTK_LABEL (button), TRUE); - gtk_widget_set_tooltip_markup (button, "Another Label tooltip"); - gtk_container_add (GTK_CONTAINER (box), button); + label = gtk_label_new ("I am a selectable label"); + gtk_label_set_selectable (label, TRUE); + gtk_widget_set_tooltip_markup (GTK_WIDGET (label), "Another Label tooltip"); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); - text = gtk_widget_get_tooltip_text (button); - markup = gtk_widget_get_tooltip_markup (button); + text = gtk_widget_get_tooltip_text (GTK_WIDGET (label)); + markup = gtk_widget_get_tooltip_markup (GTK_WIDGET (label)); g_assert (g_str_equal ("Another Label tooltip", text)); g_assert (g_str_equal ("Another Label tooltip", markup)); g_free (text); g_free (markup); @@ -413,25 +415,25 @@ main (int argc, char *argv[]) box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (popover), box2); - button = gtk_label_new ("Hidden here"); + label = gtk_label_new ("Hidden here"); custom = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_container_add (GTK_CONTAINER (custom), gtk_label_new ("See, custom")); + gtk_container_add (GTK_CONTAINER (custom), GTK_WIDGET (gtk_label_new ("See, custom"))); gtk_container_add (GTK_CONTAINER (custom), g_object_new (GTK_TYPE_SPINNER, "active", TRUE, NULL)); g_object_ref_sink (custom); g_object_set (button, "has-tooltip", TRUE, NULL); - gtk_container_add (GTK_CONTAINER (box2), button); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (label)); g_signal_connect (button, "query-tooltip", G_CALLBACK (query_tooltip_label_cb), custom); - button = gtk_label_new ("Custom tooltip II"); + label = gtk_label_new ("Custom tooltip II"); custom = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_container_add (GTK_CONTAINER (custom), gtk_label_new ("See, custom too")); + gtk_container_add (GTK_CONTAINER (custom), GTK_WIDGET (gtk_label_new ("See, custom too"))); gtk_container_add (GTK_CONTAINER (custom), g_object_new (GTK_TYPE_SPINNER, "active", TRUE, NULL)); g_object_ref_sink (custom); - g_object_set (button, "has-tooltip", TRUE, NULL); + g_object_set (label, "has-tooltip", TRUE, NULL); g_signal_connect (button, "query-tooltip", G_CALLBACK (query_tooltip_label_cb), custom); - gtk_container_add (GTK_CONTAINER (box), button); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); /* Done! */ gtk_widget_show (window); diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c index b22f5fbf95e9cadd543bf888743c1c0ba16a3b2f..18278e8d236f8a54fc4cd33d2a985c8563004c5a 100644 --- a/tests/testtreecolumns.c +++ b/tests/testtreecolumns.c @@ -888,7 +888,7 @@ main (int argc, char *argv[]) GDK_ACTION_MOVE); gdk_content_formats_unref (targets); - gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_container_add (GTK_CONTAINER (vbox), hbox); diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c index 7bd3187b58c2c0b53c845a5029e07047e591b404..26b17d6dd2109d53e42a207f779adb77564b285f 100644 --- a/tests/testtreecolumnsizing.c +++ b/tests/testtreecolumnsizing.c @@ -91,14 +91,14 @@ toggle_long_content_row (GtkToggleButton *button, } static void -combo_box_changed (GtkComboBox *combo_box, - gpointer user_data) +combo_box_changed (GtkComboBoxText *combo_box, + gpointer user_data) { gchar *str; GList *list; GList *columns; - str = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo_box)); + str = gtk_combo_box_text_get_active_text (combo_box); if (!str) return; @@ -165,10 +165,10 @@ main (int argc, char **argv) int i; GtkWidget *window; GtkWidget *vbox; - GtkWidget *combo_box; + GtkComboBoxText *combo_box; GtkWidget *sw; GtkWidget *tree_view; - GtkWidget *button; + GtkToggleButton *button; gtk_init (); @@ -183,14 +183,14 @@ main (int argc, char **argv) /* Option menu contents */ combo_box = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), NO_EXPAND); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), SINGLE_EXPAND); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), MULTI_EXPAND); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), LAST_EXPAND); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), BORDER_EXPAND); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), ALL_EXPAND); + gtk_combo_box_text_append_text (combo_box, NO_EXPAND); + gtk_combo_box_text_append_text (combo_box, SINGLE_EXPAND); + gtk_combo_box_text_append_text (combo_box, MULTI_EXPAND); + gtk_combo_box_text_append_text (combo_box, LAST_EXPAND); + gtk_combo_box_text_append_text (combo_box, BORDER_EXPAND); + gtk_combo_box_text_append_text (combo_box, ALL_EXPAND); - gtk_container_add (GTK_CONTAINER (vbox), combo_box); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (combo_box)); /* Scrolled window and tree view */ sw = gtk_scrolled_window_new (NULL, NULL); @@ -221,7 +221,7 @@ main (int argc, char **argv) button = gtk_toggle_button_new_with_label ("Toggle long content row"); g_signal_connect (button, "toggled", G_CALLBACK (toggle_long_content_row), tree_view); - gtk_container_add (GTK_CONTAINER (vbox), button); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (button)); /* Set up option menu callback and default item */ g_signal_connect (combo_box, "changed", diff --git a/tests/testtreednd.c b/tests/testtreednd.c index 306e87ad45a6f819b0bcd16189b2a886b8bf6de4..4238b29f7cc94f38f158e54878d873aeb18ef205 100644 --- a/tests/testtreednd.c +++ b/tests/testtreednd.c @@ -120,7 +120,7 @@ drag_drop (GtkDropTarget *dest, static GtkWidget * get_droptarget (void) { - GtkWidget *label; + GtkLabel *label; GdkContentFormats *targets; GtkDropTarget *dest; @@ -128,10 +128,10 @@ get_droptarget (void) targets = gdk_content_formats_new (entries, G_N_ELEMENTS (entries)); dest = gtk_drop_target_new (targets, GDK_ACTION_COPY); g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), NULL); - gtk_widget_add_controller (label, GTK_EVENT_CONTROLLER (dest)); + gtk_widget_add_controller (GTK_WIDGET (label), GTK_EVENT_CONTROLLER (dest)); gdk_content_formats_unref (targets); - return label; + return GTK_WIDGET (label); } int diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c index 0b47b28a333891b8a8fc9626f5daa33e7cd7a39d..f0590a32284961d40899f0baa358b49dfd9dbcc8 100644 --- a/tests/testtreeedit.c +++ b/tests/testtreeedit.c @@ -186,7 +186,7 @@ enum { static void create_control (GtkWidget *box, gint number, gint cntl, CallbackData *data) { - GtkWidget *checkbutton; + GtkCheckButton *checkbutton; GCallback callback = NULL; gchar *name = NULL; @@ -208,7 +208,7 @@ create_control (GtkWidget *box, gint number, gint cntl, CallbackData *data) checkbutton = gtk_check_button_new_with_label (name); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), cntl == CNTL_FIXED); - gtk_container_add (GTK_CONTAINER (box), checkbutton); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (checkbutton)); g_signal_connect (G_OBJECT (checkbutton), "toggled", callback, data); g_free (name); diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c index 6155744595ec8faa3431a83f6a45ee3ddf695366..5686307ec4ba3a0b729a6250c5a2f0b9ad262086 100644 --- a/tests/testtreeflow.c +++ b/tests/testtreeflow.c @@ -134,7 +134,7 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Reflow test"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Incremental Reflow Test")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_label_new ("Incremental Reflow Test"))); gtk_container_add (GTK_CONTAINER (window), vbox); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c index 65cebaf587340605b1093e19968c57acbee68f7e..487adb7110f4cf2295b1b474314e80f0f3790efa 100644 --- a/tests/testtreefocus.c +++ b/tests/testtreefocus.c @@ -352,7 +352,7 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_label_new ("Jonathan's Holiday Card Planning Sheet"))); gtk_container_add (GTK_CONTAINER (window), vbox); scrolled_window = gtk_scrolled_window_new (NULL, NULL); @@ -467,7 +467,7 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Model"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("The model revealed")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_label_new ("The model revealed"))); gtk_container_add (GTK_CONTAINER (window), vbox); scrolled_window = gtk_scrolled_window_new (NULL, NULL); diff --git a/tests/testtreelistmodel.c b/tests/testtreelistmodel.c index 277a6e156d61666f855d4eab0ffe09395f4b3c45..e7ba5f837abd7893e2dcc5847559e7946f1340e5 100644 --- a/tests/testtreelistmodel.c +++ b/tests/testtreelistmodel.c @@ -166,6 +166,7 @@ create_widget_for_model (gpointer item, gpointer root) { GtkWidget *row, *box, *child; + GtkLabel *label; GFileInfo *info; GFile *file; guint depth; @@ -202,7 +203,7 @@ create_widget_for_model (gpointer item, } else { - child = gtk_image_new (); /* empty whatever */ + child = GTK_WIDGET (gtk_image_new ()); /* empty whatever */ } gtk_container_add (GTK_CONTAINER (box), child); @@ -211,15 +212,15 @@ create_widget_for_model (gpointer item, icon = g_file_info_get_icon (info); if (icon) { - child = gtk_image_new_from_gicon (icon); + child = GTK_WIDGET (gtk_image_new_from_gicon (icon)); gtk_container_add (GTK_CONTAINER (box), child); } file = g_object_get_data (G_OBJECT (info), "file"); - child = gtk_label_new (g_file_get_basename (file)); + label = gtk_label_new (g_file_get_basename (file)); g_object_unref (info); - gtk_container_add (GTK_CONTAINER (box), child); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); return row; } diff --git a/tests/testtreesort.c b/tests/testtreesort.c index 14a1b25e1e3aac3951e90c07c70cac4ecd1a7464..75e28921aa2161f847d6b28f985fdcc427460ad2 100644 --- a/tests/testtreesort.c +++ b/tests/testtreesort.c @@ -108,7 +108,8 @@ main (int argc, char *argv[]) GtkTreeIter iter; gint i; - GtkWidget *entry, *button; + GtkEntry *entry; + GtkWidget *button; GtkWidget *window2, *vbox2, *scrolled_window2, *tree_view2; GtkWidget *window3, *vbox3, *scrolled_window3, *tree_view3; @@ -122,11 +123,11 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Words, words, words - Window 1"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Jonathan and Kristian's list of cool words. (And Anders' cool list of numbers) \n\nThis is just a GtkTreeStore")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (gtk_label_new ("Jonathan and Kristian's list of cool words. (And Anders' cool list of numbers) \n\nThis is just a GtkTreeStore"))); gtk_container_add (GTK_CONTAINER (window), vbox); entry = gtk_entry_new (); - gtk_container_add (GTK_CONTAINER (vbox), entry); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (entry)); button = gtk_button_new_with_label ("Switch search method"); gtk_container_add (GTK_CONTAINER (vbox), button); @@ -251,7 +252,7 @@ main (int argc, char *argv[]) g_signal_connect (window2, "destroy", gtk_main_quit, NULL); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_container_add (GTK_CONTAINER (vbox2), - gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeStore of window 1")); + GTK_WIDGET (gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeStore of window 1"))); gtk_container_add (GTK_CONTAINER (window2), vbox2); scrolled_window2 = gtk_scrolled_window_new (NULL, NULL); @@ -320,7 +321,7 @@ main (int argc, char *argv[]) g_signal_connect (window3, "destroy", gtk_main_quit, NULL); vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_container_add (GTK_CONTAINER (vbox3), - gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeModelSort of window 2")); + GTK_WIDGET (gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeModelSort of window 2"))); gtk_container_add (GTK_CONTAINER (window3), vbox3); scrolled_window3 = gtk_scrolled_window_new (NULL, NULL); diff --git a/tests/testtreeview.c b/tests/testtreeview.c index 37735cda33347b3e642a94c93f255ed1836f437f..f170dc467fe3729a5ed1930259e71f5d1e9f6e4f 100644 --- a/tests/testtreeview.c +++ b/tests/testtreeview.c @@ -303,7 +303,7 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type) GtkTreeViewColumn *col; GtkCellRenderer *rend; GdkPixbuf *pixbuf; - GtkWidget *image; + GtkImage *image; GtkAdjustment *adjustment; current_column_type = type; @@ -363,9 +363,9 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type) g_object_unref (pixbuf); - gtk_widget_show (image); + gtk_widget_show (GTK_WIDGET (image)); - gtk_tree_view_column_set_widget (col, image); + gtk_tree_view_column_set_widget (col, GTK_WIDGET (image)); rend = gtk_cell_renderer_toggle_new (); @@ -653,7 +653,7 @@ main (int argc, GtkWidget *sw; GtkWidget *tv; GtkWidget *box; - GtkWidget *combo_box; + GtkComboBoxText *combo_box; GtkTreeModel *model; GdkContentFormats *targets; gint i; @@ -710,11 +710,11 @@ main (int argc, /* Model menu */ combo_box = gtk_combo_box_text_new (); - gtk_widget_set_halign (combo_box, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (combo_box), GTK_ALIGN_CENTER); for (i = 0; i < MODEL_LAST; i++) - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), model_names[i]); + gtk_combo_box_text_append_text (combo_box, model_names[i]); - gtk_container_add (GTK_CONTAINER (box), combo_box); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo_box)); g_signal_connect (combo_box, "changed", G_CALLBACK (model_selected), @@ -722,11 +722,11 @@ main (int argc, /* Columns menu */ combo_box = gtk_combo_box_text_new (); - gtk_widget_set_halign (combo_box, GTK_ALIGN_CENTER); + gtk_widget_set_halign (GTK_WIDGET (combo_box), GTK_ALIGN_CENTER); for (i = 0; i < COLUMNS_LAST; i++) - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), column_type_names[i]); + gtk_combo_box_text_append_text (combo_box, column_type_names[i]); - gtk_container_add (GTK_CONTAINER (box), combo_box); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (combo_box)); set_columns_type (GTK_TREE_VIEW (tv), COLUMNS_LOTS); gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), COLUMNS_LOTS); diff --git a/tests/testwidgettransforms.c b/tests/testwidgettransforms.c index d8cf78fc6c5c58e05b919d1871a86f11ff4f459d..dd7a5af17d051c917259633645c8ae357ff849a7 100644 --- a/tests/testwidgettransforms.c +++ b/tests/testwidgettransforms.c @@ -285,7 +285,7 @@ main (int argc, char **argv) GtkWidget *matrix_chooser; GtkWidget *box; GtkWidget *titlebar; - GtkWidget *toggle_button; + GtkToggleButton *toggle_button; GtkCssProvider *provider; gtk_init (); @@ -308,9 +308,9 @@ main (int argc, char **argv) toggle_button = gtk_toggle_button_new (); gtk_button_set_label (GTK_BUTTON (toggle_button), "Picking"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle_button), do_picking); + gtk_toggle_button_set_active (toggle_button, do_picking); g_signal_connect (toggle_button, "toggled", G_CALLBACK (toggled_cb), NULL); - gtk_container_add (GTK_CONTAINER (titlebar), toggle_button); + gtk_container_add (GTK_CONTAINER (titlebar), GTK_WIDGET (toggle_button)); test_widget = gtk_button_new (); gtk_widget_set_size_request (test_widget, TEST_WIDGET_MIN_SIZE, TEST_WIDGET_MIN_SIZE); @@ -318,7 +318,7 @@ main (int argc, char **argv) gtk_widget_set_valign (test_widget, GTK_ALIGN_CENTER); - test_child = gtk_image_new_from_icon_name ("weather-clear"); + test_child = GTK_WIDGET (gtk_image_new_from_icon_name ("weather-clear")); gtk_widget_set_halign (test_child, GTK_ALIGN_CENTER); gtk_widget_set_valign (test_child, GTK_ALIGN_CENTER); gtk_widget_set_size_request (test_child, TEST_WIDGET_MIN_SIZE / 2, TEST_WIDGET_MIN_SIZE / 2); diff --git a/tests/testwindowdrag.c b/tests/testwindowdrag.c index baa49952ac9b3df38501310f2224b103fa8d7541..0c800ed4c21b42bef2e4165ceaa69cb46de743be 100644 --- a/tests/testwindowdrag.c +++ b/tests/testwindowdrag.c @@ -33,17 +33,17 @@ start_resize (GtkGestureClick *gesture, static GtkWidget * resize_button (GdkSurfaceEdge edge) { - GtkWidget *button; + GtkImage *button; GtkGesture *gesture; button = gtk_image_new_from_icon_name ("view-fullscreen-symbolic"); - gtk_widget_set_hexpand (button, TRUE); - gtk_widget_set_vexpand (button, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (button), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (button), TRUE); gesture = gtk_gesture_click_new (); g_signal_connect (gesture, "pressed", G_CALLBACK (start_resize), GINT_TO_POINTER (edge)); - gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (gesture)); + gtk_widget_add_controller (GTK_WIDGET (button), GTK_EVENT_CONTROLLER (gesture)); - return button; + return GTK_WIDGET (button); } static void @@ -77,17 +77,17 @@ start_move (GtkGestureClick *gesture, static GtkWidget * move_button (void) { - GtkWidget *button; + GtkImage *button; GtkGesture *gesture; button = gtk_image_new_from_icon_name ("view-grid-symbolic"); - gtk_widget_set_hexpand (button, TRUE); - gtk_widget_set_vexpand (button, TRUE); + gtk_widget_set_hexpand (GTK_WIDGET (button), TRUE); + gtk_widget_set_vexpand (GTK_WIDGET (button), TRUE); gesture = gtk_gesture_click_new (); g_signal_connect (gesture, "pressed", G_CALLBACK (start_move), NULL); - gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (gesture)); + gtk_widget_add_controller (GTK_WIDGET (button), GTK_EVENT_CONTROLLER (gesture)); - return button; + return GTK_WIDGET (button); } int diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c index e5fb8769063be4e9a67b54631869780ae8e7c1dc..820fafa5687ea2598134efe82ced071210b569a3 100644 --- a/tests/testwindowsize.c +++ b/tests/testwindowsize.c @@ -6,7 +6,7 @@ static GtkWidget *width_chars_spin; static GtkWidget *max_width_chars_spin; static GtkWidget *default_width_spin; static GtkWidget *default_height_spin; -static GtkWidget *resizable_check; +static GtkCheckButton *resizable_check; static void size_changed_cb (GdkSurface *surface, int width, int height, GtkLabel *label) @@ -22,7 +22,7 @@ static void show_dialog (void) { GtkWidget *dialog; - GtkWidget *label; + GtkLabel *label; gint width_chars, max_width_chars, default_width, default_height; gboolean resizable; @@ -49,21 +49,21 @@ show_dialog (void) "mi eu ipsum vestibulum in venenatis enim commodo. " "Vivamus non malesuada ligula."); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_width_chars (GTK_LABEL (label), width_chars); - gtk_label_set_max_width_chars (GTK_LABEL (label), max_width_chars); + gtk_label_set_wrap (label, TRUE); + gtk_label_set_width_chars (label, width_chars); + gtk_label_set_max_width_chars (label, max_width_chars); gtk_window_set_default_size (GTK_WINDOW (dialog), default_width, default_height); gtk_window_set_resizable (GTK_WINDOW (dialog), resizable); gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), - label); - gtk_widget_show (label); + GTK_WIDGET (label)); + gtk_widget_show GTK_WIDGET (GTK_WIDGET (label)); label = gtk_label_new ("? x ?"); - //gtk_widget_show (label); + //gtk_widget_show GTK_WIDGET (label); - gtk_dialog_add_action_widget (GTK_DIALOG (dialog), label, GTK_RESPONSE_HELP); + gtk_dialog_add_action_widget (GTK_DIALOG (dialog), GTK_WIDGET (label), GTK_RESPONSE_HELP); gtk_widget_realize (dialog); g_signal_connect (gtk_native_get_surface (GTK_NATIVE (dialog)), "size-changed", G_CALLBACK (size_changed_cb), label); @@ -77,7 +77,7 @@ static void create_window (void) { GtkWidget *grid; - GtkWidget *label; + GtkLabel *label; GtkWidget *button; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -90,39 +90,39 @@ create_window (void) gtk_container_add (GTK_CONTAINER (window), grid); label = gtk_label_new ("Width chars"); - gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); width_chars_spin = gtk_spin_button_new_with_range (-1, 1000, 1); gtk_widget_set_halign (width_chars_spin, GTK_ALIGN_START); - gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1); gtk_grid_attach (GTK_GRID (grid), width_chars_spin, 1, 0, 1, 1); label = gtk_label_new ("Max width chars"); - gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); max_width_chars_spin = gtk_spin_button_new_with_range (-1, 1000, 1); gtk_widget_set_halign (width_chars_spin, GTK_ALIGN_START); - gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 1, 1, 1); gtk_grid_attach (GTK_GRID (grid), max_width_chars_spin, 1, 1, 1, 1); label = gtk_label_new ("Default size"); - gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); default_width_spin = gtk_spin_button_new_with_range (-1, 1000, 1); gtk_widget_set_halign (default_width_spin, GTK_ALIGN_START); default_height_spin = gtk_spin_button_new_with_range (-1, 1000, 1); gtk_widget_set_halign (default_height_spin, GTK_ALIGN_START); - gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 2, 1, 1); gtk_grid_attach (GTK_GRID (grid), default_width_spin, 1, 2, 1, 1); gtk_grid_attach (GTK_GRID (grid), default_height_spin, 2, 2, 1, 1); label = gtk_label_new ("Resizable"); - gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START); resizable_check = gtk_check_button_new (); - gtk_widget_set_halign (resizable_check, GTK_ALIGN_START); + gtk_widget_set_halign (GTK_WIDGET (resizable_check), GTK_ALIGN_START); - gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1); - gtk_grid_attach (GTK_GRID (grid), resizable_check, 1, 3, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 3, 1, 1); + gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (resizable_check), 1, 3, 1, 1); button = gtk_button_new_with_label ("Show"); g_signal_connect (button, "clicked", G_CALLBACK (show_dialog), NULL); diff --git a/tests/treestoretest.c b/tests/treestoretest.c index 2eaddcf702e92d5f7d0ee05d9d49b04450e99f08..40c4e02db2f59053173f704d336013cc066a3751 100644 --- a/tests/treestoretest.c +++ b/tests/treestoretest.c @@ -281,7 +281,8 @@ make_window (gint view_type) { GtkWidget *window; GtkWidget *vbox; - GtkWidget *hbox, *entry; + GtkWidget *hbox; + GtkEntry *entry; GtkWidget *button; GtkWidget *scrolled_window; GtkWidget *tree_view; @@ -352,7 +353,7 @@ make_window (gint view_type) entry = gtk_entry_new (); gtk_container_add (GTK_CONTAINER (vbox), hbox); gtk_container_add (GTK_CONTAINER (hbox), button); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); g_object_set_data (G_OBJECT (button), "user_data", entry); g_signal_connect (button, "clicked", G_CALLBACK (iter_insert), @@ -363,7 +364,7 @@ make_window (gint view_type) entry = gtk_entry_new (); gtk_container_add (GTK_CONTAINER (vbox), hbox); gtk_container_add (GTK_CONTAINER (hbox), button); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); g_object_set_data (G_OBJECT (button), "user_data", entry); g_signal_connect (button, "clicked", G_CALLBACK (iter_change), @@ -374,7 +375,7 @@ make_window (gint view_type) entry = gtk_entry_new (); gtk_container_add (GTK_CONTAINER (vbox), hbox); gtk_container_add (GTK_CONTAINER (hbox), button); - gtk_container_add (GTK_CONTAINER (hbox), entry); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (entry)); g_object_set_data (G_OBJECT (button), "user_data", entry); g_signal_connect (button, "clicked", G_CALLBACK (iter_insert_with_values), diff --git a/tests/visuals/visuals.c b/tests/visuals/visuals.c index 069d8132f33f04e179ccb85ad1e23a33faf27ef8..5d08dd6c83421c8a390eecfb94dbc587589bcf13 100644 --- a/tests/visuals/visuals.c +++ b/tests/visuals/visuals.c @@ -37,14 +37,14 @@ static void create_dark_popup (GtkWidget *parent) { GtkWidget *popup = gtk_window_new (GTK_WINDOW_TOPLEVEL); - GtkWidget *button = gtk_toggle_button_new_with_label ("Dark"); + GtkToggleButton *button = gtk_toggle_button_new_with_label ("Dark"); gtk_window_set_decorated (GTK_WINDOW (popup), FALSE); gtk_widget_set_size_request (popup, 100, 100); gtk_window_set_resizable (GTK_WINDOW (popup), FALSE); gtk_window_set_hide_on_close (GTK_WINDOW (popup), TRUE); - gtk_container_add (GTK_CONTAINER (popup), button); + gtk_container_add (GTK_CONTAINER (popup), GTK_WIDGET (button)); g_signal_connect (button, "toggled", G_CALLBACK (dark_button_toggled_cb), NULL); diff --git a/testsuite/a11y/children.c b/testsuite/a11y/children.c index cc186c3259b3d34a418fd145e170120dfe4c61b6..3d282002f235f4f1ad9454e8ce588b6ac0ffb4a1 100644 --- a/testsuite/a11y/children.c +++ b/testsuite/a11y/children.c @@ -40,7 +40,7 @@ test_scrolled_window_child_count (void) g_object_ref_sink (sw); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS); - gtk_container_add (GTK_CONTAINER (sw), gtk_label_new ("Bla")); + gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (gtk_label_new ("Bla"))); accessible = gtk_widget_get_accessible (sw); g_assert_cmpint (atk_object_get_n_accessible_children (accessible), ==, 3); @@ -132,7 +132,7 @@ do_create_child (STATE *state, gint i) else if (gtk_container_child_type (GTK_CONTAINER (state->widget)) == G_TYPE_NONE) return FALSE; - state->child[i] = gtk_label_new ("bla"); + state->child[i] = GTK_WIDGET (gtk_label_new ("bla")); return TRUE; } @@ -251,7 +251,7 @@ main (int argc, char *argv[]) add_child_tests (gtk_window_new (GTK_WINDOW_TOPLEVEL)); add_child_tests (gtk_assistant_new ()); add_child_tests (gtk_frame_new ("frame")); - add_child_tests (gtk_expander_new ("expander")); + add_child_tests (GTK_WIDGET (gtk_expander_new ("expander"))); add_child_tests (gtk_text_view_new ()); add_child_tests (gtk_tree_view_new ()); #if 0 @@ -260,7 +260,7 @@ main (int argc, char *argv[]) add_child_tests (gtk_statusbar_new ()); #endif add_child_tests (gtk_notebook_new ()); - add_child_tests (gtk_entry_new ()); + add_child_tests (GTK_WIDGET (gtk_entry_new ())); return g_test_run (); } diff --git a/testsuite/a11y/misc.c b/testsuite/a11y/misc.c index 96c870ba52e96818253dafbae50fab4c0ce4dbd9..409c3fc405d6b6e1317bcf00292b446cfd3c72b1 100644 --- a/testsuite/a11y/misc.c +++ b/testsuite/a11y/misc.c @@ -23,7 +23,7 @@ static void test_popover_parent (void) { - GtkWidget *w; + GtkEntry *w; GtkWidget *p; AtkObject *a; @@ -37,11 +37,11 @@ test_popover_parent (void) g_assert (a != NULL); g_assert (atk_object_get_parent (a) == NULL); - gtk_popover_set_relative_to (GTK_POPOVER (p), w); + gtk_popover_set_relative_to (GTK_POPOVER (p), GTK_WIDGET (w)); g_assert (atk_object_get_parent (a) != NULL); - gtk_widget_destroy (w); + gtk_widget_destroy (GTK_WIDGET (w)); gtk_widget_destroy (p); } diff --git a/testsuite/a11y/text.c b/testsuite/a11y/text.c index fc5ac70cc39d4552a4ed7740d3de9bdc441a12bf..2f9a6b8015fb3dd4f6db03f169de5a58384f9aca 100644 --- a/testsuite/a11y/text.c +++ b/testsuite/a11y/text.c @@ -1060,7 +1060,7 @@ add_text_tests (GtkWidget *widget) static void test_bold_label (void) { - GtkWidget *label; + GtkLabel *label; AtkObject *atk_obj; gchar *text; @@ -1069,13 +1069,13 @@ test_bold_label (void) label = gtk_label_new ("Bold?"); g_object_ref_sink (label); - atk_obj = gtk_widget_get_accessible (label); + atk_obj = gtk_widget_get_accessible (GTK_WIDGET (label)); text = atk_text_get_text (ATK_TEXT (atk_obj), 0, -1); g_assert_cmpstr (text, ==, "Bold?"); g_free (text); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_use_markup (label, TRUE); text = atk_text_get_text (ATK_TEXT (atk_obj), 0, -1); g_assert_cmpstr (text, ==, "Bold?"); @@ -1091,8 +1091,8 @@ main (int argc, char *argv[]) g_test_add_func ("/text/bold/GtkLabel", test_bold_label); - add_text_tests (gtk_label_new ("")); - add_text_tests (gtk_text_new ()); + add_text_tests (GTK_WIDGET (gtk_label_new (""))); + add_text_tests (GTK_WIDGET (gtk_text_new ())); add_text_tests (gtk_text_view_new ()); return g_test_run (); diff --git a/testsuite/gtk/action.c b/testsuite/gtk/action.c index 50882c36d64d7adb5dba0e66f1ef4834b42ac6b4..e392ed893f2fa78999b2a2789177925c683420e9 100644 --- a/testsuite/gtk/action.c +++ b/testsuite/gtk/action.c @@ -150,7 +150,7 @@ static void test_text (void) { GtkWidget *box; - GtkWidget *text; + GtkText *text; GSimpleActionGroup *clipboard_actions; GActionEntry clipboard_entries[] = { { "cut", cut_activate, NULL, NULL, NULL }, @@ -160,7 +160,7 @@ test_text (void) box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); text = gtk_text_new (); - gtk_container_add (GTK_CONTAINER (box), text); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (text)); clipboard_actions = g_simple_action_group_new (); g_action_map_add_action_entries (G_ACTION_MAP (clipboard_actions), @@ -170,9 +170,9 @@ test_text (void) gtk_widget_insert_action_group (box, "clipboard", G_ACTION_GROUP (clipboard_actions)); - gtk_widget_activate_action (text, "cut.clipboard", NULL); - gtk_widget_activate_action (text, "copy.clipboard", NULL); - gtk_widget_activate_action (text, "paste.clipboard", NULL); + gtk_widget_activate_action (GTK_WIDGET (text), "cut.clipboard", NULL); + gtk_widget_activate_action (GTK_WIDGET (text), "copy.clipboard", NULL); + gtk_widget_activate_action (GTK_WIDGET (text), "paste.clipboard", NULL); g_assert_cmpint (cut_activated, ==, 0); g_assert_cmpint (copy_activated, ==, 0); @@ -181,7 +181,7 @@ test_text (void) g_signal_connect (text, "notify::visibility", G_CALLBACK (visibility_changed_cb), NULL); - gtk_widget_activate_action (text, "misc.toggle-visibility", NULL); + gtk_widget_activate_action (GTK_WIDGET (text), "misc.toggle-visibility", NULL); g_assert_cmpint (visibility_changed, ==, 1); @@ -282,8 +282,8 @@ activate2 (GSimpleAction *action, static void test_overlap2 (void) { - GtkWidget *text; - GtkWidget *child; + GtkText *text; + GtkLabel *child; GSimpleActionGroup *group1; GSimpleActionGroup *group2; GActionEntry entries1[] = { @@ -298,13 +298,13 @@ test_overlap2 (void) G_CALLBACK (visibility_toggled), NULL); child = gtk_label_new (""); - gtk_widget_set_parent (child, text); + gtk_widget_set_parent (GTK_WIDGET (child), GTK_WIDGET (text)); g_assert_cmpint (toggled, ==, 0); g_assert_cmpint (act1, ==, 0); g_assert_cmpint (act2, ==, 0); - gtk_widget_activate_action (child, "misc.toggle-visibility", NULL); + gtk_widget_activate_action (GTK_WIDGET (child), "misc.toggle-visibility", NULL); g_assert_cmpint (toggled, ==, 1); g_assert_cmpint (act1, ==, 0); @@ -315,8 +315,8 @@ test_overlap2 (void) entries1, G_N_ELEMENTS (entries1), NULL); - gtk_widget_insert_action_group (text, "misc", G_ACTION_GROUP (group1)); - gtk_widget_activate_action (child, "misc.toggle-visibility", NULL); + gtk_widget_insert_action_group (GTK_WIDGET (text), "misc", G_ACTION_GROUP (group1)); + gtk_widget_activate_action (GTK_WIDGET (child), "misc.toggle-visibility", NULL); g_assert_cmpint (toggled, ==, 2); g_assert_cmpint (act1, ==, 0); @@ -327,15 +327,15 @@ test_overlap2 (void) entries2, G_N_ELEMENTS (entries2), NULL); - gtk_widget_insert_action_group (child, "misc", G_ACTION_GROUP (group2)); + gtk_widget_insert_action_group (GTK_WIDGET (child), "misc", G_ACTION_GROUP (group2)); - gtk_widget_activate_action (child, "misc.toggle-visibility", NULL); + gtk_widget_activate_action (GTK_WIDGET (child), "misc.toggle-visibility", NULL); g_assert_cmpint (toggled, ==, 2); g_assert_cmpint (act1, ==, 0); g_assert_cmpint (act2, ==, 1); - gtk_widget_destroy (text); + gtk_widget_destroy (GTK_WIDGET (text)); g_object_unref (group1); g_object_unref (group2); } @@ -394,7 +394,7 @@ test_introspection (void) static void test_enabled (void) { - GtkWidget *text; + GtkText *text; text = gtk_text_new (); g_signal_connect (text, "notify::visibility", @@ -402,17 +402,17 @@ test_enabled (void) toggled = 0; - gtk_widget_activate_action (text, "misc.toggle-visibility", NULL); + gtk_widget_activate_action (GTK_WIDGET (text), "misc.toggle-visibility", NULL); g_assert_cmpint (toggled, ==, 1); - gtk_widget_action_set_enabled (text, "misc.toggle-visibility", FALSE); + gtk_widget_action_set_enabled (GTK_WIDGET (text), "misc.toggle-visibility", FALSE); - gtk_widget_activate_action (text, "misc.toggle-visibility", NULL); + gtk_widget_activate_action (GTK_WIDGET (text), "misc.toggle-visibility", NULL); g_assert_cmpint (toggled, ==, 1); - gtk_widget_destroy (text); + gtk_widget_destroy (GTK_WIDGET (text)); } int diff --git a/testsuite/gtk/cellarea.c b/testsuite/gtk/cellarea.c index 1319ad5fb126d5495dbe28ac522df4f6f9d9832a..2a9949dbff9776b02805496b59cfe8dafd067341 100644 --- a/testsuite/gtk/cellarea.c +++ b/testsuite/gtk/cellarea.c @@ -79,7 +79,7 @@ test_iconview_object_new (void) static void test_combobox_new (void) { - GtkWidget *view; + GtkComboBox *view; GtkCellArea *area; view = gtk_combo_box_new (); @@ -163,7 +163,7 @@ test_combobox_subclass2 (void) static void test_cellview_new (void) { - GtkWidget *view; + GtkCellView *view; GtkCellArea *area; view = gtk_cell_view_new (); @@ -179,7 +179,7 @@ test_cellview_new (void) static void test_cellview_new_with_context (void) { - GtkWidget *view; + GtkCellView *view; GtkCellArea *area; GtkCellAreaContext *context; diff --git a/testsuite/gtk/entry.c b/testsuite/gtk/entry.c index 814e3c0809460624cb3879771f7f8dab5bce9e7e..cb9655f3421c97a67cd21f40272d054e4d1bf18b 100644 --- a/testsuite/gtk/entry.c +++ b/testsuite/gtk/entry.c @@ -110,7 +110,7 @@ changed (GtkEditable *editable, static void test_insert (void) { - GtkWidget *entry; + GtkEntry *entry; gint pos; EntryData data1; EntryData data2; @@ -212,7 +212,7 @@ test_insert (void) static void test_delete (void) { - GtkWidget *entry; + GtkEntry *entry; gint pos; EntryData data1; EntryData data2; diff --git a/testsuite/gtk/focus.c b/testsuite/gtk/focus.c index 73b777a05fedc0f2bbc9916841e856208cd31203..86bcc63bee6994518dad04edb459a5a190eca2a0 100644 --- a/testsuite/gtk/focus.c +++ b/testsuite/gtk/focus.c @@ -75,10 +75,10 @@ test_window_focus (void) GtkWidget *box; GtkWidget *box1; GtkWidget *box2; - GtkWidget *label1; - GtkWidget *label2; - GtkWidget *entry1; - GtkWidget *entry2; + GtkLabel *label1; + GtkLabel *label2; + GtkText *entry1; + GtkText *entry2; GString *s = g_string_new (""); /* @@ -103,29 +103,29 @@ test_window_focus (void) add_controller (box, s); gtk_container_add (GTK_CONTAINER (window), box); label1 = gtk_label_new ("label1"); - gtk_widget_set_name (label1, "label1"); - add_controller (label1, s); - gtk_container_add (GTK_CONTAINER (box), label1); + gtk_widget_set_name (GTK_WIDGET (label1), "label1"); + add_controller (GTK_WIDGET (label1), s); + gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label1)); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_set_name (box1, "box1"); add_controller (box1, s); gtk_container_add (GTK_CONTAINER (box), box1); entry1 = gtk_text_new (); - gtk_widget_set_name (entry1, "entry1"); - add_controller (entry1, s); - gtk_container_add (GTK_CONTAINER (box1), entry1); + gtk_widget_set_name (GTK_WIDGET (entry1), "entry1"); + add_controller (GTK_WIDGET (entry1), s); + gtk_container_add (GTK_CONTAINER (box1), GTK_WIDGET (entry1)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_set_name (box2, "box2"); add_controller (box2, s); gtk_container_add (GTK_CONTAINER (box), box2); label2 = gtk_label_new ("label2"); - gtk_widget_set_name (label2, "label2"); - add_controller (label2, s); - gtk_container_add (GTK_CONTAINER (box2), label2); + gtk_widget_set_name (GTK_WIDGET (label2), "label2"); + add_controller (GTK_WIDGET (label2), s); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (label2)); entry2 = gtk_text_new (); - gtk_widget_set_name (entry2, "entry2"); - add_controller (entry2, s); - gtk_container_add (GTK_CONTAINER (box2), entry2); + gtk_widget_set_name (GTK_WIDGET (entry2), "entry2"); + add_controller (GTK_WIDGET (entry2), s); + gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (entry2)); g_assert_null (gtk_window_get_focus (GTK_WINDOW (window))); @@ -142,7 +142,7 @@ test_window_focus (void) "box: focus-in GDK_CROSSING_NORMAL GDK_NOTIFY_ANCESTOR is-focus: 1 contains-focus: 1\n"); g_string_truncate (s, 0); - gtk_widget_grab_focus (entry1); + gtk_widget_grab_focus (GTK_WIDGET (entry1)); if (g_test_verbose ()) g_print ("box -> entry1\n%s\n", s->str); @@ -154,9 +154,9 @@ test_window_focus (void) g_string_truncate (s, 0); - g_assert (gtk_window_get_focus (GTK_WINDOW (window)) == entry1); + g_assert (gtk_window_get_focus (GTK_WINDOW (window)) == GTK_WIDGET (entry1)); - gtk_widget_grab_focus (entry2); + gtk_widget_grab_focus (GTK_WIDGET (entry2)); if (g_test_verbose ()) g_print ("entry1 -> entry2\n%s\n", s->str); @@ -169,7 +169,7 @@ test_window_focus (void) g_string_truncate (s, 0); - g_assert (gtk_window_get_focus (GTK_WINDOW (window)) == entry2); + g_assert (gtk_window_get_focus (GTK_WINDOW (window)) == GTK_WIDGET (entry2)); gtk_widget_grab_focus (box); @@ -187,9 +187,9 @@ test_window_focus (void) g_assert (gtk_window_get_focus (GTK_WINDOW (window)) == box); - gtk_window_set_focus (GTK_WINDOW (window), entry1); + gtk_window_set_focus (GTK_WINDOW (window), GTK_WIDGET (entry1)); - g_assert (gtk_window_get_focus (GTK_WINDOW (window)) == entry1); + g_assert (gtk_window_get_focus (GTK_WINDOW (window)) == GTK_WIDGET (entry1)); gtk_widget_destroy (window); } diff --git a/testsuite/gtk/gestures.c b/testsuite/gtk/gestures.c index 8fcf6eb5605c2becae07674c596da8f1d3d91568..b3507cc7ede5075eae4f22ad3752dc6aed2aa775 100644 --- a/testsuite/gtk/gestures.c +++ b/testsuite/gtk/gestures.c @@ -407,7 +407,7 @@ test_phases (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -459,7 +459,7 @@ test_mixed (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -518,7 +518,7 @@ test_early_exit (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -573,7 +573,7 @@ test_claim_capture (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -620,7 +620,7 @@ test_claim_target (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -667,7 +667,7 @@ test_claim_bubble (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -721,7 +721,7 @@ test_early_claim_capture (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -778,7 +778,7 @@ test_late_claim_capture (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -837,7 +837,7 @@ test_group (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -890,7 +890,7 @@ test_gestures_outside_grab (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -950,7 +950,7 @@ test_gestures_inside_grab (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -1011,7 +1011,7 @@ test_multitouch_on_single (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -1063,7 +1063,7 @@ test_multitouch_activation (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); @@ -1141,7 +1141,7 @@ test_multitouch_interaction (void) gtk_widget_set_name (A, "A"); B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (B, "B"); - C = gtk_image_new (); + C = GTK_WIDGET (gtk_image_new ()); gtk_widget_set_hexpand (C, TRUE); gtk_widget_set_vexpand (C, TRUE); gtk_widget_set_name (C, "C"); diff --git a/testsuite/gtk/grid.c b/testsuite/gtk/grid.c index 34feec7107bfeb21c4b2afa9938f1ed245176fdf..07d018739cce938a2b7f08fe23fcfb370635a743 100644 --- a/testsuite/gtk/grid.c +++ b/testsuite/gtk/grid.c @@ -29,7 +29,7 @@ test_attach (void) g = (GtkGrid *)gtk_grid_new (); - child = gtk_label_new ("a"); + child = GTK_WIDGET (gtk_label_new ("a")); gtk_grid_attach_next_to (g, child, NULL, GTK_POS_LEFT, 1, 1); gtk_grid_query_child (g, child, &left, &top, @@ -40,7 +40,7 @@ test_attach (void) g_assert_cmpint (height, ==, 1); sibling = child; - child = gtk_label_new ("b"); + child = GTK_WIDGET (gtk_label_new ("b")); gtk_grid_attach_next_to (g, child, sibling, GTK_POS_RIGHT, 2, 2); gtk_grid_query_child (g, child, &left, &top, @@ -51,10 +51,10 @@ test_attach (void) g_assert_cmpint (height, ==, 2); /* this one should just be ignored */ - z = gtk_label_new ("z"); + z = GTK_WIDGET (gtk_label_new ("z")); gtk_grid_attach (g, z, 4, 4, 1, 1); - child = gtk_label_new ("c"); + child = GTK_WIDGET (gtk_label_new ("c")); gtk_grid_attach_next_to (g, child, sibling, GTK_POS_BOTTOM, 3, 1); gtk_grid_query_child (g, child, &left, &top, @@ -64,7 +64,7 @@ test_attach (void) g_assert_cmpint (width, ==, 3); g_assert_cmpint (height, ==, 1); - child = gtk_label_new ("u"); + child = GTK_WIDGET (gtk_label_new ("u")); gtk_grid_attach_next_to (g, child, z, GTK_POS_LEFT, 2, 1); gtk_grid_query_child (g, child, &left, &top, @@ -74,7 +74,7 @@ test_attach (void) g_assert_cmpint (width, ==, 2); g_assert_cmpint (height, ==, 1); - child = gtk_label_new ("v"); + child = GTK_WIDGET (gtk_label_new ("v")); gtk_grid_attach_next_to (g, child, z, GTK_POS_RIGHT, 2, 1); gtk_grid_query_child (g, child, &left, &top, @@ -84,7 +84,7 @@ test_attach (void) g_assert_cmpint (width, ==, 2); g_assert_cmpint (height, ==, 1); - child = gtk_label_new ("x"); + child = GTK_WIDGET (gtk_label_new ("x")); gtk_grid_attach_next_to (g, child, z, GTK_POS_TOP, 1, 2); gtk_grid_query_child (g, child, &left, &top, @@ -94,7 +94,7 @@ test_attach (void) g_assert_cmpint (width, ==, 1); g_assert_cmpint (height, ==, 2); - child = gtk_label_new ("x"); + child = GTK_WIDGET (gtk_label_new ("x")); gtk_grid_attach_next_to (g, child, z, GTK_POS_TOP, 1, 2); gtk_grid_query_child (g, child, &left, &top, @@ -104,7 +104,7 @@ test_attach (void) g_assert_cmpint (width, ==, 1); g_assert_cmpint (height, ==, 2); - child = gtk_label_new ("y"); + child = GTK_WIDGET (gtk_label_new ("y")); gtk_grid_attach_next_to (g, child, z, GTK_POS_BOTTOM, 1, 2); gtk_grid_query_child (g, child, &left, &top, @@ -114,12 +114,12 @@ test_attach (void) g_assert_cmpint (width, ==, 1); g_assert_cmpint (height, ==, 2); - A = gtk_label_new ("A"); + A = GTK_WIDGET (gtk_label_new ("A")); gtk_grid_attach (g, A, 10, 10, 1, 1); - B = gtk_label_new ("B"); + B = GTK_WIDGET (gtk_label_new ("B")); gtk_grid_attach (g, B, 10, 12, 1, 1); - child = gtk_label_new ("D"); + child = GTK_WIDGET (gtk_label_new ("D")); gtk_grid_attach_next_to (g, child, A, GTK_POS_RIGHT, 1, 3); gtk_grid_query_child (g, child, &left, &top, @@ -141,7 +141,7 @@ test_add (void) gtk_orientable_set_orientation (GTK_ORIENTABLE (g), GTK_ORIENTATION_HORIZONTAL); - child = gtk_label_new ("a"); + child = GTK_WIDGET (gtk_label_new ("a")); gtk_container_add (GTK_CONTAINER (g), child); gtk_grid_query_child (g, child, &left, &top, @@ -151,7 +151,7 @@ test_add (void) g_assert_cmpint (width, ==, 1); g_assert_cmpint (height, ==, 1); - child = gtk_label_new ("b"); + child = GTK_WIDGET (gtk_label_new ("b")); gtk_container_add (GTK_CONTAINER (g), child); gtk_grid_query_child (g, child, &left, &top, @@ -161,7 +161,7 @@ test_add (void) g_assert_cmpint (width, ==, 1); g_assert_cmpint (height, ==, 1); - child = gtk_label_new ("c"); + child = GTK_WIDGET (gtk_label_new ("c")); gtk_container_add (GTK_CONTAINER (g), child); gtk_grid_query_child (g, child, &left, &top, @@ -173,7 +173,7 @@ test_add (void) gtk_orientable_set_orientation (GTK_ORIENTABLE (g), GTK_ORIENTATION_VERTICAL); - child = gtk_label_new ("d"); + child = GTK_WIDGET (gtk_label_new ("d")); gtk_container_add (GTK_CONTAINER (g), child); gtk_grid_query_child (g, child, &left, &top, diff --git a/testsuite/gtk/listbox.c b/testsuite/gtk/listbox.c index e868f9ae9efba26e93dce27ab2786276844698b7..45c49c283a76ccef026c29b1c68e4fd8c8a9cb2e 100644 --- a/testsuite/gtk/listbox.c +++ b/testsuite/gtk/listbox.c @@ -46,7 +46,7 @@ test_sort (void) { GtkListBox *list; GtkListBoxRow *row; - GtkWidget *label; + GtkLabel *label; gint i, r; gchar *s; gint count; @@ -62,7 +62,7 @@ test_sort (void) label = gtk_label_new (s); g_object_set_data (G_OBJECT (label), "data", GINT_TO_POINTER (r)); g_free (s); - gtk_container_add (GTK_CONTAINER (list), label); + gtk_container_add (GTK_CONTAINER (list), GTK_WIDGET (label)); } count = 0; @@ -102,7 +102,7 @@ test_selection (void) { GtkListBox *list; GtkListBoxRow *row, *row2; - GtkWidget *label; + GtkLabel *label; gint i; gchar *s; gint count; @@ -121,7 +121,7 @@ test_selection (void) label = gtk_label_new (s); g_object_set_data (G_OBJECT (label), "data", GINT_TO_POINTER (i)); g_free (s); - gtk_container_add (GTK_CONTAINER (list), label); + gtk_container_add (GTK_CONTAINER (list), GTK_WIDGET (label)); } count = 0; @@ -191,7 +191,7 @@ test_multi_selection (void) GtkListBox *list; GList *l; GtkListBoxRow *row, *row2; - GtkWidget *label; + GtkLabel *label; gint i; gchar *s; gint count; @@ -211,7 +211,7 @@ test_multi_selection (void) label = gtk_label_new (s); g_object_set_data (G_OBJECT (label), "data", GINT_TO_POINTER (i)); g_free (s); - gtk_container_add (GTK_CONTAINER (list), label); + gtk_container_add (GTK_CONTAINER (list), GTK_WIDGET (label)); } count = 0; @@ -306,7 +306,7 @@ test_filter (void) GtkListBoxRow *row; gint i; gchar *s; - GtkWidget *label; + GtkLabel *label; gint count; list = GTK_LIST_BOX (gtk_list_box_new ()); @@ -322,7 +322,7 @@ test_filter (void) label = gtk_label_new (s); g_object_set_data (G_OBJECT (label), "data", GINT_TO_POINTER (i)); g_free (s); - gtk_container_add (GTK_CONTAINER (list), label); + gtk_container_add (GTK_CONTAINER (list), GTK_WIDGET (label)); } count = 0; @@ -351,7 +351,7 @@ header_func (GtkListBoxRow *row, GtkWidget *child; gint i; gint *count = data; - GtkWidget *header; + GtkLabel *header; gchar *s; (*count)++; @@ -368,7 +368,7 @@ header_func (GtkListBoxRow *row, else header = NULL; - gtk_list_box_row_set_header (row, header); + gtk_list_box_row_set_header (row, GTK_WIDGET (header)); } static void @@ -397,7 +397,7 @@ test_header (void) GtkListBoxRow *row; gint i; gchar *s; - GtkWidget *label; + GtkLabel *label; gint count; list = GTK_LIST_BOX (gtk_list_box_new ()); @@ -413,7 +413,7 @@ test_header (void) label = gtk_label_new (s); g_object_set_data (G_OBJECT (label), "data", GINT_TO_POINTER (i)); g_free (s); - gtk_container_add (GTK_CONTAINER (list), label); + gtk_container_add (GTK_CONTAINER (list), GTK_WIDGET (label)); } count = 0; diff --git a/testsuite/gtk/popover.c b/testsuite/gtk/popover.c index acd14e062ec45dc5a25c717ffda3c7f09a27f569..d220da37b8e3bd5c5fd33f3cddfb3bcc95b195c7 100644 --- a/testsuite/gtk/popover.c +++ b/testsuite/gtk/popover.c @@ -39,7 +39,7 @@ test_show_popover (void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); button = gtk_menu_button_new (); popover = gtk_popover_new (NULL); - gtk_container_add (GTK_CONTAINER (popover), gtk_label_new ("Nu?")); + gtk_container_add (GTK_CONTAINER (popover), GTK_WIDGET (gtk_label_new ("Nu?"))); gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), popover); gtk_container_add (GTK_CONTAINER (window), button); diff --git a/testsuite/gtk/propertylookuplistmodel.c b/testsuite/gtk/propertylookuplistmodel.c index 21fa26445d60c36c0bf73465d2caa1785a663841..fdb8a9260fdb8be6ff93fab58ba01180f9aea278 100644 --- a/testsuite/gtk/propertylookuplistmodel.c +++ b/testsuite/gtk/propertylookuplistmodel.c @@ -106,7 +106,8 @@ static GSList *widgets = NULL; static GtkWidget * create_widget_tree (void) { - GtkWidget *window, *box, *grid, *label; + GtkWidget *window, *box, *grid; + GtkLabel *label; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); widgets = g_slist_prepend (widgets, window); @@ -118,9 +119,9 @@ create_widget_tree (void) gtk_container_add (GTK_CONTAINER (box), grid); label = gtk_label_new ("Hello World"); - gtk_container_add (GTK_CONTAINER (grid), label); + gtk_container_add (GTK_CONTAINER (grid), GTK_WIDGET (label)); - return label; + return GTK_WIDGET (label); } static void diff --git a/testsuite/gtk/regression-tests.c b/testsuite/gtk/regression-tests.c index e44eaa65a0563f61fc9111445c88a3c104b88a70..fc8c7824965de0801b068e1e6fbc29311c5e08d4 100644 --- a/testsuite/gtk/regression-tests.c +++ b/testsuite/gtk/regression-tests.c @@ -22,18 +22,19 @@ static void test_9d6da33ff5c5e41e3521e1afd63d2d67bc915753 (void) { - GtkWidget *window, *label; + GtkWidget *window; + GtkLabel *label; window = gtk_window_new (GTK_WINDOW_POPUP); label = gtk_label_new ("I am sensitive."); - gtk_container_add (GTK_CONTAINER (window), label); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (label)); - gtk_widget_set_sensitive (label, FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (label), FALSE); gtk_widget_set_sensitive (window, FALSE); - gtk_widget_set_sensitive (label, TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (label), TRUE); gtk_widget_set_sensitive (window, TRUE); - g_assert (gtk_widget_get_sensitive (label)); + g_assert (gtk_widget_get_sensitive (GTK_WIDGET (label))); gtk_widget_destroy (window); } @@ -41,17 +42,18 @@ test_9d6da33ff5c5e41e3521e1afd63d2d67bc915753 (void) static void test_94f00eb04dd1433cf1cc9a3341f485124e38abd1 (void) { - GtkWidget *window, *label; + GtkWidget *window; + GtkLabel *label; window = gtk_window_new (GTK_WINDOW_POPUP); label = gtk_label_new ("I am insensitive."); - gtk_container_add (GTK_CONTAINER (window), label); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (label)); gtk_widget_set_sensitive (window, FALSE); - gtk_widget_set_sensitive (label, FALSE); - gtk_widget_set_sensitive (label, TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (label), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (label), TRUE); - g_assert (!gtk_widget_is_sensitive (label)); + g_assert (!gtk_widget_is_sensitive (GTK_WIDGET (label))); gtk_widget_destroy (window); } diff --git a/testsuite/gtk/templates.c b/testsuite/gtk/templates.c index 4b73e94c129b80b50134fdc902e12b2572691c11..04ffa3087e9de2ff4b946d64bb7d6b71bf4f34c9 100644 --- a/testsuite/gtk/templates.c +++ b/testsuite/gtk/templates.c @@ -72,11 +72,11 @@ test_message_dialog_basic (void) static void test_about_dialog_basic (void) { - GtkWidget *dialog; + GtkAboutDialog *dialog; dialog = gtk_about_dialog_new (); g_assert (GTK_IS_ABOUT_DIALOG (dialog)); - gtk_widget_destroy (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); } static void @@ -115,11 +115,11 @@ test_assistant_basic (void) static void test_scale_button_basic (void) { - GtkWidget *widget; + GtkScaleButton *widget; widget = gtk_scale_button_new (0, 100, 10, NULL); g_assert (GTK_IS_SCALE_BUTTON (widget)); - gtk_widget_destroy (widget); + gtk_widget_destroy (GTK_WIDGET (widget)); } static void @@ -155,11 +155,11 @@ test_search_bar_basic (void) static void test_action_bar_basic (void) { - GtkWidget *widget; + GtkActionBar *widget; widget = gtk_action_bar_new (); g_assert (GTK_IS_ACTION_BAR (widget)); - gtk_widget_destroy (widget); + gtk_widget_destroy (GTK_WIDGET (widget)); } static void @@ -175,7 +175,7 @@ test_app_chooser_widget_basic (void) static void test_app_chooser_dialog_basic (void) { - GtkWidget *widget; + GtkAppChooserDialog *widget; widget = gtk_app_chooser_dialog_new_for_content_type (NULL, 0, "text/plain"); g_assert (GTK_IS_APP_CHOOSER_DIALOG (widget)); @@ -186,18 +186,18 @@ test_app_chooser_dialog_basic (void) */ g_timeout_add (500, main_loop_quit_cb, NULL); gtk_main(); - gtk_widget_destroy (widget); + gtk_widget_destroy (GTK_WIDGET (widget)); } static void test_color_chooser_dialog_basic (void) { - GtkWidget *widget; + GtkColorChooserDialog *widget; /* This test also tests the internal GtkColorEditor widget */ widget = gtk_color_chooser_dialog_new (NULL, NULL); g_assert (GTK_IS_COLOR_CHOOSER_DIALOG (widget)); - gtk_widget_destroy (widget); + gtk_widget_destroy (GTK_WIDGET (widget)); } /* Avoid warnings from GVFS-RemoteVolumeMonitor */ @@ -242,7 +242,7 @@ test_file_chooser_widget_basic (void) static void test_file_chooser_dialog_basic (void) { - GtkWidget *widget; + GtkFileChooserDialog *widget; g_test_log_set_fatal_handler (ignore_gvfs_warning, NULL); @@ -255,13 +255,13 @@ test_file_chooser_dialog_basic (void) g_timeout_add (100, main_loop_quit_cb, NULL); gtk_main(); - gtk_widget_destroy (widget); + gtk_widget_destroy (GTK_WIDGET (widget)); } static void test_file_chooser_button_basic (void) { - GtkWidget *widget; + GtkFileChooserButton *widget; g_test_log_set_fatal_handler (ignore_gvfs_warning, NULL); @@ -270,7 +270,7 @@ test_file_chooser_button_basic (void) g_timeout_add (100, main_loop_quit_cb, NULL); gtk_main(); - gtk_widget_destroy (widget); + gtk_widget_destroy (GTK_WIDGET (widget)); } static void @@ -296,32 +296,32 @@ test_font_chooser_widget_basic (void) static void test_font_chooser_dialog_basic (void) { - GtkWidget *widget; + GtkFontChooserDialog *widget; widget = gtk_font_chooser_dialog_new ("Choose a font !", NULL); g_assert (GTK_IS_FONT_CHOOSER_DIALOG (widget)); - gtk_widget_destroy (widget); + gtk_widget_destroy (GTK_WIDGET (widget)); } #ifdef HAVE_UNIX_PRINT_WIDGETS static void test_page_setup_unix_dialog_basic (void) { - GtkWidget *widget; + GtkPageSetupUnixDialog *widget; widget = gtk_page_setup_unix_dialog_new ("Setup your Page !", NULL); g_assert (GTK_IS_PAGE_SETUP_UNIX_DIALOG (widget)); - gtk_widget_destroy (widget); + gtk_widget_destroy (GTK_WIDGET (widget)); } static void test_print_unix_dialog_basic (void) { - GtkWidget *widget; + GtkPrintUnixDialog *widget; widget = gtk_print_unix_dialog_new ("Go Print !", NULL); g_assert (GTK_IS_PRINT_UNIX_DIALOG (widget)); - gtk_widget_destroy (widget); + gtk_widget_destroy (GTK_WIDGET (widget)); } #endif diff --git a/testsuite/gtk/widgetorder.c b/testsuite/gtk/widgetorder.c index 01a885a6df0ef2129a9228ed09c62dd99b566305..2f080ad10570af4dce551a8595184e384a1ddeb0 100644 --- a/testsuite/gtk/widgetorder.c +++ b/testsuite/gtk/widgetorder.c @@ -4,7 +4,7 @@ static void simple (void) { GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - GtkWidget *l = gtk_label_new (""); + GtkWidget *l = GTK_WIDGET (gtk_label_new ("")); gtk_container_add (GTK_CONTAINER (box), l); @@ -22,8 +22,8 @@ static void two (void) { GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); gtk_container_add (GTK_CONTAINER (box), l1); gtk_container_add (GTK_CONTAINER (box), l2); @@ -43,9 +43,9 @@ two (void) static void prepend (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_insert_after (l2, p, NULL); @@ -67,9 +67,9 @@ prepend (void) static void append (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_insert_before (l2, p, NULL); @@ -89,10 +89,10 @@ append (void) static void insert_after (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); - GtkWidget *l3 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l3 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); @@ -126,10 +126,10 @@ insert_after (void) static void insert_before (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); - GtkWidget *l3 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l3 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); @@ -163,8 +163,8 @@ insert_before (void) static void insert_after_self (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l = GTK_WIDGET (gtk_label_new ("")); gtk_widget_insert_after (l, p, NULL); @@ -193,8 +193,8 @@ insert_after_self (void) static void insert_before_self (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l = GTK_WIDGET (gtk_label_new ("")); gtk_widget_insert_before (l, p, NULL); @@ -223,10 +223,10 @@ insert_before_self (void) static void reorder_after (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); - GtkWidget *l3 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l3 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); @@ -277,10 +277,10 @@ reorder_after (void) static void reorder_before (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); - GtkWidget *l3 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l3 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); @@ -331,10 +331,10 @@ reorder_before (void) static void reorder_start (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); - GtkWidget *l3 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l3 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); @@ -385,10 +385,10 @@ reorder_start (void) static void reorder_end (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); - GtkWidget *l3 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l3 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); @@ -439,9 +439,9 @@ reorder_end (void) static void same_after (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l2, p); @@ -473,9 +473,9 @@ same_after (void) static void same_before (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l2, p); @@ -507,10 +507,10 @@ same_before (void) static void no_loop (void) { - GtkWidget *p = gtk_label_new (""); - GtkWidget *l1 = gtk_label_new (""); - GtkWidget *l2 = gtk_label_new (""); - GtkWidget *l3 = gtk_label_new (""); + GtkWidget *p = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l1 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l2 = GTK_WIDGET (gtk_label_new ("")); + GtkWidget *l3 = GTK_WIDGET (gtk_label_new ("")); gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l2, p); diff --git a/testsuite/reftests/set-default-direction.c b/testsuite/reftests/set-default-direction.c index 468d3dc92208ba712897077bbaeaacc201dd69d4..1107460e0479c9ac74c6afd2cb4d8fad6f567261 100644 --- a/testsuite/reftests/set-default-direction.c +++ b/testsuite/reftests/set-default-direction.c @@ -78,11 +78,11 @@ switch_direction (GtkWidget *widget) G_MODULE_EXPORT void swap_child (GtkWidget *window) { - GtkWidget *image; + GtkImage *image; gtk_container_remove (GTK_CONTAINER (window), gtk_bin_get_child (GTK_BIN (window))); image = gtk_image_new_from_icon_name ("go-next"); - gtk_widget_show (image); - gtk_container_add (GTK_CONTAINER (window), image); + gtk_widget_show (GTK_WIDGET (image)); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (image)); } diff --git a/testsuite/reftests/textview-border-windows.c b/testsuite/reftests/textview-border-windows.c index 7a6646393a386713bf993cdf9ac5f7733bc2a879..823d83d7246db57af7c8ff82709c15f4ae63c572 100644 --- a/testsuite/reftests/textview-border-windows.c +++ b/testsuite/reftests/textview-border-windows.c @@ -22,11 +22,11 @@ set_border_window_size (GtkTextView *text_view, GtkTextWindowType win, gint size) { - GtkWidget *label; + GtkLabel *label; label = gtk_label_new (NULL); - gtk_widget_set_size_request (label, size, size); - gtk_text_view_set_gutter (text_view, win, label); + gtk_widget_set_size_request (GTK_WIDGET (label), size, size); + gtk_text_view_set_gutter (text_view, win, GTK_WIDGET (label)); } G_MODULE_EXPORT void