Merge in from trunk r67662 to r64801

[wxWidgets.git] / demos / life / bitmaps / open.xpm

diff --git a/demos/life/bitmaps/open.xpm b/demos/life/bitmaps/open.xpm
index 36e058fc8eb54eae998580d651d8b4dfb20da376..68dd5c35b2ca7701c7e0adfffa45cd66234f26ff 100644 (file)
--- a/demos/life/bitmaps/open.xpm
+++ b/demos/life/bitmaps/open.xpm
@@ -1,57 +1,57 @@
-/* XPM */
-static char *open_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 36 1",
-", c #AAC1E8",
-"1 c #9AEA53",
-"q c #DCE6F6",
-". c #295193",
-"; c #A9D066",
-"r c #C6D6F0",
-"$ c #4A7CCE",
-"9 c #779DDB",
-"8 c #EAF0FA",
-"O c #6E96D8",
-"X c #214279",
-"e c #BED0EE",
-"6 c #85A7DF",
-"5 c #F0F5FC",
-"t c #ADC4E9",
-": c #3161B1",
-"  c None",
-"u c #274D8B",
-"& c #BFDC9B",
-"> c #9FB9E5",
-"y c #5584D1",
-"w c #3569BF",
-"% c #3A70CA",
-"+ c #305FAC",
-"3 c #5D89D3",
-"0 c #D2DFF4",
-"@ c #CAE2AA",
-"= c #B2D58C",
-"2 c #FAFCFE",
-"# c #638ED5",
-"* c #CEDCF2",
-"4 c #90AFE2",
-"< c #B3C8EB",
-"7 c #E5EDF9",
-"- c #A2BCE6",
-"o c #DFF0D0",
-/* pixels */
-"                ",
-"     ....       ",
-"XXXXX .oo.      ",
-"XOOOO+ .@o.     ",
-"XOOOO#$%.&*XXX  ",
-"XOOOOOOO.=*X-X  ",
-"XOXXXX...;*XXXX:",
-"XOX>,<.11111*X2:",
-"X3X4>,<.111*X5-:",
-"XX#64>,,.1*X78: ",
-"XXO964>,,.X0q7: ",
-"Xw3O964>,,er0t: ",
-"X%y3O964>,<er:  ",
-"uXXXXXXXXXXXX:  ",
-"                "
-};
+/* XPM */\r
+static const char *const open_xpm[] = {\r
+/* columns rows colors chars-per-pixel */\r
+"16 15 36 1",\r
+", c #AAC1E8",\r
+"1 c #9AEA53",\r
+"q c #DCE6F6",\r
+". c #295193",\r
+"; c #A9D066",\r
+"r c #C6D6F0",\r
+"$ c #4A7CCE",\r
+"9 c #779DDB",\r
+"8 c #EAF0FA",\r
+"O c #6E96D8",\r
+"X c #214279",\r
+"e c #BED0EE",\r
+"6 c #85A7DF",\r
+"5 c #F0F5FC",\r
+"t c #ADC4E9",\r
+": c #3161B1",\r
+"  c None",\r
+"u c #274D8B",\r
+"& c #BFDC9B",\r
+"> c #9FB9E5",\r
+"y c #5584D1",\r
+"w c #3569BF",\r
+"% c #3A70CA",\r
+"+ c #305FAC",\r
+"3 c #5D89D3",\r
+"0 c #D2DFF4",\r
+"@ c #CAE2AA",\r
+"= c #B2D58C",\r
+"2 c #FAFCFE",\r
+"# c #638ED5",\r
+"* c #CEDCF2",\r
+"4 c #90AFE2",\r
+"< c #B3C8EB",\r
+"7 c #E5EDF9",\r
+"- c #A2BCE6",\r
+"o c #DFF0D0",\r
+/* pixels */\r
+"                ",\r
+"     ....       ",\r
+"XXXXX .oo.      ",\r
+"XOOOO+ .@o.     ",\r
+"XOOOO#$%.&*XXX  ",\r
+"XOOOOOOO.=*X-X  ",\r
+"XOXXXX...;*XXXX:",\r
+"XOX>,<.11111*X2:",\r
+"X3X4>,<.111*X5-:",\r
+"XX#64>,,.1*X78: ",\r
+"XXO964>,,.X0q7: ",\r
+"Xw3O964>,,er0t: ",\r
+"X%y3O964>,<er:  ",\r
+"uXXXXXXXXXXXX:  ",\r
+"                "\r
+};\r