diff options
93 files changed, 126 insertions, 146 deletions
diff --git a/demos/gtk-demo/css_basics.c b/demos/gtk-demo/css_basics.c index 427ae45f1f..bb193d62ef 100644 --- a/demos/gtk-demo/css_basics.c +++ b/demos/gtk-demo/css_basics.c @@ -94,7 +94,7 @@ do_css_basics (GtkWidget *do_widget) provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); - container = gtk_scrolled_window_new (NULL, NULL); + container = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), container); child = gtk_text_view_new_with_buffer (text); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child); diff --git a/demos/gtk-demo/css_multiplebgs.c b/demos/gtk-demo/css_multiplebgs.c index 913dc1c329..dd11c2ddbf 100644 --- a/demos/gtk-demo/css_multiplebgs.c +++ b/demos/gtk-demo/css_multiplebgs.c @@ -132,7 +132,7 @@ do_css_multiplebgs (GtkWidget *do_widget) provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_paned_set_end_child (GTK_PANED (paned), sw); child = gtk_text_view_new_with_buffer (text); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), child); diff --git a/demos/gtk-demo/css_pixbufs.c b/demos/gtk-demo/css_pixbufs.c index 88dd41e8fd..3885ca9188 100644 --- a/demos/gtk-demo/css_pixbufs.c +++ b/demos/gtk-demo/css_pixbufs.c @@ -101,7 +101,7 @@ do_css_pixbufs (GtkWidget *do_widget) provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); - container = gtk_scrolled_window_new (NULL, NULL); + container = gtk_scrolled_window_new (); gtk_paned_set_end_child (GTK_PANED (paned), container); child = gtk_text_view_new_with_buffer (text); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child); diff --git a/demos/gtk-demo/css_shadows.c b/demos/gtk-demo/css_shadows.c index 54c6a3c4c8..74236c6f3c 100644 --- a/demos/gtk-demo/css_shadows.c +++ b/demos/gtk-demo/css_shadows.c @@ -119,7 +119,7 @@ do_css_shadows (GtkWidget *do_widget) provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); - container = gtk_scrolled_window_new (NULL, NULL); + container = gtk_scrolled_window_new (); gtk_paned_set_end_child (GTK_PANED (paned), container); child = gtk_text_view_new_with_buffer (text); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child); diff --git a/demos/gtk-demo/dnd.c b/demos/gtk-demo/dnd.c index b7826a63de..667f2b6f2f 100644 --- a/demos/gtk-demo/dnd.c +++ b/demos/gtk-demo/dnd.c @@ -659,7 +659,7 @@ do_dnd (GtkWidget *do_widget) y += 100; } - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c index ef6ead843f..993daff491 100644 --- a/demos/gtk-demo/editable_cells.c +++ b/demos/gtk-demo/editable_cells.c @@ -364,7 +364,7 @@ do_editable_cells (GtkWidget *do_widget) gtk_box_append (GTK_BOX (vbox), gtk_label_new ("Shopping list (you can edit the cells!)")); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, diff --git a/demos/gtk-demo/expander.c b/demos/gtk-demo/expander.c index 6d4583dbff..51142b1b4d 100644 --- a/demos/gtk-demo/expander.c +++ b/demos/gtk-demo/expander.c @@ -57,7 +57,7 @@ do_expander (GtkWidget *do_widget) expander = gtk_expander_new ("Details:"); gtk_widget_set_vexpand (expander, TRUE); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), diff --git a/demos/gtk-demo/fixed.c b/demos/gtk-demo/fixed.c index 3c79633cde..b9a140df4a 100644 --- a/demos/gtk-demo/fixed.c +++ b/demos/gtk-demo/fixed.c @@ -130,7 +130,7 @@ create_demo_window (GtkWidget *do_widget) gtk_window_set_default_size (GTK_WINDOW (window), 600, 400); g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), sw); fixed = gtk_fixed_new (); diff --git a/demos/gtk-demo/flowbox.c b/demos/gtk-demo/flowbox.c index 4536160681..99f9db5175 100644 --- a/demos/gtk-demo/flowbox.c +++ b/demos/gtk-demo/flowbox.c @@ -727,7 +727,7 @@ do_flowbox (GtkWidget *do_widget) gtk_window_set_default_size (GTK_WINDOW (window), 400, 600); g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); flowbox = gtk_flow_box_new (); gtk_widget_set_valign (flowbox, GTK_ALIGN_START); diff --git a/demos/gtk-demo/hypertext.c b/demos/gtk-demo/hypertext.c index b52c4b4875..7aea955920 100644 --- a/demos/gtk-demo/hypertext.c +++ b/demos/gtk-demo/hypertext.c @@ -260,7 +260,7 @@ do_hypertext (GtkWidget *do_widget) buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); gtk_text_buffer_set_enable_undo (buffer, TRUE); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c index f214013c78..e13ee749f6 100644 --- a/demos/gtk-demo/iconview.c +++ b/demos/gtk-demo/iconview.c @@ -276,7 +276,7 @@ do_iconview (GtkWidget *do_widget) gtk_box_append (GTK_BOX (tool_bar), home_button); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c index 9a196dcb09..fb31fc5457 100644 --- a/demos/gtk-demo/list_store.c +++ b/demos/gtk-demo/list_store.c @@ -269,7 +269,7 @@ do_list_store (GtkWidget *do_widget) 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_box_append (GTK_BOX (vbox), label); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c index b390218dfe..2f785e271a 100644 --- a/demos/gtk-demo/listbox.c +++ b/demos/gtk-demo/listbox.c @@ -358,7 +358,7 @@ do_listbox (GtkWidget *do_widget) gtk_window_set_child (GTK_WINDOW (window), vbox); label = gtk_label_new ("Messages from GTK and friends"); gtk_box_append (GTK_BOX (vbox), label); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_widget_set_vexpand (scrolled, TRUE); gtk_box_append (GTK_BOX (vbox), scrolled); diff --git a/demos/gtk-demo/listview_applauncher.c b/demos/gtk-demo/listview_applauncher.c index 5666d235c1..a6eb2f9863 100644 --- a/demos/gtk-demo/listview_applauncher.c +++ b/demos/gtk-demo/listview_applauncher.c @@ -188,7 +188,7 @@ do_listview_applauncher (GtkWidget *do_widget) * because otherwise they might get too large or they might not * be scrollable. */ - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), sw); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list); } diff --git a/demos/gtk-demo/listview_clocks.c b/demos/gtk-demo/listview_clocks.c index 6ba1ec5377..4578c229cd 100644 --- a/demos/gtk-demo/listview_clocks.c +++ b/demos/gtk-demo/listview_clocks.c @@ -474,7 +474,7 @@ do_listview_clocks (GtkWidget *do_widget) g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window); /* List widgets go into a scrolled window. Always. */ - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), sw); /* Create the factory that creates the listitems. Because we diff --git a/demos/gtk-demo/listview_colors.c b/demos/gtk-demo/listview_colors.c index 9c3841f6a5..b63e14498e 100644 --- a/demos/gtk-demo/listview_colors.c +++ b/demos/gtk-demo/listview_colors.c @@ -785,7 +785,7 @@ do_listview_colors (GtkWidget *do_widget) gtk_widget_get_display (do_widget)); g_object_add_weak_pointer (G_OBJECT (window), (gpointer*)&window); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), sw); gridview = create_color_grid (); diff --git a/demos/gtk-demo/listview_weather.c b/demos/gtk-demo/listview_weather.c index e87304d1aa..5904d256a0 100644 --- a/demos/gtk-demo/listview_weather.c +++ b/demos/gtk-demo/listview_weather.c @@ -313,7 +313,7 @@ do_listview_weather (GtkWidget *do_widget) gtk_window_set_title (GTK_WINDOW (window), "Weather"); g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), sw); listview = create_weather_view (); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview); diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index f727233353..b1b6724d33 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -602,7 +602,7 @@ display_image (const char *resource) image = gtk_picture_new_for_resource (resource); gtk_widget_set_halign (image, GTK_ALIGN_CENTER); gtk_widget_set_valign (image, GTK_ALIGN_CENTER); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), image); return sw; @@ -642,7 +642,7 @@ display_text (const char *resource) g_bytes_unref (bytes); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/demos/gtk-demo/markup.c b/demos/gtk-demo/markup.c index ff62521b36..0a7135c078 100644 --- a/demos/gtk-demo/markup.c +++ b/demos/gtk-demo/markup.c @@ -81,7 +81,7 @@ do_markup (GtkWidget *do_widget) gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 10); gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 10); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -94,7 +94,7 @@ do_markup (GtkWidget *do_widget) gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view2), 10); gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view2), 10); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/demos/gtk-demo/overlay2.c b/demos/gtk-demo/overlay2.c index 8740e4b80d..9eec7beebf 100644 --- a/demos/gtk-demo/overlay2.c +++ b/demos/gtk-demo/overlay2.c @@ -40,7 +40,7 @@ do_overlay2 (GtkWidget *do_widget) gtk_window_set_title (GTK_WINDOW (window), "Decorative Overlay"); overlay = gtk_overlay_new (); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/demos/gtk-demo/sliding_puzzle.c b/demos/gtk-demo/sliding_puzzle.c index e56cd05581..bec160747a 100644 --- a/demos/gtk-demo/sliding_puzzle.c +++ b/demos/gtk-demo/sliding_puzzle.c @@ -443,7 +443,7 @@ do_sliding_puzzle (GtkWidget *do_widget) gtk_media_stream_set_muted (media, TRUE); gtk_media_stream_play (media); add_choice (choices, GDK_PAINTABLE (media)); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), choices); gtk_grid_attach (GTK_GRID (tweaks), sw, 0, 0, 2, 1); diff --git a/demos/gtk-demo/tabs.c b/demos/gtk-demo/tabs.c index e4616c71a5..e683076d02 100644 --- a/demos/gtk-demo/tabs.c +++ b/demos/gtk-demo/tabs.c @@ -40,7 +40,7 @@ do_tabs (GtkWidget *do_widget) buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); gtk_text_buffer_set_text (buffer, "one\ttwo\tthree\nfour\tfive\tsix\nseven\teight\tnine", -1); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c index 8d79d084f4..338bb8b3cf 100644 --- a/demos/gtk-demo/textscroll.c +++ b/demos/gtk-demo/textscroll.c @@ -156,7 +156,7 @@ create_text_view (GtkWidget *hbox, GtkWidget *textview; guint timeout; - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_box_append (GTK_BOX (hbox), swindow); textview = gtk_text_view_new (); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), textview); diff --git a/demos/gtk-demo/textundo.c b/demos/gtk-demo/textundo.c index 102b9de84b..0bd7851f3a 100644 --- a/demos/gtk-demo/textundo.c +++ b/demos/gtk-demo/textundo.c @@ -46,7 +46,7 @@ do_textundo (GtkWidget *do_widget) -1); gtk_text_buffer_end_irreversible_action (buffer); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c index cf7004a7e8..ffb0edd318 100644 --- a/demos/gtk-demo/textview.c +++ b/demos/gtk-demo/textview.c @@ -494,7 +494,7 @@ do_textview (GtkWidget *do_widget) buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view1)); view2 = gtk_text_view_new_with_buffer (buffer); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -504,7 +504,7 @@ do_textview (GtkWidget *do_widget) gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view1); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -590,7 +590,7 @@ easter_egg_callback (GtkWidget *button, g_object_unref (buffer); window = gtk_window_new (); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c index 477973aed5..37fcc001af 100644 --- a/demos/gtk-demo/tree_store.c +++ b/demos/gtk-demo/tree_store.c @@ -406,7 +406,7 @@ do_tree_store (GtkWidget *do_widget) gtk_box_append (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet")); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, diff --git a/demos/print-editor/print-editor.c b/demos/print-editor/print-editor.c index 2fa33fd350..79e9b0d807 100644 --- a/demos/print-editor/print-editor.c +++ b/demos/print-editor/print-editor.c @@ -768,7 +768,7 @@ activate (GApplication *app) gtk_window_set_child (GTK_WINDOW (main_window), box); /* Create document */ - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index 93eca8f0e7..1a42dd2cbe 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -881,7 +881,7 @@ create_scrolledwindow (void) { GtkWidget *scrolledwin, *label; - scrolledwin = gtk_scrolled_window_new (NULL, NULL); + scrolledwin = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwin), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); label = gtk_label_new ("Scrolled Window"); diff --git a/examples/application10/exampleappwin.c b/examples/application10/exampleappwin.c index ba0ffd94b6..d5f4d43e31 100644 --- a/examples/application10/exampleappwin.c +++ b/examples/application10/exampleappwin.c @@ -258,7 +258,7 @@ example_app_window_open (ExampleAppWindow *win, basename = g_file_get_basename (file); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/examples/application3/exampleappwin.c b/examples/application3/exampleappwin.c index 9ed0b88452..3925fa4689 100644 --- a/examples/application3/exampleappwin.c +++ b/examples/application3/exampleappwin.c @@ -43,7 +43,7 @@ example_app_window_open (ExampleAppWindow *win, basename = g_file_get_basename (file); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/examples/application4/exampleappwin.c b/examples/application4/exampleappwin.c index bcc72807af..97f8209cd3 100644 --- a/examples/application4/exampleappwin.c +++ b/examples/application4/exampleappwin.c @@ -53,7 +53,7 @@ example_app_window_open (ExampleAppWindow *win, basename = g_file_get_basename (file); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/examples/application5/exampleappwin.c b/examples/application5/exampleappwin.c index 5425b44a4d..2fac229a10 100644 --- a/examples/application5/exampleappwin.c +++ b/examples/application5/exampleappwin.c @@ -76,7 +76,7 @@ example_app_window_open (ExampleAppWindow *win, basename = g_file_get_basename (file); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/examples/application6/exampleappwin.c b/examples/application6/exampleappwin.c index 7f332181ea..5eacf3d04c 100644 --- a/examples/application6/exampleappwin.c +++ b/examples/application6/exampleappwin.c @@ -77,7 +77,7 @@ example_app_window_open (ExampleAppWindow *win, basename = g_file_get_basename (file); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/examples/application7/exampleappwin.c b/examples/application7/exampleappwin.c index cea8941dbc..67db00d573 100644 --- a/examples/application7/exampleappwin.c +++ b/examples/application7/exampleappwin.c @@ -130,7 +130,7 @@ example_app_window_open (ExampleAppWindow *win, basename = g_file_get_basename (file); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/examples/application8/exampleappwin.c b/examples/application8/exampleappwin.c index f30895b035..9a5eb2818c 100644 --- a/examples/application8/exampleappwin.c +++ b/examples/application8/exampleappwin.c @@ -222,7 +222,7 @@ example_app_window_open (ExampleAppWindow *win, basename = g_file_get_basename (file); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/examples/application9/exampleappwin.c b/examples/application9/exampleappwin.c index c77a124f3d..30c281ae93 100644 --- a/examples/application9/exampleappwin.c +++ b/examples/application9/exampleappwin.c @@ -256,7 +256,7 @@ example_app_window_open (ExampleAppWindow *win, basename = g_file_get_basename (file); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/examples/bp/bloatpad.c b/examples/bp/bloatpad.c index 21fdfc98d9..ecaa9bc125 100644 --- a/examples/bp/bloatpad.c +++ b/examples/bp/bloatpad.c @@ -252,7 +252,7 @@ new_window (GApplication *app, gtk_grid_attach (GTK_GRID (grid), toolbar, 0, 0, 1, 1); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/examples/plugman.c b/examples/plugman.c index 9e9c683242..fa7359ab26 100644 --- a/examples/plugman.c +++ b/examples/plugman.c @@ -86,7 +86,7 @@ new_window (GApplication *app, grid = gtk_grid_new (); gtk_window_set_child (GTK_WINDOW (window), grid); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/examples/sunny.c b/examples/sunny.c index 43757023a0..5d40018217 100644 --- a/examples/sunny.c +++ b/examples/sunny.c @@ -21,7 +21,7 @@ new_window (GApplication *app, overlay = gtk_overlay_new (); gtk_window_set_child (GTK_WINDOW (window), overlay); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled, TRUE); gtk_widget_set_vexpand (scrolled, TRUE); view = gtk_text_view_new (); diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c index daaaf2e3b5..608a637c88 100644 --- a/gtk/gtkcustompaperunixdialog.c +++ b/gtk/gtkcustompaperunixdialog.c @@ -888,7 +888,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) gtk_box_append (GTK_BOX (hbox), vbox); gtk_widget_show (vbox); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_widget_set_vexpand (scrolled, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index cfb4430ebf..107436438e 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -497,7 +497,7 @@ gtk_entry_completion_constructed (GObject *object) completion->column = gtk_tree_view_column_new_with_area (completion->cell_area); gtk_tree_view_append_column (GTK_TREE_VIEW (completion->tree_view), completion->column); - completion->scrolled_window = gtk_scrolled_window_new (NULL, NULL); + completion->scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (completion->scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index ae9e75a6db..cfaa834b9c 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -1598,7 +1598,7 @@ create_show_processes_dialog (GtkMountOperation *op, gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index f016612ef0..3fa3cc5c3e 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -3758,7 +3758,7 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar) sidebar->trash_monitor_changed_id = g_signal_connect_swapped (sidebar->trash_monitor, "trash-state-changed", G_CALLBACK (update_trash_icon), sidebar); - sidebar->swin = gtk_scrolled_window_new (NULL, NULL); + sidebar->swin = gtk_scrolled_window_new (); gtk_widget_set_parent (sidebar->swin, GTK_WIDGET (sidebar)); gtk_widget_set_size_request (sidebar->swin, 140, 280); diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 00e088cd7e..46b43c852d 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -80,7 +80,7 @@ * from the GtkScrolledWindow, like this: * * |[<!-- language="C" --> - * GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); + * GtkWidget *scrolled_window = gtk_scrolled_window_new (); * GtkWidget *child_widget = gtk_button_new (); * * // GtkButton is not a GtkScrollable, so GtkScrolledWindow will automatically @@ -2082,36 +2082,15 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window) /** * gtk_scrolled_window_new: - * @hadjustment: (nullable): horizontal adjustment - * @vadjustment: (nullable): vertical adjustment * * Creates a new scrolled window. * - * The two arguments are the scrolled window’s adjustments; these will be - * shared with the scrollbars and the child widget to keep the bars in sync - * with the child. Usually you want to pass %NULL for the adjustments, which - * will cause the scrolled window to create them for you. - * * Returns: a new scrolled window */ -GtkWidget* -gtk_scrolled_window_new (GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment) +GtkWidget * +gtk_scrolled_window_new (void) { - GtkWidget *scrolled_window; - - if (hadjustment) - g_return_val_if_fail (GTK_IS_ADJUSTMENT (hadjustment), NULL); - - if (vadjustment) - g_return_val_if_fail (GTK_IS_ADJUSTMENT (vadjustment), NULL); - - scrolled_window = g_object_new (GTK_TYPE_SCROLLED_WINDOW, - "hadjustment", hadjustment, - "vadjustment", vadjustment, - NULL); - - return scrolled_window; + return g_object_new (GTK_TYPE_SCROLLED_WINDOW, NULL); } /** diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h index 231628b974..5d1a1d66e1 100644 --- a/gtk/gtkscrolledwindow.h +++ b/gtk/gtkscrolledwindow.h @@ -92,8 +92,7 @@ typedef enum GDK_AVAILABLE_IN_ALL GType gtk_scrolled_window_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_scrolled_window_new (GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment); +GtkWidget* gtk_scrolled_window_new (void); GDK_AVAILABLE_IN_ALL void gtk_scrolled_window_set_hadjustment (GtkScrolledWindow *scrolled_window, GtkAdjustment *hadjustment); diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c index 643c1b0e68..a2dda7cf19 100644 --- a/gtk/gtkshortcutswindow.c +++ b/gtk/gtkshortcutswindow.c @@ -946,7 +946,7 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self) self, G_CONNECT_SWAPPED); - scroller = gtk_scrolled_window_new (NULL, NULL); + scroller = gtk_scrolled_window_new (); box = g_object_new (GTK_TYPE_BOX, "halign", GTK_ALIGN_CENTER, "orientation", GTK_ORIENTATION_VERTICAL, diff --git a/gtk/gtkstacksidebar.c b/gtk/gtkstacksidebar.c index f72000ab3b..781ddb934d 100644 --- a/gtk/gtkstacksidebar.c +++ b/gtk/gtkstacksidebar.c @@ -157,7 +157,7 @@ gtk_stack_sidebar_init (GtkStackSidebar *self) { GtkWidget *sw; - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); diff --git a/gtk/inspector/controllers.c b/gtk/inspector/controllers.c index aca123d6ae..d20bef493b 100644 --- a/gtk/inspector/controllers.c +++ b/gtk/inspector/controllers.c @@ -79,7 +79,7 @@ gtk_inspector_controllers_init (GtkInspectorControllers *self) self->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); g_object_set (box, diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c index 2b87f03b2e..3ee82ef1b8 100644 --- a/gtk/inspector/prop-editor.c +++ b/gtk/inspector/prop-editor.c @@ -947,7 +947,7 @@ property_editor (GObject *object, prop_edit = gtk_menu_button_new (); gtk_menu_button_set_popover (GTK_MENU_BUTTON (prop_edit), popover); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_popover_set_child (GTK_POPOVER (popover), sw); g_object_set (sw, "hexpand", TRUE, @@ -1015,7 +1015,7 @@ property_editor (GObject *object, prop_edit = gtk_menu_button_new (); gtk_menu_button_set_popover (GTK_MENU_BUTTON (prop_edit), popover); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_popover_set_child (GTK_POPOVER (popover), sw); g_object_set (sw, "hexpand", TRUE, diff --git a/tests/listmodel.c b/tests/listmodel.c index aaaabab9d1..09adaa601f 100644 --- a/tests/listmodel.c +++ b/tests/listmodel.c @@ -193,7 +193,7 @@ main (int argc, char *argv[]) window = gtk_window_new (); grid = gtk_grid_new (); gtk_window_set_child (GTK_WINDOW (window), grid); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -205,7 +205,7 @@ main (int argc, char *argv[]) gtk_list_box_bind_model (GTK_LIST_BOX (box), G_LIST_MODEL (store), create_widget, NULL, NULL); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c index 0eb0582b6f..9a447b5c63 100644 --- a/tests/overlayscroll.c +++ b/tests/overlayscroll.c @@ -72,7 +72,7 @@ main (int argc, char *argv[]) box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20); gtk_window_set_child (GTK_WINDOW (window), box); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); diff --git a/tests/scrolling-performance.c b/tests/scrolling-performance.c index abae772b25..3d5b165623 100644 --- a/tests/scrolling-performance.c +++ b/tests/scrolling-performance.c @@ -128,7 +128,7 @@ main (int argc, char **argv) frame_stats_ensure (GTK_WINDOW (window)); gtk_window_set_default_size (GTK_WINDOW (window), 800, 600); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), scrolled_window); viewport = gtk_viewport_new (NULL, NULL); diff --git a/tests/syncscroll.c b/tests/syncscroll.c index ffbfc209ca..05338c7607 100644 --- a/tests/syncscroll.c +++ b/tests/syncscroll.c @@ -28,7 +28,7 @@ main (int argc, char *argv[]) box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); gtk_window_set_child (GTK_WINDOW (win), box); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_EXTERNAL); @@ -40,7 +40,8 @@ main (int argc, char *argv[]) adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw)); - sw = gtk_scrolled_window_new (NULL, adj); + sw = gtk_scrolled_window_new (); + gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (sw), adj); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_EXTERNAL); @@ -50,7 +51,8 @@ main (int argc, char *argv[]) fill_text_view (tv, "Middle"); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv); - sw = gtk_scrolled_window_new (NULL, adj); + sw = gtk_scrolled_window_new (); + gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (sw), adj); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_EXTERNAL); diff --git a/tests/testaccel.c b/tests/testaccel.c index fedefd4781..9ff403507d 100644 --- a/tests/testaccel.c +++ b/tests/testaccel.c @@ -70,7 +70,7 @@ key_test (void) window = gtk_window_new (); gtk_window_set_default_size (GTK_WINDOW (window), 400, 400); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_widget_set_vexpand (sw, TRUE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_window_set_child (GTK_WINDOW (window), box); diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c index ca558dc51a..1f72ccf9db 100644 --- a/tests/testcellrenderertext.c +++ b/tests/testcellrenderertext.c @@ -173,7 +173,7 @@ create_tree (gboolean rtl) GtkCellRenderer *renderer; GdkPixbuf *pixbuf; - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_widget_set_direction (sw, rtl ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR); diff --git a/tests/testclipboard2.c b/tests/testclipboard2.c index 40c91b2b72..ed80ffde30 100644 --- a/tests/testclipboard2.c +++ b/tests/testclipboard2.c @@ -248,7 +248,7 @@ get_formats_list (GdkClipboard *clipboard) { GtkWidget *sw, *list; - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); list = gtk_list_box_new (); g_signal_connect_object (clipboard, "notify::formats", G_CALLBACK (clipboard_formats_change_cb), list, 0); diff --git a/tests/testcolumnview.c b/tests/testcolumnview.c index 6b0b3cbad9..51acea59ff 100644 --- a/tests/testcolumnview.c +++ b/tests/testcolumnview.c @@ -709,7 +709,7 @@ main (int argc, char *argv[]) search_entry = gtk_search_entry_new (); gtk_box_append (GTK_BOX (vbox), search_entry); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_widget_set_hexpand (sw, TRUE); gtk_widget_set_vexpand (sw, TRUE); gtk_search_entry_set_key_capture_widget (GTK_SEARCH_ENTRY (search_entry), sw); diff --git a/tests/testcombochange.c b/tests/testcombochange.c index a4a6ec9b56..01bac3379a 100644 --- a/tests/testcombochange.c +++ b/tests/testcombochange.c @@ -227,7 +227,7 @@ main (int argc, char **argv) gtk_widget_set_margin_start (combo, 12); gtk_box_append (GTK_BOX (combo_vbox), combo); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled_window, TRUE); gtk_box_append (GTK_BOX (hbox), scrolled_window); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), diff --git a/tests/testflowbox.c b/tests/testflowbox.c index ece3a969f1..6fef5fa2f4 100644 --- a/tests/testflowbox.c +++ b/tests/testflowbox.c @@ -375,7 +375,7 @@ create_window (void) gtk_window_set_child (GTK_WINDOW (window), hbox); gtk_box_append (GTK_BOX (hbox), vbox); - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_widget_set_hexpand (swindow, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/tests/testgrid.c b/tests/testgrid.c index 15948f0063..97c52cb609 100644 --- a/tests/testgrid.c +++ b/tests/testgrid.c @@ -262,7 +262,7 @@ scrolling (void) window = gtk_window_new (); gtk_window_set_title (GTK_WINDOW (window), "Scrolling"); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); viewport = gtk_viewport_new (NULL, NULL); grid = gtk_grid_new (); diff --git a/tests/testgrouping.c b/tests/testgrouping.c index 01bfc3b3f5..9863f5da4b 100644 --- a/tests/testgrouping.c +++ b/tests/testgrouping.c @@ -125,7 +125,7 @@ main (int argc, char **argv) g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); gtk_window_set_default_size (GTK_WINDOW (window), 320, 480); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), sw); tv = gtk_tree_view_new_with_model (model); diff --git a/tests/testgtk.c b/tests/testgtk.c index 32289d989d..747f06fc86 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -1520,7 +1520,7 @@ create_listbox (GtkWidget *widget) hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_window_set_child (GTK_WINDOW (window), hbox); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_box_append (GTK_BOX (hbox), scrolled); @@ -1948,7 +1948,7 @@ create_scrolled_windows (GtkWidget *widget) gtk_window_set_title (GTK_WINDOW (window), "dialog"); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_widget_set_hexpand (scrolled_window, TRUE); gtk_widget_set_vexpand (scrolled_window, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), @@ -5996,7 +5996,7 @@ create_main_window (void) gtk_box_append (GTK_BOX (box1), label); gtk_widget_set_name (label, "testgtk-version-label"); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_widget_set_margin_top (scrolled_window, 10); gtk_widget_set_margin_bottom (scrolled_window, 10); gtk_widget_set_margin_start (scrolled_window, 10); diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c index 6326e54cc0..9ee5613006 100644 --- a/tests/testheaderbar.c +++ b/tests/testheaderbar.c @@ -103,7 +103,7 @@ create_headerbar_overlay (GtkApplication *app) gtk_overlay_add_overlay (GTK_OVERLAY (overlay), header); load_css (header, "headerbar { background: alpha(shade(@theme_bg_color, .9), .8); }"); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_widget_set_size_request (sw, 300, 250); gtk_overlay_set_child (GTK_OVERLAY (overlay), sw); diff --git a/tests/testiconview.c b/tests/testiconview.c index 61e1a324f1..4fb6723ead 100644 --- a/tests/testiconview.c +++ b/tests/testiconview.c @@ -521,14 +521,14 @@ main (gint argc, gchar **argv) GDK_ACTION_MOVE); gdk_content_formats_unref (targets); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), icon_list); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_paned_set_start_child (GTK_PANED (paned), scrolled_window); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tv); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -577,7 +577,7 @@ main (gint argc, gchar **argv) icon_list = gtk_icon_view_new (); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), icon_list); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/tests/testkineticscrolling.c b/tests/testkineticscrolling.c index 8d64fb5686..ba72529584 100644 --- a/tests/testkineticscrolling.c +++ b/tests/testkineticscrolling.c @@ -64,7 +64,7 @@ kinetic_scrolling (void) g_free (button_label); } - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_scrolled_window_set_kinetic_scrolling (GTK_SCROLLED_WINDOW (swindow), TRUE); gtk_scrolled_window_set_capture_button_press (GTK_SCROLLED_WINDOW (swindow), TRUE); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), button_grid); @@ -102,7 +102,7 @@ kinetic_scrolling (void) gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (store)); g_object_unref (store); - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_scrolled_window_set_kinetic_scrolling (GTK_SCROLLED_WINDOW (swindow), TRUE); gtk_scrolled_window_set_capture_button_press (GTK_SCROLLED_WINDOW (swindow), TRUE); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), treeview); @@ -112,7 +112,7 @@ kinetic_scrolling (void) gtk_widget_set_vexpand (swindow, TRUE); textview = gtk_text_view_new (); - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_scrolled_window_set_kinetic_scrolling (GTK_SCROLLED_WINDOW (swindow), TRUE); gtk_scrolled_window_set_capture_button_press (GTK_SCROLLED_WINDOW (swindow), TRUE); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), textview); diff --git a/tests/testlist.c b/tests/testlist.c index da44389d98..b781c28980 100644 --- a/tests/testlist.c +++ b/tests/testlist.c @@ -282,7 +282,7 @@ main (int argc, char *argv[]) g_signal_connect (check, "toggled", G_CALLBACK (single_click_clicked), list); gtk_box_append (GTK_BOX (vbox), check); - scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), list); gtk_box_append (GTK_BOX (hbox), scrolled); diff --git a/tests/testlist2.c b/tests/testlist2.c index a425428b34..11229c557a 100644 --- a/tests/testlist2.c +++ b/tests/testlist2.c @@ -121,7 +121,7 @@ int main (int argc, char *argv[]) list = gtk_list_box_new (); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE); gtk_list_box_set_header_func (GTK_LIST_BOX (list), add_separator, NULL, NULL); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), sw); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list); diff --git a/tests/testlist3.c b/tests/testlist3.c index 80ab08a58d..f3f6b3b0dd 100644 --- a/tests/testlist3.c +++ b/tests/testlist3.c @@ -154,7 +154,7 @@ main (int argc, char *argv[]) g_signal_connect (list, "selected-rows-changed", G_CALLBACK (on_selected_children_changed), NULL); g_signal_connect (gtk_widget_get_accessible (list), "selection-changed", G_CALLBACK (a11y_selection_changed), NULL); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_widget_set_hexpand (sw, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); gtk_box_append (GTK_BOX (hbox), sw); diff --git a/tests/testlist4.c b/tests/testlist4.c index bae109f989..ce0500d24e 100644 --- a/tests/testlist4.c +++ b/tests/testlist4.c @@ -102,7 +102,7 @@ new_window (GApplication *app) /* widget creation */ grid = gtk_grid_new (); gtk_window_set_child (GTK_WINDOW (window), grid); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_widget_set_hexpand (GTK_WIDGET (sw), true); gtk_widget_set_vexpand (GTK_WIDGET (sw), true); gtk_grid_attach (GTK_GRID (grid), sw, 0, 0, 1, 1); diff --git a/tests/testlistdnd.c b/tests/testlistdnd.c index afabfba4c6..2d8f7f4b7e 100644 --- a/tests/testlistdnd.c +++ b/tests/testlistdnd.c @@ -338,7 +338,7 @@ main (int argc, char *argv[]) gtk_box_append (GTK_BOX (box), stack); /* grid */ - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_stack_add_titled (GTK_STACK (stack), sw, "grid", "GtkGridView"); @@ -361,7 +361,7 @@ main (int argc, char *argv[]) g_object_unref (factory); /* list */ - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_stack_add_titled (GTK_STACK (stack), sw, "list", "GtkListView"); @@ -381,7 +381,7 @@ main (int argc, char *argv[]) g_object_unref (factory); /* columnview */ - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_stack_add_titled (GTK_STACK (stack), sw, "column", "GtkColumnView"); @@ -411,7 +411,7 @@ main (int argc, char *argv[]) gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), cv); /* tree */ - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_stack_add_titled (GTK_STACK (stack), sw, "tree", "Tree"); diff --git a/tests/testlistview-animating.c b/tests/testlistview-animating.c index 2d68d6b160..a69cb9a6fd 100644 --- a/tests/testlistview-animating.c +++ b/tests/testlistview-animating.c @@ -140,7 +140,7 @@ main (int argc, label = gtk_label_new ("GtkListView"); gtk_box_append (GTK_BOX (vbox), label); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_widget_set_hexpand (sw, TRUE); gtk_widget_set_vexpand (sw, TRUE); gtk_box_append (GTK_BOX (vbox), sw); @@ -157,7 +157,7 @@ main (int argc, label = gtk_label_new ("GtkListBox"); gtk_box_append (GTK_BOX (vbox), label); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_widget_set_hexpand (sw, TRUE); gtk_widget_set_vexpand (sw, TRUE); gtk_box_append (GTK_BOX (vbox), sw); diff --git a/tests/testlistview.c b/tests/testlistview.c index 927e3a1fd3..0d33349d58 100644 --- a/tests/testlistview.c +++ b/tests/testlistview.c @@ -613,7 +613,7 @@ main (int argc, char *argv[]) search_entry = gtk_search_entry_new (); gtk_box_append (GTK_BOX (vbox), search_entry); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_widget_set_vexpand (sw, TRUE); gtk_search_entry_set_key_capture_widget (GTK_SEARCH_ENTRY (search_entry), sw); gtk_box_append (GTK_BOX (vbox), sw); diff --git a/tests/testoverlay.c b/tests/testoverlay.c index 4929a75166..7c175cfbbe 100644 --- a/tests/testoverlay.c +++ b/tests/testoverlay.c @@ -229,7 +229,7 @@ test_scrolling (void) overlay = gtk_overlay_new (); gtk_window_set_child (GTK_WINDOW (win), overlay); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (sw), 200); gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 200); gtk_overlay_set_child (GTK_OVERLAY (overlay), sw); @@ -378,7 +378,7 @@ test_chase (void) overlay = gtk_overlay_new (); gtk_window_set_child (GTK_WINDOW (win), overlay); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (sw), 200); gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 200); gtk_overlay_set_child (GTK_OVERLAY (overlay), sw); diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c index c77e2a94f5..47032021c7 100644 --- a/tests/testoverlaystyleclass.c +++ b/tests/testoverlaystyleclass.c @@ -53,7 +53,7 @@ main (int argc, char *argv[]) gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); overlay = gtk_overlay_new (); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS); diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c index 1e1c45c065..70820d66f5 100644 --- a/tests/testscrolledge.c +++ b/tests/testscrolledge.c @@ -120,7 +120,7 @@ main (int argc, char *argv[]) gtk_overlay_add_overlay (GTK_OVERLAY (overlay), popup); gtk_widget_hide (popup); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); list = gtk_list_box_new (); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE); diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c index c485a3148c..ca772c12dd 100644 --- a/tests/testscrolledwindow.c +++ b/tests/testscrolledwindow.c @@ -90,7 +90,7 @@ scrollable_policy (void) gtk_widget_set_hexpand (frame, TRUE); gtk_box_append (GTK_BOX (hbox), frame); - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -207,7 +207,7 @@ scrollable_policy (void) gtk_popover_set_child (GTK_POPOVER (popover), vbox); /* Popover's scrolled window */ - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/tests/testscrolltofocus.c b/tests/testscrolltofocus.c index e524988a3d..2c1d442252 100644 --- a/tests/testscrolltofocus.c +++ b/tests/testscrolltofocus.c @@ -10,7 +10,7 @@ int main (int argc, char *argv[]) gtk_init (); window = gtk_window_new (); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), sw); viewport = gtk_viewport_new (gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (sw)), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw))); diff --git a/tests/teststack.c b/tests/teststack.c index af111d1dd6..39e77ff190 100644 --- a/tests/teststack.c +++ b/tests/teststack.c @@ -163,7 +163,7 @@ main (gint argc, g_object_set (page, "needs-attention", TRUE, NULL); - scrolled_win = gtk_scrolled_window_new (NULL, NULL); + scrolled_win = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/tests/testtextview.c b/tests/testtextview.c index a8aa9da101..ae7d65ec06 100644 --- a/tests/testtextview.c +++ b/tests/testtextview.c @@ -177,7 +177,7 @@ main (int argc, char **argv) gtk_init (); window = gtk_window_new (); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); textview = g_object_new (my_text_view_get_type (), NULL); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview)); button = gtk_button_new_with_label ("Fixed Child"); diff --git a/tests/testtextview2.c b/tests/testtextview2.c index 9d4b6c9c54..97ab974a2b 100644 --- a/tests/testtextview2.c +++ b/tests/testtextview2.c @@ -196,7 +196,7 @@ main (int argc, char *argv[]) box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_widget_set_hexpand (sw, TRUE); gtk_widget_set_vexpand (sw, TRUE); gtk_window_set_child (GTK_WINDOW (window), box); diff --git a/tests/testtreechanging.c b/tests/testtreechanging.c index dab647c6fc..bbbc210828 100644 --- a/tests/testtreechanging.c +++ b/tests/testtreechanging.c @@ -495,7 +495,7 @@ main (int argc, g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); gtk_window_set_default_size (GTK_WINDOW (window), 430, 400); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_widget_set_hexpand (sw, TRUE); gtk_widget_set_vexpand (sw, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c index 3612a9269d..47030f8f9b 100644 --- a/tests/testtreecolumns.c +++ b/tests/testtreecolumns.c @@ -761,7 +761,7 @@ main (int argc, char *argv[]) g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); gtk_window_set_default_size (GTK_WINDOW (window), 300, 300); gtk_window_set_title (GTK_WINDOW (window), "Top Window"); - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), swindow); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), sample_tree_view_top); gtk_widget_show (window); @@ -770,7 +770,7 @@ main (int argc, char *argv[]) g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); gtk_window_set_default_size (GTK_WINDOW (window), 300, 300); gtk_window_set_title (GTK_WINDOW (window), "Bottom Window"); - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), swindow); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), sample_tree_view_bottom); gtk_widget_show (window); @@ -788,7 +788,7 @@ main (int argc, char *argv[]) /* Left Pane */ cell = gtk_cell_renderer_text_new (); - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); left_tree_view = gtk_tree_view_new_with_model (left_tree_model); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), left_tree_view); @@ -845,7 +845,7 @@ main (int argc, char *argv[]) vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_box_append (GTK_BOX (hbox), vbox2); - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (top_right_tree_view), FALSE); cell = gtk_cell_renderer_text_new (); @@ -860,7 +860,7 @@ main (int argc, char *argv[]) gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), top_right_tree_view); gtk_box_append (GTK_BOX (vbox2), swindow); - swindow = gtk_scrolled_window_new (NULL, NULL); + swindow = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (bottom_right_tree_view), FALSE); cell = gtk_cell_renderer_text_new (); diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c index 71a03a5016..a2932f48ea 100644 --- a/tests/testtreecolumnsizing.c +++ b/tests/testtreecolumnsizing.c @@ -205,7 +205,7 @@ main (int argc, char **argv) gtk_box_append (GTK_BOX (vbox), combo_box); /* Scrolled window and tree view */ - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c index 0ed30af13b..e528d50191 100644 --- a/tests/testtreeedit.c +++ b/tests/testtreeedit.c @@ -254,7 +254,7 @@ main (gint argc, gchar **argv) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_window_set_child (GTK_WINDOW (window), vbox); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c index 8088e9aaef..de9e235878 100644 --- a/tests/testtreeflow.c +++ b/tests/testtreeflow.c @@ -150,7 +150,7 @@ main (int argc, char *argv[]) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_box_append (GTK_BOX (vbox), gtk_label_new ("Incremental Reflow Test")); gtk_window_set_child (GTK_WINDOW (window), vbox); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c index c0aa3907ce..1f6f2d1dd8 100644 --- a/tests/testtreefocus.c +++ b/tests/testtreefocus.c @@ -367,7 +367,7 @@ main (int argc, char *argv[]) gtk_box_append (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet")); gtk_window_set_child (GTK_WINDOW (window), vbox); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_set_vexpand (scrolled_window, TRUE); @@ -482,7 +482,7 @@ main (int argc, char *argv[]) gtk_box_append (GTK_BOX (vbox), gtk_label_new ("The model revealed")); gtk_window_set_child (GTK_WINDOW (window), vbox); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_set_vexpand (scrolled_window, TRUE); diff --git a/tests/testtreepos.c b/tests/testtreepos.c index c00aa96b88..e2c26e90f6 100644 --- a/tests/testtreepos.c +++ b/tests/testtreepos.c @@ -94,7 +94,7 @@ int main (int argc, char *argv[]) gtk_init (); window = gtk_window_new (); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_window_set_child (GTK_WINDOW (window), sw); tv = gtk_tree_view_new (); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv); diff --git a/tests/testtreesort.c b/tests/testtreesort.c index c4d29c8ed8..a85240d06e 100644 --- a/tests/testtreesort.c +++ b/tests/testtreesort.c @@ -131,7 +131,7 @@ main (int argc, char *argv[]) button = gtk_button_new_with_label ("Switch search method"); gtk_box_append (GTK_BOX (vbox), button); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_set_vexpand (scrolled_window, TRUE); @@ -254,7 +254,7 @@ main (int argc, char *argv[]) gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeStore of window 1")); gtk_window_set_child (GTK_WINDOW (window2), vbox2); - scrolled_window2 = gtk_scrolled_window_new (NULL, NULL); + scrolled_window2 = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window2), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window2), GTK_POLICY_AUTOMATIC, @@ -321,7 +321,7 @@ main (int argc, char *argv[]) gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeModelSort of window 2")); gtk_window_set_child (GTK_WINDOW (window3), vbox3); - scrolled_window3 = gtk_scrolled_window_new (NULL, NULL); + scrolled_window3 = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window3), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window3), GTK_POLICY_AUTOMATIC, diff --git a/tests/testtreeview.c b/tests/testtreeview.c index 58f7ffe91c..f6854a74d7 100644 --- a/tests/testtreeview.c +++ b/tests/testtreeview.c @@ -744,7 +744,7 @@ main (int argc, G_CALLBACK (columns_selected), tv); - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); gtk_widget_set_hexpand (sw, TRUE); gtk_widget_set_vexpand (sw, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), diff --git a/tests/testverticalcells.c b/tests/testverticalcells.c index e1a4ffe5cf..ed89ece29a 100644 --- a/tests/testverticalcells.c +++ b/tests/testverticalcells.c @@ -320,7 +320,7 @@ main (gint argc, gchar **argv) gtk_window_set_title (GTK_WINDOW (window), "Vertical cells in GtkTreeViewColumn example"); g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/tests/treestoretest.c b/tests/treestoretest.c index efb2444cee..afe871414e 100644 --- a/tests/treestoretest.c +++ b/tests/treestoretest.c @@ -318,7 +318,7 @@ make_window (gint view_type) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_window_set_default_size (GTK_WINDOW (window), 300, 350); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); + scrolled_window = gtk_scrolled_window_new (); switch (view_type) { case 0: diff --git a/testsuite/a11y/children.c b/testsuite/a11y/children.c index 91d69f7b87..1349b61218 100644 --- a/testsuite/a11y/children.c +++ b/testsuite/a11y/children.c @@ -36,7 +36,7 @@ test_scrolled_window_child_count (void) GtkWidget *sw; AtkObject *accessible; - sw = gtk_scrolled_window_new (NULL, NULL); + sw = gtk_scrolled_window_new (); g_object_ref_sink (sw); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS); @@ -242,7 +242,7 @@ main (int argc, char *argv[]) g_test_add_func ("/scrolledwindow/child-count", test_scrolled_window_child_count); - add_child_tests (gtk_scrolled_window_new (NULL, NULL)); + add_child_tests (gtk_scrolled_window_new ()); add_child_tests (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); add_child_tests (gtk_paned_new (GTK_ORIENTATION_HORIZONTAL)); add_child_tests (gtk_grid_new ()); diff --git a/testsuite/gtk/scrolledwindow.c b/testsuite/gtk/scrolledwindow.c index 8cabbd926b..5aaf2d31c2 100644 --- a/testsuite/gtk/scrolledwindow.c +++ b/testsuite/gtk/scrolledwindow.c @@ -24,7 +24,7 @@ test_size (gboolean overlay, gtk_widget_set_hexpand (box, TRUE); gtk_widget_set_vexpand (box, TRUE); - scrolledwindow = gtk_scrolled_window_new (NULL, NULL); + scrolledwindow = gtk_scrolled_window_new (); gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (scrolledwindow), TRUE); gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (scrolledwindow), TRUE); gtk_scrolled_window_set_overlay_scrolling (GTK_SCROLLED_WINDOW (scrolledwindow), overlay); |