GNOME.org
 

[gtk/wip/baedert/test-cflags] demos/gtk-demo: Add common_cflags to build

commit 66b267bafd2d15d820c9fac33e38f76295785845
Author: Timm Bäder <mail baedert org>
Date:   Sat Mar 7 15:01:21 2020 +0100

    demos/gtk-demo: Add common_cflags to build
    
    With a few exceptions.

 demos/gtk-demo/application.c      |  2 ++
 demos/gtk-demo/assistant.c        |  9 +++++----
 demos/gtk-demo/clipboard.c        |  9 ++++++---
 demos/gtk-demo/colorsel.c         |  2 +-
 demos/gtk-demo/combobox.c         | 11 ++++++-----
 demos/gtk-demo/css_blendmodes.c   |  4 ++--
 demos/gtk-demo/css_shadows.c      |  2 +-
 demos/gtk-demo/dnd.c              |  2 +-
 demos/gtk-demo/editable_cells.c   |  3 +++
 demos/gtk-demo/entry_completion.c |  2 +-
 demos/gtk-demo/fishbowl.c         |  1 +
 demos/gtk-demo/font_features.c    | 36 ++++++++++++++++++------------------
 demos/gtk-demo/fontrendering.c    |  2 +-
 demos/gtk-demo/geninclude.py      |  6 +++---
 demos/gtk-demo/glarea.c           |  2 +-
 demos/gtk-demo/hypertext.c        |  2 +-
 demos/gtk-demo/list_store.c       | 32 +++++++++++++++-----------------
 demos/gtk-demo/main.c             | 27 +++++++++++++++------------
 demos/gtk-demo/meson.build        | 13 +++++++++++--
 demos/gtk-demo/paint.c            |  3 ++-
 demos/gtk-demo/panes.c            |  6 +++---
 demos/gtk-demo/rotated_text.c     | 33 +++++++++++++++------------------
 demos/gtk-demo/search_entry.c     |  4 ++--
 demos/gtk-demo/sliding_puzzle.c   | 10 +++++-----
 demos/gtk-demo/spinbutton.c       |  2 +-
 demos/gtk-demo/video_player.c     |  4 ++--
 26 files changed, 124 insertions(+), 105 deletions(-)
---
diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c
index d556e6d3ca..fbd180d927 100644
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -6,6 +6,7 @@
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 
+static GType demo_application_get_type (void);
 G_DEFINE_TYPE (DemoApplication, demo_application, GTK_TYPE_APPLICATION)
 
 typedef struct {
@@ -25,6 +26,7 @@ typedef struct {
 } DemoApplicationWindow;
 typedef GtkApplicationWindowClass DemoApplicationWindowClass;
 
+static GType demo_application_window_get_type (void);
 G_DEFINE_TYPE (DemoApplicationWindow, demo_application_window, GTK_TYPE_APPLICATION_WINDOW)
 
 static void create_window (GApplication *app, const char *contents);
diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c
index 7cd77c2c33..4c878afeb2 100644
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -7,7 +7,7 @@
 
 #include <gtk/gtk.h>
 
-static GtkWidget *assistant = NULL;
+/*static GtkWidget *assistant = NULL;*/
 static GtkWidget *progress_bar = NULL;
 
 static gboolean
@@ -27,8 +27,7 @@ apply_changes_gradually (gpointer data)
   else
     {
       /* Close automatically once changes are fully applied. */
-      gtk_widget_destroy (assistant);
-      assistant = NULL;
+      gtk_widget_destroy (data);
       return G_SOURCE_REMOVE;
     }
 }
@@ -37,7 +36,7 @@ static void
 on_assistant_apply (GtkWidget *widget, gpointer data)
 {
   /* Start a timer to simulate changes taking a few seconds to apply. */
-  g_timeout_add (100, apply_changes_gradually, NULL);
+  g_timeout_add (100, apply_changes_gradually, widget);
 }
 
 static void
