From: Václav Slavík Date: Sun, 28 Nov 1999 18:09:16 +0000 (+0000) Subject: wxHTML icons are now prefixed with w so that it does not conflict with app's icon... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d6a1e531a32c8602084742ef566fc82a10ee2cc7?ds=sidebyside 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 --- diff --git a/include/wx/html/msw/back.bmp b/include/wx/html/msw/back.bmp deleted file mode 100644 index 543290530c..0000000000 Binary files a/include/wx/html/msw/back.bmp and /dev/null differ diff --git a/include/wx/html/msw/book.ico b/include/wx/html/msw/book.ico deleted file mode 100644 index 77f12dbbbe..0000000000 Binary files a/include/wx/html/msw/book.ico and /dev/null differ diff --git a/include/wx/html/msw/folder.ico b/include/wx/html/msw/folder.ico deleted file mode 100644 index 5e4ffd6c29..0000000000 Binary files a/include/wx/html/msw/folder.ico and /dev/null differ diff --git a/include/wx/html/msw/forward.bmp b/include/wx/html/msw/forward.bmp deleted file mode 100644 index 8e78844e84..0000000000 Binary files a/include/wx/html/msw/forward.bmp and /dev/null differ diff --git a/include/wx/html/msw/help.ico b/include/wx/html/msw/help.ico deleted file mode 100644 index 71324fa96a..0000000000 Binary files a/include/wx/html/msw/help.ico and /dev/null differ diff --git a/include/wx/html/msw/helproot.ico b/include/wx/html/msw/helproot.ico deleted file mode 100644 index e46df53c46..0000000000 Binary files a/include/wx/html/msw/helproot.ico and /dev/null differ diff --git a/include/wx/html/msw/page.ico b/include/wx/html/msw/page.ico deleted file mode 100644 index 3e8194d9b9..0000000000 Binary files a/include/wx/html/msw/page.ico and /dev/null differ diff --git a/include/wx/html/msw/panel.bmp b/include/wx/html/msw/panel.bmp deleted file mode 100644 index e735d3584b..0000000000 Binary files a/include/wx/html/msw/panel.bmp and /dev/null differ diff --git a/include/wx/html/msw/wback.bmp b/include/wx/html/msw/wback.bmp new file mode 100644 index 0000000000..543290530c Binary files /dev/null and b/include/wx/html/msw/wback.bmp differ diff --git a/include/wx/html/msw/wbook.ico b/include/wx/html/msw/wbook.ico new file mode 100644 index 0000000000..77f12dbbbe Binary files /dev/null and b/include/wx/html/msw/wbook.ico differ diff --git a/include/wx/html/msw/wfolder.ico b/include/wx/html/msw/wfolder.ico new file mode 100644 index 0000000000..5e4ffd6c29 Binary files /dev/null and b/include/wx/html/msw/wfolder.ico differ diff --git a/include/wx/html/msw/wforward.bmp b/include/wx/html/msw/wforward.bmp new file mode 100644 index 0000000000..8e78844e84 Binary files /dev/null and b/include/wx/html/msw/wforward.bmp differ diff --git a/include/wx/html/msw/whelp.ico b/include/wx/html/msw/whelp.ico new file mode 100644 index 0000000000..71324fa96a Binary files /dev/null and b/include/wx/html/msw/whelp.ico differ diff --git a/include/wx/html/msw/whlproot.ico b/include/wx/html/msw/whlproot.ico new file mode 100644 index 0000000000..e46df53c46 Binary files /dev/null and b/include/wx/html/msw/whlproot.ico differ diff --git a/include/wx/html/msw/woptions.bmp b/include/wx/html/msw/woptions.bmp new file mode 100644 index 0000000000..66f0cae74c Binary files /dev/null and b/include/wx/html/msw/woptions.bmp differ diff --git a/include/wx/html/msw/wpage.ico b/include/wx/html/msw/wpage.ico new file mode 100644 index 0000000000..3e8194d9b9 Binary files /dev/null and b/include/wx/html/msw/wpage.ico differ diff --git a/include/wx/html/msw/wpanel.bmp b/include/wx/html/msw/wpanel.bmp new file mode 100644 index 0000000000..e735d3584b Binary files /dev/null and b/include/wx/html/msw/wpanel.bmp differ 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"