- suppress CygWin warnings (Vivian Meazza)

diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 22924c350d1f1d044c27b1324f4738011605f8db..5f415f065bfca57deb205bd719f0977687e253cc 100644 (file)
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -683,12 +683,12 @@ FGDialog::setColor(puObject * object, SGPropertyNode * props, int which)
         const char *name;
         const char *cname;
     } pucol[numcol] = {
-        BACKGROUND, PUCOL_BACKGROUND, "background", "color-background",
-        FOREGROUND, PUCOL_FOREGROUND, "foreground", "color-foreground",
-        HIGHLIGHT,  PUCOL_HIGHLIGHT,  "highlight",  "color-highlight",
-        LABEL,      PUCOL_LABEL,      "label",      "color-label",
-        LEGEND,     PUCOL_LEGEND,     "legend",     "color-legend",
-        MISC,       PUCOL_MISC,       "misc",       "color-misc",
+        { BACKGROUND, PUCOL_BACKGROUND, "background", "color-background" },
+        { FOREGROUND, PUCOL_FOREGROUND, "foreground", "color-foreground" },
+        { HIGHLIGHT,  PUCOL_HIGHLIGHT,  "highlight",  "color-highlight" },
+        { LABEL,      PUCOL_LABEL,      "label",      "color-label" },
+        { LEGEND,     PUCOL_LEGEND,     "legend",     "color-legend" },
+        { MISC,       PUCOL_MISC,       "misc",       "color-misc" }
     };
 
     for (int i = 0; i < numcol; i++) {

diff --git a/src/GUI/new_gui.cxx b/src/GUI/new_gui.cxx
index 5b8295ec61f500211130ff3f90365248cb53259c..4b85d0df258f9c261194bf95b4ccfbac8611404c 100644 (file)
--- a/src/GUI/new_gui.cxx
+++ b/src/GUI/new_gui.cxx
@@ -303,17 +303,17 @@ static const struct {
     char *name;
     puFont *font;
 } guifonts[] = {
-    "default",      &FONT_HELVETICA_14,
-    "FIXED_8x13",   &PUFONT_8_BY_13,
-    "FIXED_9x15",   &PUFONT_9_BY_15,
-    "TIMES_10",     &PUFONT_TIMES_ROMAN_10,
-    "TIMES_24",     &PUFONT_TIMES_ROMAN_24,
-    "HELVETICA_10", &PUFONT_HELVETICA_10,
-    "HELVETICA_12", &PUFONT_HELVETICA_12,
-    "HELVETICA_14", &FONT_HELVETICA_14,
-    "HELVETICA_18", &PUFONT_HELVETICA_18,
-    "SANS_12B",     &FONT_SANS_12B,
-    0, 0,
+    { "default",      &FONT_HELVETICA_14 },
+    { "FIXED_8x13",   &PUFONT_8_BY_13 },
+    { "FIXED_9x15",   &PUFONT_9_BY_15 },
+    { "TIMES_10",     &PUFONT_TIMES_ROMAN_10 },
+    { "TIMES_24",     &PUFONT_TIMES_ROMAN_24 },
+    { "HELVETICA_10", &PUFONT_HELVETICA_10 },
+    { "HELVETICA_12", &PUFONT_HELVETICA_12 },
+    { "HELVETICA_14", &FONT_HELVETICA_14 },
+    { "HELVETICA_18", &PUFONT_HELVETICA_18 },
+    { "SANS_12B",     &FONT_SANS_12B },
+    { 0, 0 }
 };
 
 void