Have support for both char* and wchar_t* in wxPGPropArg. Moved wxPGPropArgCls member...

[wxWidgets.git] / samples / typetest / mondrian.xpm

diff --git a/samples/typetest/mondrian.xpm b/samples/typetest/mondrian.xpm
index 409f27a843c6abed643830de7a9578af298e8923..cc52c7de612793cbac7bf28c691934d7394bcff0 100644 (file)
--- a/samples/typetest/mondrian.xpm
+++ b/samples/typetest/mondrian.xpm
@@ -1,44 +1,44 @@
-/* XPM */
-static char *mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-"  c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-"                                ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-"                                ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++      ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++                    ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-"                                "
-};
+/* XPM */\r
+static const char *const mondrian_xpm[] = {\r
+/* columns rows colors chars-per-pixel */\r
+"32 32 6 1",\r
+"  c Black",\r
+". c Blue",\r
+"X c #00bf00",\r
+"o c Red",\r
+"O c Yellow",\r
+"+ c Gray100",\r
+/* pixels */\r
+"                                ",\r
+" oooooo +++++++++++++++++++++++ ",\r
+" oooooo +++++++++++++++++++++++ ",\r
+" oooooo +++++++++++++++++++++++ ",\r
+" oooooo +++++++++++++++++++++++ ",\r
+" oooooo +++++++++++++++++++++++ ",\r
+" oooooo +++++++++++++++++++++++ ",\r
+" oooooo +++++++++++++++++++++++ ",\r
+"                                ",\r
+" ++++++ ++++++++++++++++++ .... ",\r
+" ++++++ ++++++++++++++++++ .... ",\r
+" ++++++ ++++++++++++++++++ .... ",\r
+" ++++++ ++++++++++++++++++ .... ",\r
+" ++++++ ++++++++++++++++++ .... ",\r
+" ++++++ ++++++++++++++++++      ",\r
+" ++++++ ++++++++++++++++++ ++++ ",\r
+" ++++++ ++++++++++++++++++ ++++ ",\r
+" ++++++ ++++++++++++++++++ ++++ ",\r
+" ++++++ ++++++++++++++++++ ++++ ",\r
+" ++++++ ++++++++++++++++++ ++++ ",\r
+" ++++++ ++++++++++++++++++ ++++ ",\r
+" ++++++ ++++++++++++++++++ ++++ ",\r
+" ++++++ ++++++++++++++++++ ++++ ",\r
+" ++++++ ++++++++++++++++++ ++++ ",\r
+" ++++++                    ++++ ",\r
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
+"                                "\r
+};\r