gtk-demo: Deprecation cleanup

Remove many uses of deprecated api in gtk4-demo.

Remaining uses are demos of wholly deprecated objects
that will just be dropped in GTK5.

diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c
index 76982361d0f54ca8ea826390123ad334edc288cf..cbd707a994a822e3576e8390711eb5ee6e80ac59 100644 (file)
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -2,8 +2,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 
@@ -216,6 +214,41 @@ activate_quit (GSimpleAction *action,
     }
 }
 
+static void
+delete_messages (gpointer data)
+{
+  g_list_free_full ((GList *)data, g_free);
+}
+
+static void
+pop_message (GtkWidget *status)
+{
+  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
+
+  if (messages)
+    {
+      char *message = messages->data;
+      messages = g_list_remove (messages, message);
+
+      g_object_set_data_full (G_OBJECT (status), "messages",
+                              messages, delete_messages);
+
+      gtk_label_set_label (GTK_LABEL (status), message);
+    }
+}
+
+static void
+push_message (GtkWidget  *status,
+              const char *message)
+{
+  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
+
+  gtk_label_set_label (GTK_LABEL (status), message);
+  messages = g_list_prepend (messages, g_strdup (message));
+  g_object_set_data_full (G_OBJECT (status), "messages",
+                          messages, delete_messages);
+}
+
 static void
 update_statusbar (GtkTextBuffer         *buffer,
                   DemoApplicationWindow *window)
@@ -226,7 +259,7 @@ update_statusbar (GtkTextBuffer         *buffer,
   GtkTextIter iter;
 
   /* clear any previous message, underflow is allowed */
-  gtk_statusbar_pop (GTK_STATUSBAR (window->status), 0);
+  pop_message (window->status);
 
   count = gtk_text_buffer_get_char_count (buffer);
 
@@ -240,7 +273,7 @@ update_statusbar (GtkTextBuffer         *buffer,
   msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
                          row, col, count);
 
-  gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, msg);
+  push_message (window->status, msg);
 
   g_free (msg);
 }

diff --git a/demos/gtk-demo/application.ui b/demos/gtk-demo/application.ui
index b54e60884ad1df642fb1a73c923a8a3a434b8786..1229a6d369949ae51ac7815285eb053e569291ca 100644 (file)
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -76,8 +76,13 @@
           </object>
         </child>
         <child>
-          <object class="GtkStatusbar" id="status">
+          <object class="GtkLabel" id="status">
             <property name="hexpand">1</property>
+            <property name="xalign">0</property>
+            <property name="margin-start">2</property>
+            <property name="margin-end">2</property>
+            <property name="margin-top">2</property>
+            <property name="margin-bottom">2</property>
             <layout>
               <property name="column">0</property>
               <property name="row">3</property>