@@ -173,6 +172,8 @@ create_page4 (GtkWidget *assistant)
 GtkWidget*
 do_assistant (GtkWidget *do_widget)
 {
+  static GtkWidget *assistant;
+
   if (!assistant)
     {
       assistant = gtk_assistant_new ();
diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index 1871e4a506..8fc6bb7cf5 100644
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -15,7 +15,7 @@
 
 static GtkWidget *window = NULL;
 
-void
+static void
 copy_button_clicked (GtkWidget *button,
                      gpointer   user_data)
 {
@@ -31,7 +31,7 @@ copy_button_clicked (GtkWidget *button,
   gdk_clipboard_set_text (clipboard, gtk_editable_get_text (GTK_EDITABLE (entry)));
 }
 
-void
+static void
 paste_received (GObject      *source_object,
                 GAsyncResult *result,
                 gpointer      user_data)
@@ -75,7 +75,7 @@ paste_received (GObject      *source_object,
     }
 }
 
-void
+static void
 paste_button_clicked (GtkWidget *button,
                       gpointer   user_data)
 {
@@ -116,6 +116,9 @@ get_image_paintable (GtkImage *image)
       if (icon == NULL)
         return NULL;
       return GDK_PAINTABLE (icon);
+
+    case GTK_IMAGE_EMPTY:
+    case GTK_IMAGE_GICON:
     default:
       g_warning ("Image storage type %d not handled",
                  gtk_image_get_storage_type (image));
diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c
index 5cab8bde9e..465cda3c4e 100644
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -16,7 +16,7 @@ static GtkWidget *frame;
 /* draw callback for the drawing area
  */
 static void
-draw_function (GtkDrawingArea *da,
+draw_function (GtkDrawingArea *drawing_area,
                cairo_t        *cr,
                int             width,
                int             height,
diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c
index 01ec143329..47d61f079f 100644
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -19,7 +19,7 @@ enum
 static GtkTreeModel *
 create_icon_store (void)
 {
-  const gchar *icon_names[6] = {
+  const char *icon_names[6] = {
     "dialog-warning",
     "process-stop",
     "document-new",
@@ -27,7 +27,7 @@ create_icon_store (void)
     NULL,
     "document-open"
   };
-  const gchar *labels[6] = {
+  const char *labels[6] = {
     N_("Warning"),
     N_("Stop"),
     N_("New"),
@@ -111,8 +111,8 @@ static GtkTreeModel *
 create_capital_store (void)
 {
   struct {
-    gchar *group;
-    gchar *capital;
+    const char *group;
+    const char *capital;
   } capitals[] = {
     { "A - B", NULL },
     { NULL, "Albany" },
@@ -234,7 +234,7 @@ typedef struct _MaskEntry MaskEntry;
 struct _MaskEntry
 {
   GtkEntry entry;
-  gchar *mask;
+  const char *mask;
 };
 
 typedef struct _MaskEntryClass MaskEntryClass;
@@ -246,6 +246,7 @@ struct _MaskEntryClass
 
 static void mask_entry_editable_init (GtkEditableInterface *iface);
 
+static GType mask_entry_get_type (void);
 G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
                                                 mask_entry_editable_init));
diff --git a/demos/gtk-demo/css_blendmodes.c b/demos/gtk-demo/css_blendmodes.c
index f93f0336f8..86fc0ecc91 100644
--- a/demos/gtk-demo/css_blendmodes.c
+++ b/demos/gtk-demo/css_blendmodes.c
@@ -11,8 +11,8 @@
  * These are the available blend modes.
  */
 struct {
-  gchar *name;
-  gchar *id;
+  const char *name;
+  const char *id;
 } blend_modes[] =
 {
   { "Color", "color" },
diff --git a/demos/gtk-demo/css_shadows.c b/demos/gtk-demo/css_shadows.c
index 2c6a640ad3..6457d43efa 100644
--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -58,7 +58,7 @@ apply_css (GtkWidget *widget, GtkStyleProvider *provider)
     gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }
 
-GtkWidget *
+static GtkWidget *
 create_toolbar (void)
 {
   GtkWidget *toolbar;
diff --git a/demos/gtk-demo/dnd.c b/demos/gtk-demo/dnd.c
index 9755bcd6dd..c5b52203f3 100644
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -42,7 +42,7 @@ free_demo_widget (gpointer data)
 }
 
 #define GTK_TYPE_DEMO_WIDGET (gtk_demo_widget_get_type ())
-
+static GType gtk_demo_widget_get_type (void);
 G_DEFINE_BOXED_TYPE (GtkDemoWidget, gtk_demo_widget, copy_demo_widget, free_demo_widget)
 
 static GtkDemoWidget *
diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c
index 6987165951..8491ccf419 100644
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -275,6 +275,9 @@ cell_edited (GtkCellRendererText *cell,
                             g_array_index (articles, Item, i).product, -1);
       }
       break;
+
+    default:
+      g_assert_not_reached ();
     }
 
   gtk_tree_path_free (path);
diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c
index 12549f86da..9cd193b2f8 100644
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -9,7 +9,7 @@
 #include <gtk/gtk.h>
 
 /* Creates a tree model containing the completions */
-GtkTreeModel *
+static GtkTreeModel *
 create_completion_model (void)
 {
   GtkListStore *store;
diff --git a/demos/gtk-demo/fishbowl.c b/demos/gtk-demo/fishbowl.c
index 81a78b74b4..a9585107f5 100644
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -37,6 +37,7 @@ get_random_icon_name (GtkIconTheme *theme)
   return icon_names[g_random_int_range(0, n_icon_names)];
 }
 
+/* Can't be static because it's also used in iconscroll.c */
 GtkWidget *
 create_icon (void)
 {
diff --git a/demos/gtk-demo/font_features.c b/demos/gtk-demo/font_features.c
index ad0e30e95c..f009da03f1 100644
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -25,14 +25,14 @@
 
 #define MAKE_TAG(a,b,c,d) (unsigned int)(((a) << 24) | ((b) << 16) | ((c) <<  8) | (d))
 
-static GtkWidget *label;
+static GtkWidget *the_label;
 static GtkWidget *settings;
 static GtkWidget *description;
 static GtkWidget *font;
 static GtkWidget *script_lang;
 static GtkWidget *resetbutton;
 static GtkWidget *stack;
-static GtkWidget *entry;
+static GtkWidget *the_entry;
 static GtkWidget *variations_heading;
 static GtkWidget *variations_grid;
 static GtkWidget *instance_combo;
@@ -301,9 +301,9 @@ update_display (void)
   char *font_desc;
   char *features;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_editable_get_text (GTK_EDITABLE (the_entry));
 
-  if (gtk_label_get_selection_bounds (GTK_LABEL (label), &ins, &bound))
+  if (gtk_label_get_selection_bounds (GTK_LABEL (the_label), &ins, &bound))
     {
       start = g_utf8_offset_to_pointer (text, ins) - text;
       end = g_utf8_offset_to_pointer (text, bound) - text;
@@ -409,8 +409,8 @@ 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 (GTK_LABEL (the_label), text);
+  gtk_label_set_attributes (GTK_LABEL (the_label), attrs);
 
   g_free (font_desc);
   pango_font_description_free (desc);
@@ -548,7 +548,7 @@ update_script_combo (void)
     {
       const char *langname;
       char langbuf[5];
-      GtkTreeIter iter;
+      GtkTreeIter tree_iter;
 
       if (pair->lang_tag == HB_OT_TAG_DEFAULT_LANGUAGE)
         langname = NC_("Language", "Default");
@@ -563,7 +563,7 @@ update_script_combo (void)
             }
         }
 
-      gtk_list_store_insert_with_values (store, &iter, -1,
+      gtk_list_store_insert_with_values (store, &tree_iter, -1,
                                          0, langname,
                                          1, pair->script_index,
                                          2, pair->lang_index,
@@ -572,7 +572,7 @@ update_script_combo (void)
       if (pair->lang_tag == active)
         {
           have_active = TRUE;
-          active_iter = iter;
+          active_iter = tree_iter;
         }
     }
 
@@ -751,7 +751,7 @@ add_font_variations (GString *s)
   GHashTableIter iter;
   Axis *axis;
   char buf[G_ASCII_DTOSTR_BUF_SIZE];
-  char *sep = "";
+  const char *sep = "";
 
   g_hash_table_iter_init (&iter, axes);
   while (g_hash_table_iter_next (&iter, (gpointer *)NULL, (gpointer *)&axis))
@@ -1129,7 +1129,7 @@ font_features_reset_features (void)
 {
   GList *l;
 
-  gtk_label_select_region (GTK_LABEL (label), 0, 0);
+  gtk_label_select_region (GTK_LABEL (the_label), 0, 0);
 
   g_list_free_full (ranges, free_range);
   ranges = NULL;
@@ -1156,9 +1156,9 @@ static char *text;
 static void
 switch_to_entry (void)
 {
-  text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (entry)));
+  text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (the_entry)));
   gtk_stack_set_visible_child_name (GTK_STACK (stack), "entry");
-  gtk_widget_grab_focus (entry);
+  gtk_widget_grab_focus (the_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"));
+      the_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"));
       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"));
+      the_entry = GTK_WIDGET (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);
+      g_object_set_data_full (G_OBJECT (the_entry), "controller", g_object_ref (controller), g_object_unref);
+      g_signal_connect (controller, "key-pressed", G_CALLBACK (entry_key_press), the_entry);
+      gtk_widget_add_controller (the_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 463fac3c72..b10b7929a5 100644
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -43,7 +43,6 @@ update_image (void)
   cairo_font_options_t *fopt;
   cairo_hint_style_t hintstyle;
   cairo_hint_metrics_t hintmetrics;
-  int i;
 
   if (!context)
     context = gtk_widget_create_pango_context (image);
@@ -116,6 +115,7 @@ update_image (void)
 
       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (show_grid)))
         {
+          int i;
           cairo_set_source_rgba (cr, 0.2, 0, 0, 0.2);
           for (i = 1; i < ink.height + 20; i++)
             {
diff --git a/demos/gtk-demo/geninclude.py b/demos/gtk-demo/geninclude.py
index cd0af14e0d..af48187294 100755
--- a/demos/gtk-demo/geninclude.py
+++ b/demos/gtk-demo/geninclude.py
@@ -17,9 +17,9 @@ typedef struct _Demo Demo;
 
 struct _Demo
 {
-  gchar *name;
-  gchar *title;
-  gchar *filename;
+  const char *name;
+  const char *title;
+  const char *filename;
   GDoDemoFunc func;
   Demo *children;
 };
diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c
index a76e17d628..653900d057 100644
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -383,7 +383,7 @@ close_window (GtkWidget *widget)
   rotation_angles[Z_AXIS] = 0.0;
 }
 
-GtkWidget *
+static GtkWidget *
 create_glarea_window (GtkWidget *do_widget)
 {
   GtkWidget *window, *box, *button, *controls;
diff --git a/demos/gtk-demo/hypertext.c b/demos/gtk-demo/hypertext.c
index 6ced8931af..9958d9b21a 100644
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -17,7 +17,7 @@
 static void
 insert_link (GtkTextBuffer *buffer,
              GtkTextIter   *iter,
-             gchar         *text,
+             const char    *text,
              gint           page)
 {
   GtkTextTag *tag;
diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index 318fcad6f1..ffd964925b 100644
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -16,10 +16,9 @@ typedef struct
 {
   const gboolean  fixed;
   const guint     number;
-  const gchar    *severity;
-  const gchar    *description;
-}
-Bug;
+  const char     *severity;
+  const char     *description;
+} Bug;
 
 enum
 {
@@ -34,7 +33,7 @@ enum
   NUM_COLUMNS
 };
 
-static Bug data[] =
+static Bug bugs[] =
 {
   { FALSE, 60482, "Normal",     "scrollable notebooks and hidden tabs" },
   { FALSE, 60620, "Critical",   "gdk_surface_clear_area (gdksurface-win32.c) is not thread-safe" },
@@ -98,9 +97,9 @@ create_model (void)
                               G_TYPE_BOOLEAN);
 
   /* add data to the list store */
-  for (i = 0; i < G_N_ELEMENTS (data); i++)
+  for (i = 0; i < G_N_ELEMENTS (bugs); i++)
     {
-      gchar *icon_name;
+      const char *icon_name;
       gboolean sensitive;
 
       if (i == 1 || i == 3)
@@ -113,10 +112,10 @@ create_model (void)
         sensitive = TRUE;
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-                          COLUMN_FIXED, data[i].fixed,
-                          COLUMN_NUMBER, data[i].number,
-                          COLUMN_SEVERITY, data[i].severity,
-                          COLUMN_DESCRIPTION, data[i].description,
+                          COLUMN_FIXED, bugs[i].fixed,
+                          COLUMN_NUMBER, bugs[i].number,
+                          COLUMN_SEVERITY, bugs[i].severity,
+                          COLUMN_DESCRIPTION, bugs[i].description,
                           COLUMN_PULSE, 0,
                           COLUMN_ICON, icon_name,
                           COLUMN_ACTIVE, FALSE,
@@ -129,23 +128,23 @@ create_model (void)
 
 static void
 fixed_toggled (GtkCellRendererToggle *cell,
-               gchar                 *path_str,
+               char                  *path_str,
                gpointer               data)
 {
-  GtkTreeModel *model = (GtkTreeModel *)data;
+  GtkTreeModel *tree_model = (GtkTreeModel *)data;
   GtkTreeIter  iter;
   GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
   gboolean fixed;
 
   /* get toggled iter */
-  gtk_tree_model_get_iter (model, &iter, path);
-  gtk_tree_model_get (model, &iter, COLUMN_FIXED, &fixed, -1);
+  gtk_tree_model_get_iter (tree_model, &iter, path);
+  gtk_tree_model_get (tree_model, &iter, COLUMN_FIXED, &fixed, -1);
 
   /* do something with the value */
   fixed ^= 1;
 
   /* set new value */
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter, COLUMN_FIXED, fixed, -1);
+  gtk_list_store_set (GTK_LIST_STORE (tree_model), &iter, COLUMN_FIXED, fixed, -1);
 
   /* clean up */
   gtk_tree_path_free (path);
@@ -156,7 +155,6 @@ add_columns (GtkTreeView *treeview)
 {
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
 
   /* column for fixed toggles */
   renderer = gtk_cell_renderer_toggle_new ();
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 38288dc2b5..d9c8c7e9a6 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -205,14 +205,14 @@ enum {
   STATE_IN_COMMENT
 };
 
-static gchar *tokens[] =
+static const char *tokens[] =
 {
   "/*",
   "\"",
   NULL
 };
 
-static gchar *types[] =
+static const char *types[] =
 {
   "static",
   "const ",
@@ -337,7 +337,7 @@ static gchar *types[] =
   NULL
 };
 
-static gchar *control[] =
+static const char *control[] =
 {
   " if ",
   " while ",
@@ -351,11 +351,11 @@ static gchar *control[] =
   NULL
 };
 void
-parse_chars (gchar     *text,
-             gchar    **end_ptr,
-             gint      *state,
-             gchar    **tag,
-             gboolean   start)
+parse_chars (gchar       *text,
+             gchar      **end_ptr,
+             gint        *state,
+             const char **tag,
+             gboolean     start)
 {
   gint i;
   gchar *next_token;
@@ -494,7 +494,7 @@ fontify (GtkTextBuffer *source_buffer)
   gint state;
   gchar *text;
   gchar *start_ptr, *end_ptr;
-  gchar *tag;
+  const char *tag;
 
   gtk_text_buffer_create_tag (source_buffer, "source",
                               "font", "monospace",
@@ -868,7 +868,7 @@ load_file (const gchar *demoname,
 
           p = lines[i];
           state++;
-          /* Fall through */
+          G_GNUC_FALLTHROUGH;
 
         case 3:
           /* Reading program body */
@@ -876,6 +876,9 @@ load_file (const gchar *demoname,
           if (lines[i+1] != NULL)
             gtk_text_buffer_insert (source_buffer, &start, "\n", 1);
           break;
+
+        default:
+          g_assert_not_reached ();
         }
     }
 
@@ -975,10 +978,10 @@ startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *appmenu;
-  gchar *ids[] = { "appmenu", NULL };
+  const char *ids[] = { "appmenu", NULL };
 
   builder = gtk_builder_new ();
-  gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", ids, NULL);
+  gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", (char **)ids, NULL);
 
   appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
 
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 98bc765b3e..04d04b8bfd 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -112,9 +112,18 @@ gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
                                             'demo.gresource.xml',
                                             source_dir: '.')
 
+demo_cflags = []
+foreach flag: common_cflags
+  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
+    demo_cflags += flag
+  endif
+endforeach
+
+message(demo_cflags)
+
 executable('gtk4-demo',
            demos, demos_h, extra_demo_sources, gtkdemo_resources,
-           c_args: gtkdemo_args,
+           c_args: gtkdemo_args + demo_cflags,
            dependencies: gtkdemo_deps,
            include_directories: confinc,
            gui_app: true,
@@ -123,7 +132,7 @@ executable('gtk4-demo',
 
 executable('gtk4-demo-application',
            'application.c', gtkdemo_resources,
-           c_args: gtkdemo_args,
+           c_args: gtkdemo_args + common_cflags,
            dependencies: gtkdemo_deps,
            include_directories: confinc,
            gui_app: true,
diff --git a/demos/gtk-demo/paint.c b/demos/gtk-demo/paint.c
index fa56b15d30..6312575a5f 100644
--- a/demos/gtk-demo/paint.c
+++ b/demos/gtk-demo/paint.c
@@ -47,6 +47,7 @@ static const gchar *pad_colors[] = {
   "orange"
 };
 
+static GType drawing_area_get_type (void);
 G_DEFINE_TYPE (DrawingArea, drawing_area, GTK_TYPE_WIDGET)
 
 static void drawing_area_set_color (DrawingArea *area,
@@ -340,7 +341,7 @@ drawing_area_init (DrawingArea *area)
   area->draw_color = (GdkRGBA) { 0, 0, 0, 1 };
 }
 
-GtkWidget *
+static GtkWidget *
 drawing_area_new (void)
 {
   return g_object_new (drawing_area_get_type (), NULL);
diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index 1c4b577ac9..73fbbe790c 100644
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -13,7 +13,7 @@
 
 #include <gtk/gtk.h>
 
-void
+static void
 toggle_resize (GtkWidget *widget,
                GtkWidget *child)
 {
@@ -47,7 +47,7 @@ toggle_resize (GtkWidget *widget,
   g_object_unref (child);
 }
 
-void
+static void
 toggle_shrink (GtkWidget *widget,
                GtkWidget *child)
 {
@@ -81,7 +81,7 @@ toggle_shrink (GtkWidget *widget,
   g_object_unref (child);
 }
 
-GtkWidget *
+static GtkWidget *
 create_pane_options (GtkPaned    *paned,
                      const gchar *frame_label,
                      const gchar *label1,
diff --git a/demos/gtk-demo/rotated_text.c b/demos/gtk-demo/rotated_text.c
index 798fff44fd..5a88008471 100644
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -28,26 +28,23 @@ fancy_shape_renderer (cairo_t        *cr,
                (double) attr->ink_rect.width  / PANGO_SCALE,
                (double) attr->ink_rect.height / PANGO_SCALE);
 
-  switch (GPOINTER_TO_UINT (attr->data))
+  if (GPOINTER_TO_UINT (attr->data) == 0x2664) /* U+2665 BLACK HEART SUIT */
     {
-    case 0x2665: /* U+2665 BLACK HEART SUIT */
-      {
-        cairo_move_to (cr, .5, .0);
-        cairo_line_to (cr, .9, -.4);
-        cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
-        cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
-        cairo_close_path (cr);
-      }
-      break;
+      cairo_move_to (cr, .5, .0);
+      cairo_line_to (cr, .9, -.4);
+      cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
+      cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
+      cairo_close_path (cr);
     }
 
-  if (!do_path) {
-    cairo_set_source_rgb (cr, 1., 0., 0.);
-    cairo_fill (cr);
-  }
+  if (!do_path)
+    {
+      cairo_set_source_rgb (cr, 1., 0., 0.);
+      cairo_fill (cr);
+    }
 }
 
-PangoAttrList *
+static PangoAttrList *
 create_fancy_attr_list_for_layout (PangoLayout *layout)
 {
   PangoAttrList *attrs;
@@ -145,13 +142,13 @@ rotated_text_draw (GtkDrawingArea *da,
   /* Draw the layout N_WORDS times in a circle */
   for (i = 0; i < N_WORDS; i++)
     {
-      int width, height;
+      int layout_width, layout_height;
 
       /* Inform Pango to re-layout the text with the new transformation matrix */
       pango_cairo_update_layout (cr, layout);
 
-      pango_layout_get_pixel_size (layout, &width, &height);
-      cairo_move_to (cr, - width / 2, - RADIUS * .9);
+      pango_layout_get_pixel_size (layout, &layout_width, &layout_height);
+      cairo_move_to (cr, - layout_width / 2, - RADIUS * .9);
       pango_cairo_show_layout (cr, layout);
 
       /* Rotate for the next turn */
diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c
index 25154e40d1..71fb5949fc 100644
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -185,13 +185,13 @@ text_changed (GObject *object,
               gpointer data)
 {
   GtkEntry *entry = GTK_ENTRY (object);
-  GActionMap *actions = data;
+  GActionMap *action_map = data;
   GAction *action;
   gboolean has_text;
 
   has_text = gtk_entry_get_text_length (entry) > 0;
 
-  action = g_action_map_lookup_action (actions, "clear");
+  action = g_action_map_lookup_action (action_map, "clear");
   g_simple_action_set_enabled (G_SIMPLE_ACTION (action), has_text);
 }
 
diff --git a/demos/gtk-demo/sliding_puzzle.c b/demos/gtk-demo/sliding_puzzle.c
index 2f8067851b..0abb5c9f6e 100644
--- a/demos/gtk-demo/sliding_puzzle.c
+++ b/demos/gtk-demo/sliding_puzzle.c
@@ -277,7 +277,7 @@ puzzle_button_pressed (GtkGestureClick *gesture,
 }
 
 static void
-start_puzzle (GdkPaintable *puzzle)
+start_puzzle (GdkPaintable *paintable)
 {
   GtkWidget *picture, *grid;
   GtkEventController *controller;
@@ -293,7 +293,7 @@ start_puzzle (GdkPaintable *puzzle)
   grid = gtk_grid_new ();
   gtk_widget_set_can_focus (grid, TRUE);
   gtk_container_add (GTK_CONTAINER (frame), grid);
-  aspect_ratio = gdk_paintable_get_intrinsic_aspect_ratio (puzzle);
+  aspect_ratio = gdk_paintable_get_intrinsic_aspect_ratio (paintable);
   if (aspect_ratio == 0.0)
     aspect_ratio = 1.0;
   gtk_aspect_frame_set (GTK_ASPECT_FRAME (frame), 0.5, 0.5, aspect_ratio, FALSE);
@@ -332,7 +332,7 @@ start_puzzle (GdkPaintable *puzzle)
           if (x == pos_x && y == pos_y)
             piece = NULL;
           else
-            piece = gtk_puzzle_piece_new (puzzle,
+            piece = gtk_puzzle_piece_new (paintable,
                                           x, y,
                                           width, height);
           picture = gtk_picture_new_for_paintable (piece);
@@ -390,7 +390,7 @@ reconfigure (void)
 }
 
 static void
-add_choice (GtkWidget    *choices,
+add_choice (GtkWidget    *container,
             GdkPaintable *paintable)
 {
   GtkWidget *icon;
@@ -398,7 +398,7 @@ add_choice (GtkWidget    *choices,
   icon = gtk_image_new_from_paintable (paintable);
   gtk_image_set_icon_size (GTK_IMAGE (icon), GTK_ICON_SIZE_LARGE);
 
-  gtk_container_add (GTK_CONTAINER (choices), icon);
+  gtk_container_add (GTK_CONTAINER (container), icon);
 }
 
 GtkWidget *
diff --git a/demos/gtk-demo/spinbutton.c b/demos/gtk-demo/spinbutton.c
index 43ecd9164b..3f4a0c91c8 100644
--- a/demos/gtk-demo/spinbutton.c
+++ b/demos/gtk-demo/spinbutton.c
@@ -106,7 +106,7 @@ spinbutton_time_spin_output (GtkSpinButton *spin_button)
   return TRUE;
 }
 
-static gchar *month[12] = {
+static const char *month[12] = {
   "January",
   "February",
   "March",
diff --git a/demos/gtk-demo/video_player.c b/demos/gtk-demo/video_player.c
index 4b9e0622fc..e06ad2fbb3 100644
--- a/demos/gtk-demo/video_player.c
+++ b/demos/gtk-demo/video_player.c
@@ -48,9 +48,9 @@ static void
 fullscreen_clicked_cb (GtkWidget *button,
                        gpointer   unused)
 {
-  GtkWidget *window = GTK_WIDGET (gtk_widget_get_root (button));
+  GtkWidget *widget_window = GTK_WIDGET (gtk_widget_get_root (button));
 
-  gtk_window_fullscreen (GTK_WINDOW (window));
+  gtk_window_fullscreen (GTK_WINDOW (widget_window));
 }
 
 GtkWidget *
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]