From d6a1e531a32c8602084742ef566fc82a10ee2cc7 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:09:16 +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@4730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/html/msw/{back.bmp => wback.bmp}    | Bin
 include/wx/html/msw/{book.ico => wbook.ico}    | Bin
 .../wx/html/msw/{folder.ico => wfolder.ico}    | Bin
 .../wx/html/msw/{forward.bmp => wforward.bmp}  | Bin
 include/wx/html/msw/{help.ico => whelp.ico}    | Bin
 .../wx/html/msw/{helproot.ico => whlproot.ico} | Bin
 include/wx/html/msw/woptions.bmp               | Bin 0 -> 1334 bytes
 include/wx/html/msw/{page.ico => wpage.ico}    | Bin
 include/wx/html/msw/{panel.bmp => wpanel.bmp}  | Bin
 include/wx/html/msw/wxhtml.rc                  |  17 +++++++++--------
 10 files changed, 9 insertions(+), 8 deletions(-)
 rename include/wx/html/msw/{back.bmp => wback.bmp} (100%)
 rename include/wx/html/msw/{book.ico => wbook.ico} (100%)
 rename include/wx/html/msw/{folder.ico => wfolder.ico} (100%)
 rename include/wx/html/msw/{forward.bmp => wforward.bmp} (100%)
 rename include/wx/html/msw/{help.ico => whelp.ico} (100%)
 rename include/wx/html/msw/{helproot.ico => whlproot.ico} (100%)
 create mode 100644 include/wx/html/msw/woptions.bmp
 rename include/wx/html/msw/{page.ico => wpage.ico} (100%)
 rename include/wx/html/msw/{panel.bmp => wpanel.bmp} (100%)

