Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / samples / widgets / icons / combobox.xpm

diff --git a/samples/widgets/icons/combobox.xpm b/samples/widgets/icons/combobox.xpm
index 216561f567c9f9f9707cbf91c3e7e2014c82a7ec..fd6853101b60854fee5a1d544d78c65d5cb0eade 100644 (file)
--- a/samples/widgets/icons/combobox.xpm
+++ b/samples/widgets/icons/combobox.xpm
@@ -1,54 +1,54 @@
-/* XPM */
-static char *combobox_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 16 1",
-"  c Gray0",
-". c #808000",
-"X c #000080",
-"o c #808080",
-"O c #000000",
-"+ c #808000",
-"@ c #000080",
-"# c none",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"################################",
-"################################",
-"##                            ##",
-"## ::::::::::::::::           ##",
-"## ::::::::::::::::   :::::   ##",
-"## ::::::::::::::::    :::    ##",
-"## ::::::::::::::::     :     ##",
-"## ::::::::::::::::           ##",
-"##                            ##",
-"#### :::::::::::::: ::::::::: ##",
-"#### :::::::::::::: ::::::::: ##",
-"#### :::::::::::::: :::: :::: ##",
-"#### :::::::::::::: :::   ::: ##",
-"#### ::       ::::: ::     :: ##",
-"#### :::::::::::::: ::::::::: ##",
-"#### ::        :::: ::::::::: ##",
-"#### ::::::::::::::           ##",
-"#### ::         ::: ::::::::: ##",
-"#### :::::::::::::: ::::::::: ##",
-"#### ::        :::: ::::::::: ##",
-"#### ::::::::::::::           ##",
-"#### ::       ::::: ::::::::: ##",
-"#### :::::::::::::: ::::::::: ##",
-"#### ::        :::: ::     :: ##",
-"#### :::::::::::::: :::   ::: ##",
-"#### :::::::::::::: :::: :::: ##",
-"#### :::::::::::::: ::::::::: ##",
-"#### :::::::::::::: ::::::::: ##",
-"####                          ##",
-"################################",
-"################################",
-"################################"
-};
+/* XPM */\r
+static const char *const combobox_xpm[] = {\r
+/* columns rows colors chars-per-pixel */\r
+"32 32 16 1",\r
+"  c Gray0",\r
+". c #808000",\r
+"X c #000080",\r
+"o c #808080",\r
+"O c #000000",\r
+"+ c #808000",\r
+"@ c #000080",\r
+"# c none",\r
+"$ c #808080",\r
+"% c Red",\r
+"& c Green",\r
+"* c Yellow",\r
+"= c Blue",\r
+"- c Magenta",\r
+"; c Cyan",\r
+": c Gray100",\r
+/* pixels */\r
+"################################",\r
+"################################",\r
+"##                            ##",\r
+"## ::::::::::::::::           ##",\r
+"## ::::::::::::::::   :::::   ##",\r
+"## ::::::::::::::::    :::    ##",\r
+"## ::::::::::::::::     :     ##",\r
+"## ::::::::::::::::           ##",\r
+"##                            ##",\r
+"#### :::::::::::::: ::::::::: ##",\r
+"#### :::::::::::::: ::::::::: ##",\r
+"#### :::::::::::::: :::: :::: ##",\r
+"#### :::::::::::::: :::   ::: ##",\r
+"#### ::       ::::: ::     :: ##",\r
+"#### :::::::::::::: ::::::::: ##",\r
+"#### ::        :::: ::::::::: ##",\r
+"#### ::::::::::::::           ##",\r
+"#### ::         ::: ::::::::: ##",\r
+"#### :::::::::::::: ::::::::: ##",\r
+"#### ::        :::: ::::::::: ##",\r
+"#### ::::::::::::::           ##",\r
+"#### ::       ::::: ::::::::: ##",\r
+"#### :::::::::::::: ::::::::: ##",\r
+"#### ::        :::: ::     :: ##",\r
+"#### :::::::::::::: :::   ::: ##",\r
+"#### :::::::::::::: :::: :::: ##",\r
+"#### :::::::::::::: ::::::::: ##",\r
+"#### :::::::::::::: ::::::::: ##",\r
+"####                          ##",\r
+"################################",\r
+"################################",\r
+"################################"\r
+};\r