From e6f9a448298de382f5f790d948ba5c986dc100b6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sun, 28 Nov 1999 18:15:30 +0000
Subject: [PATCH] wxHTML icons are now prefixed with w so that it does not
 conflict with app's icon under MSW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/html/bitmaps/{back.xpm => wback.xpm}      |  2 +-
 src/html/bitmaps/{book.xpm => wbook.xpm}      |  2 +-
 src/html/bitmaps/{folder.xpm => wfolder.xpm}  |  2 +-
 .../bitmaps/{forward.xpm => wforward.xpm}     |  2 +-
 src/html/bitmaps/{help.xpm => whelp.xpm}      |  2 +-
 .../bitmaps/{helproot.xpm => whlproot.xpm}    |  2 +-
 src/html/bitmaps/woptions.xpm                 | 21 +++++++++++++++++++
 src/html/bitmaps/{page.xpm => wpage.xpm}      |  2 +-
 src/html/bitmaps/{panel.xpm => wpanel.xpm}    |  2 +-
 9 files changed, 29 insertions(+), 8 deletions(-)
 rename src/html/bitmaps/{back.xpm => wback.xpm} (93%)
 rename src/html/bitmaps/{book.xpm => wbook.xpm} (95%)
 rename src/html/bitmaps/{folder.xpm => wfolder.xpm} (96%)
 rename src/html/bitmaps/{forward.xpm => wforward.xpm} (92%)
 rename src/html/bitmaps/{help.xpm => whelp.xpm} (97%)
 rename src/html/bitmaps/{helproot.xpm => whlproot.xpm} (93%)
 create mode 100644 src/html/bitmaps/woptions.xpm
 rename src/html/bitmaps/{page.xpm => wpage.xpm} (93%)
 rename src/html/bitmaps/{panel.xpm => wpanel.xpm} (98%)

diff --git a/src/html/bitmaps/back.xpm b/src/html/bitmaps/wback.xpm
similarity index 93%
rename from src/html/bitmaps/back.xpm
rename to src/html/bitmaps/wback.xpm
index fbb4378bf6..2c8a148f23 100644
--- a/src/html/bitmaps/back.xpm
+++ b/src/html/bitmaps/wback.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * back_xpm[] = {
+static char * wback_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/src/html/bitmaps/book.xpm b/src/html/bitmaps/wbook.xpm
similarity index 95%
rename from src/html/bitmaps/book.xpm
rename to src/html/bitmaps/wbook.xpm
index 3146053f85..74308608ae 100644
--- a/src/html/bitmaps/book.xpm
+++ b/src/html/bitmaps/wbook.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * book_xpm[] = {
+static char * wbook_xpm[] = {
 "16 16 21 1",
 " 	c None",
 ".	c #007F7F",
diff --git a/src/html/bitmaps/folder.xpm b/src/html/bitmaps/wfolder.xpm
similarity index 96%
rename from src/html/bitmaps/folder.xpm
rename to src/html/bitmaps/wfolder.xpm
index a7fbf85369..228b48a420 100644
--- a/src/html/bitmaps/folder.xpm
+++ b/src/html/bitmaps/wfolder.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * folder_xpm[] = {
+static char * wfolder_xpm[] = {
 "16 16 31 1",
 " 	c None",
 ".	c #000000",
diff --git a/src/html/bitmaps/forward.xpm b/src/html/bitmaps/wforward.xpm
similarity index 92%
rename from src/html/bitmaps/forward.xpm
rename to src/html/bitmaps/wforward.xpm
index 6e3de64511..87b2628783 100644
--- a/src/html/bitmaps/forward.xpm
+++ b/src/html/bitmaps/wforward.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * forward_xpm[] = {
+static char * wforward_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/src/html/bitmaps/help.xpm b/src/html/bitmaps/whelp.xpm
similarity index 97%
rename from src/html/bitmaps/help.xpm
rename to src/html/bitmaps/whelp.xpm
index 8371927b34..c879d60635 100644
--- a/src/html/bitmaps/help.xpm
+++ b/src/html/bitmaps/whelp.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *help_xpm[] = {
+static char *whelp_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Gray0",
diff --git a/src/html/bitmaps/helproot.xpm b/src/html/bitmaps/whlproot.xpm
similarity index 93%
rename from src/html/bitmaps/helproot.xpm
rename to src/html/bitmaps/whlproot.xpm
index 263c2d2f44..cea36cfa7e 100644
--- a/src/html/bitmaps/helproot.xpm
+++ b/src/html/bitmaps/whlproot.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *helproot_xpm[] = {
+static char *whlproot_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 5 1",
 "  c Gray0",
diff --git a/src/html/bitmaps/woptions.xpm b/src/html/bitmaps/woptions.xpm
new file mode 100644
index 0000000000..3268b89f8b
--- /dev/null
+++ b/src/html/bitmaps/woptions.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * woptions_xpm[] = {
+"16 16 2 1",
+" 	c None",
+".	c #000000",
+"                ",
+"      ..        ",
+"      ...       ",
+"     ....       ",
+"     . ...      ",
+"    .. ...      ",
+"    .   ..      ",
+"   ..   ...     ",
+"   .     ..     ",
+"   .........    ",
+"  ..     ...    ",
+"  .       ...   ",
+" ..       ...   ",
+" ....   ....... ",
+"                ",
+"                "};
diff --git a/src/html/bitmaps/page.xpm b/src/html/bitmaps/wpage.xpm
similarity index 93%
rename from src/html/bitmaps/page.xpm
rename to src/html/bitmaps/wpage.xpm
index f8bf0c0057..b6a4065c44 100644
--- a/src/html/bitmaps/page.xpm
+++ b/src/html/bitmaps/wpage.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * page_xpm[] = {
+static char * wpage_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 3 1",
 /* colors */
diff --git a/src/html/bitmaps/panel.xpm b/src/html/bitmaps/wpanel.xpm
similarity index 98%
rename from src/html/bitmaps/panel.xpm
rename to src/html/bitmaps/wpanel.xpm
index 42798ebbe3..b19cdf364c 100644
--- a/src/html/bitmaps/panel.xpm
+++ b/src/html/bitmaps/wpanel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * panel_xpm[] = {
+static char * wpanel_xpm[] = {
 "16 15 104 2",
 "  	c None",
 ". 	c #7F7C7C",
-- 
2.47.2