Avoid incompatible operand types

[wxWidgets.git] / samples / xrc / rc / controls.xpm

diff --git a/samples/xrc/rc/controls.xpm b/samples/xrc/rc/controls.xpm
index 2bbdd348576c9bb4b7b609c27ca0561d0f1fffa2..f665938e4174d651992c6ca2eae14cc6bb190f1a 100644 (file)
--- a/samples/xrc/rc/controls.xpm
+++ b/samples/xrc/rc/controls.xpm
@@ -1,25 +1,25 @@
-/* XPM */
-static char * controls_xpm[] = {
-"16 16 6 1",
-"      c None",
-".     c #000000",
-"+     c #808080",
-"@     c #0000FF",
-"#     c #FFFFFF",
-"$     c #0E2CEF",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"................",
-".++++++++++++++.",
-".+@@@@@@@@####+.",
-".+$$$$$$$$####+.",
-".+$$$$$$$$####+.",
-".++++++++++++++.",
-"................",
-"                ",
-"                ",
-"                ",
-"                "};
+/* XPM */\r
+static const char *const controls_xpm[] = {\r
+"16 16 6 1",\r
+"      c None",\r
+".     c #000000",\r
+"+     c #808080",\r
+"@     c #0000FF",\r
+"#     c #FFFFFF",\r
+"$     c #0E2CEF",\r
+"                ",\r
+"                ",\r
+"                ",\r
+"                ",\r
+"                ",\r
+"................",\r
+".++++++++++++++.",\r
+".+@@@@@@@@####+.",\r
+".+$$$$$$$$####+.",\r
+".+$$$$$$$$####+.",\r
+".++++++++++++++.",\r
+"................",\r
+"                ",\r
+"                ",\r
+"                ",\r
+"                "};\r