diff --git a/demos/gtk-demo/builder.c b/demos/gtk-demo/builder.c
index 126ea9c9b8787d547b9ab6742d58ec6ee12559c7..f8366eb2642cb9adbf13ceb0faa3f000779a221a 100644 (file)
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -1,5 +1,5 @@
 /* Builder
- * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkStatusBar, GtkShortcutController, toolbar
+ * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkShortcutController, toolbar
  *
  * Demonstrates a traditional interface, loaded from a XML description,
  * and shows how to connect actions to the menu items and toolbar buttons.
@@ -37,30 +37,34 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-static gboolean
-pop_status (gpointer data)
+static int
+pop_message (gpointer data)
 {
-  gtk_statusbar_pop (GTK_STATUSBAR (data), 0);
-  g_object_set_data (G_OBJECT (data), "timeout", NULL);
+  GtkWidget *status = data;
+
+  gtk_label_set_label (GTK_LABEL (status), "");
+  g_object_set_data (G_OBJECT (status), "timeout", GUINT_TO_POINTER (0));
+
   return G_SOURCE_REMOVE;
 }
 
 static void
-status_message (GtkStatusbar *status,
-                const char   *text)
+status_message (GtkWidget  *status,
+                const char *text)
 {
   guint id;
 
-  gtk_statusbar_push (GTK_STATUSBAR (status), 0, text);
-  id = g_timeout_add (5000, pop_status, status);
+  id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (status), "timeout"));
+  if (id)
+    g_source_remove (id);
+
+  gtk_label_set_text (GTK_LABEL (status), text);
+
+  id = g_timeout_add (5000, pop_message, status);
 
   g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
 }
 
-G_GNUC_END_IGNORE_DEPRECATIONS
-
 static void
 help_activate (GSimpleAction *action,
                GVariant      *parameter,
@@ -69,7 +73,7 @@ help_activate (GSimpleAction *action,
   GtkWidget *status;
 
   status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (GTK_STATUSBAR (status), "Help not available");
+  status_message (status, "Help not available");
 }
 
 static void
@@ -82,7 +86,7 @@ not_implemented (GSimpleAction *action,
 
   text = g_strdup_printf ("Action “%s” not implemented", g_action_get_name (G_ACTION (action)));
   status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (GTK_STATUSBAR (status), text);
+  status_message (status, text);
   g_free (text);
 }
 

diff --git a/demos/gtk-demo/css_basics.c b/demos/gtk-demo/css_basics.c
index 66e318ae78c51aed7eaeb062f465d4c5153f027b..ee8f7b8f6fb26575beebe2cb1bbefb159424c3f5 100644 (file)
--- a/demos/gtk-demo/css_basics.c
+++ b/demos/gtk-demo/css_basics.c
@@ -6,8 +6,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -49,20 +47,23 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1);
+  gtk_css_provider_load_from_string (provider, text);
   g_free (text);
 }
 
 static void
-apply_css (GtkWidget *widget, GtkStyleProvider *provider)
+clear_provider (gpointer data)
 {
-  GtkWidget *child;
+  GtkStyleProvider *provider = data;
+
+  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
+}
 
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+static void
+apply_css (GtkWidget *widget, GtkStyleProvider *provider)
+{
+  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
 }
 
 GtkWidget *
@@ -81,6 +82,7 @@ do_css_basics (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
+      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       text = gtk_text_buffer_new (NULL);

diff --git a/demos/gtk-demo/css_basics.css b/demos/gtk-demo/css_basics.css
index 238ad466676515e7f03ea59ceac93daf255e4b0e..9f07b954e1f3a2f7b9806a597b3a01f87a9049ea 100644 (file)
--- a/demos/gtk-demo/css_basics.css
+++ b/demos/gtk-demo/css_basics.css
@@ -4,23 +4,24 @@
  * anymore. :)
  */
 
-/* This CSS resets all properties to their defaults values
- *    and overrides all user settings and the theme in use */
-@import url("resource://css_basics/reset.css");
+/* This resets all properties to their defaults values
+ * and overrides all user settings and the theme in use
+ */
+@import url("resource://css_shadows/reset.css");
 
 /* Set a very futuristic style by default */
-* {
+.demo * {
   color: green;
   font-family: Monospace;
   border: 1px solid;
 }
 
-window {
+window.demo {
   background-color: white;
 }
 
 /* Make sure selections are visible */
-selection {
+.demo selection {
   background-color: darkGreen;
   color: black;
 }

diff --git a/demos/gtk-demo/css_multiplebgs.c b/demos/gtk-demo/css_multiplebgs.c
index 0909c383d60fc1ba4b5dcea3d2b0a1e5011c404c..82aa550b64d15a99c1c9d3b2d569809cfddcce01 100644 (file)
--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -6,8 +6,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -50,33 +48,23 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1);
+  gtk_css_provider_load_from_string (provider, text);
   g_free (text);
 }
 
 static void
-drawing_area_draw (GtkDrawingArea *da,
-                   cairo_t        *cr,
-                   int             width,
-                   int             height,
-                   gpointer        data)
+clear_provider (gpointer data)
 {
-  GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (da));
+  GtkStyleProvider *provider = data;
 
-  gtk_render_background (context, cr, 0, 0, width, height);
-  gtk_render_frame (context, cr, 0, 0, width, height);
+  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
 }
 
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
 }
 
 GtkWidget *