diff --git a/include/wx/html/msw/back.bmp b/include/wx/html/msw/wback.bmp
similarity index 100%
rename from include/wx/html/msw/back.bmp
rename to include/wx/html/msw/wback.bmp
diff --git a/include/wx/html/msw/book.ico b/include/wx/html/msw/wbook.ico
similarity index 100%
rename from include/wx/html/msw/book.ico
rename to include/wx/html/msw/wbook.ico
diff --git a/include/wx/html/msw/folder.ico b/include/wx/html/msw/wfolder.ico
similarity index 100%
rename from include/wx/html/msw/folder.ico
rename to include/wx/html/msw/wfolder.ico
diff --git a/include/wx/html/msw/forward.bmp b/include/wx/html/msw/wforward.bmp
similarity index 100%
rename from include/wx/html/msw/forward.bmp
rename to include/wx/html/msw/wforward.bmp
diff --git a/include/wx/html/msw/help.ico b/include/wx/html/msw/whelp.ico
similarity index 100%
rename from include/wx/html/msw/help.ico
rename to include/wx/html/msw/whelp.ico
diff --git a/include/wx/html/msw/helproot.ico b/include/wx/html/msw/whlproot.ico
similarity index 100%
rename from include/wx/html/msw/helproot.ico
rename to include/wx/html/msw/whlproot.ico
diff --git a/include/wx/html/msw/woptions.bmp b/include/wx/html/msw/woptions.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..66f0cae74c638fb5696546af35b47889b7fb1480
GIT binary patch
literal 1334
zcmaizPiPZS5XOI-Y>i^osx?_qFt--5C<;|HXkCR~n$n0!4}~_6DuVwY5-+7B5Yz<`
z4^b&ZEnYl{1;Kg{)*hriDR`+BJt##Ff_N|{(qR2Io3z!7Z~6Ak?96;KZ|1EX?`)#B
zI!$Po)KZ7RYTsb^+sd~YFsc5oaw!2(`6bV34?spvN#U$;Mo2LzdlcK+N}NaZ@k^S^
zsi0@yEx$Cw@`DdJ9MH2}dyvNiZ#ZhrVpP(|ou2V7lGXzGN}MrIpEyCXFw2!x8Yc&z
zf@fL7B#V^kQb3*s#yCPix<}9)y9suIK%!dH&97Hs?<DPAWlY&qu?5!JN7$7p(<(ii
zzlrmqz~^+8J<{)Rm<Z1l>+_9Z=<%xd*Cw(Oij3>TkYig*o?FZ+zv|aoYze9^m=PQS
z%X@kKfp<b$k;s2oQdZJoqmOkADf5u>=4fjlVWaqa6p@skR~N?^6@OgbQ%oy9taziI
zug&-^|8efAUPmmWMnqkG!qd8bw-ecx`56$6S5rk$e^I|z>Y<4&W}%3cN@3=5G+S9Y
z6$Ssi^RW>eTYAFRr)3EX-hI-jajOoI&R3d&-#=pdXb;I>(0LjwB*7H&>cW`#19kq6
z?`;HoUo&6Qd0dz79a;AG7x_|35q1?Hc&VsGq0X=PT75rNPbo(zp!&sUiO*C%OE=XN
zd+2=y^O_Fa`w1>=hVzOa_8Ks#0~ipMxIy?S{?aB1K7Syi3m-a!+Q<umZ&A25%Bq8!
z$F3=^XXfY#4f7>aCLD5^JNBJc<2mKY6mC<F!IN2xP*KxTeX8dN`<ScU77f60Ieq&a
zMu%=sx6CGVYqDD;mXE2IDvO6ghv3QHYPq3$Kf<)?3%l%C-%7vpmeR#E?r|7+*o75Y
zpmIKrt0s?UEG+GnY4K@L6For+NlkO7s?i0tW;CFv4VU$UM<DhfhP}}yp~qYI|F`N+
zHD}L#DWnnHpjguV4-M6esIPjehP{!w#<=XR09lsO`0`4#=kSmIw^~ctV6W{f+5R%z
F{{t3wR~P^Q

literal 0
HcmV?d00001

diff --git a/include/wx/html/msw/page.ico b/include/wx/html/msw/wpage.ico
similarity index 100%
rename from include/wx/html/msw/page.ico
rename to include/wx/html/msw/wpage.ico
diff --git a/include/wx/html/msw/panel.bmp b/include/wx/html/msw/wpanel.bmp
similarity index 100%
rename from include/wx/html/msw/panel.bmp
rename to include/wx/html/msw/wpanel.bmp
diff --git a/include/wx/html/msw/wxhtml.rc b/include/wx/html/msw/wxhtml.rc
index 394a019c51..72dce41f87 100644
--- a/include/wx/html/msw/wxhtml.rc
+++ b/include/wx/html/msw/wxhtml.rc
@@ -6,12 +6,13 @@
 // (#include "wx/html/msw/wxhtml.rc")
 //
 
-back     BITMAP "wx/html/msw/back.bmp"
-forward  BITMAP "wx/html/msw/forward.bmp"
-panel    BITMAP "wx/html/msw/panel.bmp"
+wback     BITMAP "wx/html/msw/wback.bmp"
+wforward  BITMAP "wx/html/msw/wforward.bmp"
+wpanel    BITMAP "wx/html/msw/wpanel.bmp"
+woptions  BITMAP "wx/html/msw/woptions.bmp"
 
-book     ICON "wx/html/msw/book.ico"
-folder   ICON "wx/html/msw/folder.ico"
-page     ICON "wx/html/msw/page.ico"
-help     ICON "wx/html/msw/help.ico"
-helproot ICON "wx/html/msw/helproot.ico"
+wbook     ICON "wx/html/msw/wbook.ico"
+wfolder   ICON "wx/html/msw/wfolder.ico"
+wpage     ICON "wx/html/msw/wpage.ico"
+whelp     ICON "wx/html/msw/whelp.ico"
+whlproot  ICON "wx/html/msw/whlproot.ico"
-- 
2.50.0