wxHTML icons are now prefixed with w so that it does not conflict with app's icon...

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 (file)
index 5432905..0000000
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 (file)
index 77f12db..0000000
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 (file)
index 5e4ffd6..0000000
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 (file)
index 8e78844..0000000
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 (file)
index 71324fa..0000000
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 (file)
index e46df53..0000000
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 (file)
index 3e8194d..0000000
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 (file)
index e735d35..0000000
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 (file)
index 0000000..5432905
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 (file)
index 0000000..77f12db
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 (file)
index 0000000..5e4ffd6
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 (file)
index 0000000..8e78844
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 (file)
index 0000000..71324fa
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 (file)
index 0000000..e46df53
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 (file)
index 0000000..66f0cae
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 (file)
index 0000000..3e8194d
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 (file)
index 0000000..e735d35
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 394a019c51ae584578a313fc3daa2be608288139..72dce41f87e7f6885636ccf0c8eab42a0f8cc890 100644 (file)
--- a/include/wx/html/msw/wxhtml.rc
+++ b/include/wx/html/msw/wxhtml.rc
@@ -6,12 +6,13 @@
 // (#include "wx/html/msw/wxhtml.rc")
 //
 
 // (#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"