@@ -95,16 +83,17 @@ do_css_multiplebgs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
+      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       overlay = gtk_overlay_new ();
       gtk_window_set_child (GTK_WINDOW (window), overlay);
 
       child = gtk_drawing_area_new ();
+      /* Don't set a draw_func, since we are only interested in CSS drawing,
+       * which happens automatically.
+       */
       gtk_widget_set_name (child, "canvas");
-      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
-                                      drawing_area_draw,
-                                      NULL, NULL);
       gtk_overlay_set_child (GTK_OVERLAY (overlay), child);
 
       child = gtk_button_new ();

diff --git a/demos/gtk-demo/css_pixbufs.c b/demos/gtk-demo/css_pixbufs.c
index df96c2cf22b05c463d1b82b16335850261377224..735634c8437c7d645725f3c4725c0e0b3a9f6879 100644 (file)
--- a/demos/gtk-demo/css_pixbufs.c
+++ b/demos/gtk-demo/css_pixbufs.c
@@ -7,8 +7,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -51,20 +49,23 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1);
+  gtk_css_provider_load_from_string (provider, text);
   g_free (text);
 }
 
 static void
-apply_css (GtkWidget *widget, GtkStyleProvider *provider)
+clear_provider (gpointer data)
 {
-  GtkWidget *child;
+  GtkStyleProvider *provider = data;
+
+  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
+}
 
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+static void
+apply_css (GtkWidget *widget, GtkStyleProvider *provider)
+{
+  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
 }
 
 GtkWidget *
@@ -83,6 +84,7 @@ do_css_pixbufs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
+      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);

diff --git a/demos/gtk-demo/css_pixbufs.css b/demos/gtk-demo/css_pixbufs.css
index e8f193d0d89ab851446dc7c7cca844ee6f50b78d..8fa4bf1a38f6b3497bf8cb635095aec57bde4df2 100644 (file)
--- a/demos/gtk-demo/css_pixbufs.css
+++ b/demos/gtk-demo/css_pixbufs.css
@@ -50,7 +50,7 @@
     100% { background-size: 12px, 96px, 12px, 96px, 12px, 96px, 12px, 96px, auto; }
 }
 
