[gtk/master.struct.msvc] gtk/gtkaccelgroup.c: Fix build on Visual Studio



commit ef0e89e792c7344ee8a4678c270582d33af1e9d7
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Apr 29 00:07:27 2020 +0800

    gtk/gtkaccelgroup.c: Fix build on Visual Studio
    
    Visual Studio does not allow one to initialize structure members with
    non-constant expressions, caused by using strlen(), so fix this by
    using sizeof() instead.

 gtk/gtkaccelgroup.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index a941b6055c..dad984de0b 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -579,12 +579,12 @@ gtk_accelerator_name (guint           accelerator_key,
     const char *text;
     gsize text_len;
   } mask_text[] = {
-    { GDK_SHIFT_MASK,   "<Shift>",   strlen ("<Shift>") },
-    { GDK_CONTROL_MASK, "<Control>", strlen ("<Control>") },
-    { GDK_ALT_MASK,     "<Alt>",     strlen ("<Alt>") },
-    { GDK_META_MASK,    "<Meta>",    strlen ("<Meta>") },
-    { GDK_SUPER_MASK,   "<Super>",   strlen ("<Super>") },
-    { GDK_HYPER_MASK,   "<Hyper>",   strlen ("<Hyper>") }
+    { GDK_SHIFT_MASK,   "<Shift>",   sizeof ("<Shift>") },
+    { GDK_CONTROL_MASK, "<Control>", sizeof ("<Control>") },
+    { GDK_ALT_MASK,     "<Alt>",     sizeof ("<Alt>") },
+    { GDK_META_MASK,    "<Meta>",    sizeof ("<Meta>") },
+    { GDK_SUPER_MASK,   "<Super>",   sizeof ("<Super>") },
+    { GDK_HYPER_MASK,   "<Hyper>",   sizeof ("<Hyper>") }
   };
   GdkModifierType saved_mods;
   guint l;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]