-window {
+window.demo {
     background-image: url("resource://css_pixbufs/images/apple-red.png"),
                       url("resource://css_pixbufs/images/gnome-applets.png"),
                       url("resource://css_pixbufs/images/gnome-calendar.png"),
@@ -66,11 +66,11 @@ window {
 }
 
 /* Make the text editor has a nice style */
-.view, scrollbar, separator {
+window.demo .view, scrollbar, separator {
   color: black;
   background-color: rgba(255,255,255,0.5);
 }
 
-.view:selected {
+window.demo .view:selected {
   background-color: rgba(127,127,255,0.5);
 }

diff --git a/demos/gtk-demo/css_shadows.c b/demos/gtk-demo/css_shadows.c
index 39628d2801476c7b47edc09d204f52968cd297b1..0abd48f74212325c648ad6091513cabac9bc5e23 100644 (file)
--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -5,8 +5,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -48,20 +46,23 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1);
+  gtk_css_provider_load_from_string (provider, text);
   g_free (text);
 }
 
 static void
-apply_css (GtkWidget *widget, GtkStyleProvider *provider)
+clear_provider (gpointer data)
 {
-  GtkWidget *child;
+  GtkStyleProvider *provider = data;
+
+  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
+}
 
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+static void
+apply_css (GtkWidget *widget, GtkStyleProvider *provider)
+{
+  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
 }
 
 static GtkWidget *
@@ -101,6 +102,7 @@ do_css_shadows (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Shadows");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
+      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -142,7 +144,7 @@ do_css_shadows (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

diff --git a/demos/gtk-demo/css_shadows.css b/demos/gtk-demo/css_shadows.css
index ca7a0416c25a56201744483ec05c6df1a7db49a7..37edcf65d1c1b51dfe3c023b478d47cc42c1ceee 100644 (file)
--- a/demos/gtk-demo/css_shadows.css
+++ b/demos/gtk-demo/css_shadows.css
@@ -5,12 +5,13 @@
  */
 
 /* This CSS resets all properties to their defaults values
- *    and overrides all user settings and the theme in use */
+ * and overrides all user settings and the theme in use
+ */
 @import url("resource://css_shadows/reset.css");
 @import url("resource://css_shadows/cssview.css");
 
 /* Get a nice background for the window */
-.background {
+window.demo.background {
   background-color: #4870bc;
   background-image: linear-gradient(to left, transparent, rgba(255,255,255,.07) 50%, transparent 50%),
                     linear-gradient(to left, transparent, rgba(255,255,255,.13) 50%, transparent 50%),
@@ -19,7 +20,7 @@
   background-size: 29px, 59px, 73px, 109px;
 }
 
-button {
+window.demo button {
   color: black;
   padding: 10px;
   border-radius: 5px;
@@ -27,18 +28,15 @@ button {
   border: 1px transparent solid;
 }
 
-button:hover {
+window.demo button:hover {
   text-shadow: 3px 3px 5px alpha(black, 0.75);
   -gtk-icon-shadow: 3px 3px 5px alpha(black, 0.75);
   box-shadow: 3px 3px 5px alpha(black, 0.5) inset;
   border: solid 1px alpha(black, 0.75);
 }
 
-button:active {
+window.demo button:active {
   padding: 11px 9px 9px 11px;
   text-shadow: 1px 1px 2.5px alpha(black, 0.6);
   -gtk-icon-shadow: 1px 1px 2.5px alpha(black, 0.6);
 }
-
-
-

diff --git a/demos/gtk-demo/cssview.css b/demos/gtk-demo/cssview.css
index c4fe5eeb5ac66261db9f60a0ba8e5e79a40dfa79..33cf9a69b7505f7866c0119718b6615f64b5a6a3 100644 (file)
--- a/demos/gtk-demo/cssview.css
+++ b/demos/gtk-demo/cssview.css
@@ -1,21 +1,21 @@
 /* Make the text editor has a nice style */
-.view {
+window.demo .view {
   color: #2e3436;
   font-family: Monospace;
   background-color: alpha(white, 0.30);
 }
 
-.view:selected {
+window.demo .view:selected {
   color: white;
   background-color: #4a90d9;
 }
 
-scrollbar trough,
+window.demo scrollbar trough,
 .scrollbars-junction {
   background-color: alpha(white, 0.80);
 }
 
-scrollbar slider {
+window.demo scrollbar slider {
   border-width: 3px;
   border-style: solid;
   border-radius: 10px;
@@ -24,11 +24,11 @@ scrollbar slider {
   background-color: #999;
 }
 
-scrollbar slider:hover {
+window.demo scrollbar slider:hover {
   background-color: #555;
 }
 
-paned separator {
+window.demo paned separator {
   background-color: alpha(white, 0.80);
   background-image: linear-gradient(transparent, transparent 1px, #999 1px, #999 4px, transparent 4px);
   background-size: 40px auto;
@@ -36,6 +36,6 @@ paned separator {
   background-position: center;
 }
 
-paned separator:hover {
+window.demo paned separator:hover {
   background-image: linear-gradient(transparent, transparent 1px, #555 1px, #555 4px, transparent 4px);
 }

diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui
index d268f7fe1e285d4aa56519cca8338211c4c7d580..5d7d8d1122bd56648fc16ac0b94ee7cadda7accc 100644 (file)
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -208,7 +208,13 @@
           </object>
         </child>
         <child>
-          <object class="GtkStatusbar" id="statusbar1"/>
+          <object class="GtkLabel" id="statusbar1">
+            <property name="xalign">0</property>
+            <property name="margin-start">2</property>
+            <property name="margin-end">2</property>
+            <property name="margin-top">2</property>
+            <property name="margin-bottom">2</property>
+          </object>
         </child>
       </object>
     </child>

diff --git a/demos/gtk-demo/dnd.c b/demos/gtk-demo/dnd.c
index 91ffd7f925e9fdcd86f8a698ee1c94f568eadbda..747f5f3bb92631cb1670221b9bf65e7820cffc50 100644 (file)
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -760,9 +760,7 @@ do_dnd (GtkWidget *do_widget)
       GtkCssProvider *provider;
       GString *css;
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      button = gtk_color_button_new ();
-G_GNUC_END_IGNORE_DEPRECATIONS
+      button = gtk_color_dialog_button_new (gtk_color_dialog_new ());
       g_object_unref (g_object_ref_sink (button));
 
       provider = gtk_css_provider_new ();

diff --git a/demos/gtk-demo/expander.c b/demos/gtk-demo/expander.c
index e350cb77c9fdd54b6a1875ba28f9282169a21dda..c374175c27f56fb7fd43bc9b02990cc8eb576b2c 100644 (file)
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -10,8 +10,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *window = NULL;
 
 static void
@@ -45,21 +43,22 @@ do_expander (GtkWidget *do_widget)
   if (!window)
     {
       toplevel = GTK_WIDGET (gtk_widget_get_root (do_widget));
-      window = gtk_message_dialog_new_with_markup (GTK_WINDOW (toplevel),
-                                                   0,
-                                                   GTK_MESSAGE_ERROR,
-                                                   GTK_BUTTONS_CLOSE,
-                                                   "<big><b>%s</b></big>",
-                                                   "Something went wrong");
-      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (window),
-                                                "Here are some more details "
-                                                "but not the full story.");
-
-      area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
-
-      label = gtk_widget_get_last_child (area);
+      window = gtk_window_new ();
+      gtk_window_set_title (GTK_WINDOW (window), "Expander");
+      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (toplevel));
+      area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+      gtk_widget_set_margin_start (area, 10);
+      gtk_widget_set_margin_end (area, 10);
+      gtk_widget_set_margin_top (area, 10);
+      gtk_widget_set_margin_bottom (area, 10);
+      gtk_window_set_child (GTK_WINDOW (window), area);
+      label = gtk_label_new ("<big><b>Something went wrong</b></big>");
+      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+      gtk_box_append (GTK_BOX (area), label);
+      label = gtk_label_new ("Here are some more details but not the full story");
       gtk_label_set_wrap (GTK_LABEL (label), FALSE);
       gtk_widget_set_vexpand (label, FALSE);
+      gtk_box_append (GTK_BOX (area), label);
 
       expander = gtk_expander_new ("Details:");
       gtk_widget_set_vexpand (expander, TRUE);
@@ -122,7 +121,7 @@ do_expander (GtkWidget *do_widget)
   }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

diff --git a/demos/gtk-demo/fishbowl.c b/demos/gtk-demo/fishbowl.c
index 85ced9752e90a3b09510ea6f0586c51637bc3f34..a5d58787c1b0aff1921ccbedf26095868c5cfa4d 100644 (file)
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -68,13 +68,18 @@ create_blurred_button (void)
   return w;
 }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static GtkWidget *
 create_font_button (void)
 {
-  return gtk_font_button_new ();
+  GtkFontDialog *dialog;
+  GtkWidget *button;
+
+  dialog = gtk_font_dialog_new ();
+  button = gtk_font_dialog_button_new (dialog);
+  g_object_unref (dialog);
+
+  return button;
 }
-G_GNUC_END_IGNORE_DEPRECATIONS
 
 static GtkWidget *
 create_level_bar (void)

diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index f586a0771499c3fc87ee56747c1f4e039dbf9e38..1a77d9108c58c273a26198bcad47f15f38f6b514 100644 (file)
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -150,8 +150,6 @@ if librsvg_dep.found()
   gtkdemo_deps += [ librsvg_dep ]
 endif
 
-gtkdemo_args = [ '-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED', ]
-
 demos_h = custom_target('gtk4 demo header',
   output: 'demos.h',
   input: demos,
@@ -235,7 +233,7 @@ gtkdemo_deps += [ demo_conf_h ]
 
 executable('gtk4-demo',
   sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],
-  c_args: gtkdemo_args + demo_cflags,
+  c_args: demo_cflags,
   dependencies: gtkdemo_deps,
   include_directories: confinc,
   win_subsystem: 'windows',
@@ -245,7 +243,7 @@ executable('gtk4-demo',
 
 executable('gtk4-demo-application',
   sources: ['application.c', gtkdemo_resources],
-  c_args: gtkdemo_args + common_cflags,
+  c_args: common_cflags,
   dependencies: gtkdemo_deps,
   include_directories: confinc,
   win_subsystem: 'windows',

diff --git a/demos/gtk-demo/paint.c b/demos/gtk-demo/paint.c
index 5c641b848cce1594098fc92e9199129c144c3260..ee37fe222a95f2f3f4838b7bb0a0206d4688a2d7 100644 (file)
--- a/demos/gtk-demo/paint.c
+++ b/demos/gtk-demo/paint.c
@@ -7,8 +7,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 enum {
   COLOR_SET,
   N_SIGNALS
@@ -124,19 +122,16 @@ drawing_area_unmap (GtkWidget *widget)
 
 static void
 drawing_area_snapshot (GtkWidget   *widget,
-                      GtkSnapshot *snapshot)
+                       GtkSnapshot *snapshot)
 {
   DrawingArea *area = (DrawingArea *) widget;
-  GtkAllocation allocation;
+  int width, height;
   cairo_t *cr;
 
-  gtk_widget_get_allocation (widget, &allocation);
-  cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT (
-                                    0, 0,
-                                   allocation.width,
-                                   allocation.height
-                                  ));
+  width = gtk_widget_get_width (widget);
+  height = gtk_widget_get_height (widget);
+
+  cr = gtk_snapshot_append_cairo (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
 
   cairo_set_source_rgb (cr, 1, 1, 1);
   cairo_paint (cr);
@@ -145,7 +140,7 @@ drawing_area_snapshot (GtkWidget   *widget,
   cairo_paint (cr);
 
   cairo_set_source_rgb (cr, 0.6, 0.6, 0.6);
-  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
+  cairo_rectangle (cr, 0, 0, width, height);
   cairo_stroke (cr);
 
   cairo_destroy (cr);

diff --git a/demos/gtk-demo/reset.css b/demos/gtk-demo/reset.css
index 7af3e7f28f89338443739e2b63cdd950eeb05415..edcafca8d38edefd7aae41c710e4c3b5fcb5faca 100644 (file)
--- a/demos/gtk-demo/reset.css
+++ b/demos/gtk-demo/reset.css
@@ -6,6 +6,6 @@
  * Also, when adding new style properties, please add them here.
  */
 
-* {
+window.demo * {
   all: unset;
 }

diff --git a/demos/gtk-demo/spinner.c b/demos/gtk-demo/spinner.c
index d278587ac993e2886a0b468b80396f9631771596..77722590ddb857eccdff43e80f12f67dc049b472 100644 (file)
--- a/demos/gtk-demo/spinner.c
+++ b/demos/gtk-demo/spinner.c
@@ -27,7 +27,6 @@ GtkWidget *
 do_spinner (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
-  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *hbox;
   GtkWidget *button;
@@ -35,28 +34,19 @@ do_spinner (GtkWidget *do_widget)
 
   if (!window)
   {
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-    window = gtk_dialog_new_with_buttons ("Spinner",
-                                          GTK_WINDOW (do_widget),
-                                          0,
-                                          _("_Close"),
-                                          GTK_RESPONSE_NONE,
-                                          NULL);
+    window = gtk_window_new ();
+    gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
+    gtk_window_set_title (GTK_WINDOW (window), "Spinner");
     gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-    g_signal_connect (window, "response",
-                      G_CALLBACK (gtk_window_destroy), NULL);
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-    gtk_widget_set_margin_start (vbox, 5);
-    gtk_widget_set_margin_end (vbox, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
     gtk_widget_set_margin_top (vbox, 5);
     gtk_widget_set_margin_bottom (vbox, 5);
-    gtk_box_append (GTK_BOX (content_area), vbox);
+    gtk_widget_set_margin_start (vbox, 5);
+    gtk_widget_set_margin_end (vbox, 5);
+
+    gtk_window_set_child (GTK_WINDOW (window), vbox);
 
     /* Sensitive */
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);