Common Controls: New Resources (Try 2)
Robert Shearman
rob at codeweavers.com
Mon Sep 6 09:05:48 CDT 2004
Missed the required changes to Makefile.in in the previous patch.
Hi,
This patch adds three new icons that are required for an upcoming
tooltips patch that is currently being tested.
They are small versions of the similarly named icons used in message boxes.
Changelog:
Add 16x16 error, info and warning icons.
-------------- next part --------------
Index: wine/dlls/comctl32/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/Makefile.in,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile.in
--- wine/dlls/comctl32/Makefile.in 6 Aug 2004 19:17:49 -0000 1.37
+++ wine/dlls/comctl32/Makefile.in 6 Sep 2004 14:00:57 -0000
@@ -41,6 +41,7 @@ C_SRCS = \
RC_SRCS = rsrc.rc
RC_BINSRC = rsrc.rc
RC_BINARIES = \
+ error_sm.ico \
idb_hist_large.bmp \
idb_hist_small.bmp \
idb_std_large.bmp \
@@ -52,7 +53,9 @@ RC_BINARIES = \
idc_divideropen.cur \
idc_movebutton.cur \
idi_dragarrow.ico \
- idt_check.bmp
+ idt_check.bmp \
+ info_sm.ico \
+ warning_sm.ico
SUBDIRS = tests
Index: wine/dlls/comctl32/.cvsignore
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/.cvsignore,v
retrieving revision 1.15
diff -u -p -r1.15 .cvsignore
--- wine/dlls/comctl32/.cvsignore 24 Mar 2004 03:36:50 -0000 1.15
+++ wine/dlls/comctl32/.cvsignore 6 Sep 2004 14:00:57 -0000
@@ -2,6 +2,7 @@ Makefile
comctl32.dll
comctl32.dll.dbg.c
comctl32.spec.def
+error_sm.ico
idb_hist_large.bmp
idb_hist_small.bmp
idb_std_large.bmp
@@ -14,4 +15,6 @@ idc_divideropen.cur
idc_movebutton.cur
idi_dragarrow.ico
idt_check.bmp
+info_sm.ico
rsrc.res
+warning_sm.ico
Index: wine/dlls/comctl32/comctl32.h
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl32.h,v
retrieving revision 1.31
diff -u -p -r1.31 comctl32.h
--- wine/dlls/comctl32/comctl32.h 22 Aug 2004 22:29:38 -0000 1.31
+++ wine/dlls/comctl32/comctl32.h 6 Sep 2004 14:00:57 -0000
@@ -112,6 +112,11 @@ extern HBRUSH COMCTL32_hPattern55AABrus
/* HOTKEY internal strings */
#define HKY_NONE 2048
+/* Tooltip icons */
+#define IDI_TT_INFO_SM 22
+#define IDI_TT_WARN_SM 25
+#define IDI_TT_ERRO_SM 28
+
typedef struct
{
COLORREF clrBtnHighlight; /* COLOR_BTNHIGHLIGHT */
Index: wine/dlls/comctl32/rsrc.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/rsrc.rc,v
retrieving revision 1.41
diff -u -p -r1.41 rsrc.rc
--- wine/dlls/comctl32/rsrc.rc 16 Aug 2004 20:02:09 -0000 1.41
+++ wine/dlls/comctl32/rsrc.rc 6 Sep 2004 14:00:57 -0000
@@ -1106,6 +1106,84 @@ IDI_DRAGARROW ICON LOADONCALL DISCARDABL
} */
+/* BINRES info_sm.ico */
+IDI_TT_INFO_SM ICON LOADONCALL DISCARDABLE info_sm.ico
+/* {
+ '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
+ '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
+ '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
+ '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
+ '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
+ '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
+ '00 00 08 80 00 00 00 00 00 08 00 80 00 00 00 00'
+ '08 80 F0 80 00 00 00 00 80 0F F0 88 00 00 00 00'
+ '0F FF FF 00 80 00 00 0F FF FF FF FF 08 00 08 FF'
+ 'FC CC CC FF F0 80 8F FF FF 8C CF FF FF 08 8F FF'
+ 'FF 8C CF FF FF 08 8F FF FF 8C CF FF FF 08 8F FF'
+ 'F8 CC CF FF FF 00 8F FF FF FF FF FF FF 00 08 FF'
+ 'FF 8C CF FF F0 00 00 8F FF CC CF FF 00 00 00 08'
+ '8F FF FF 00 00 00 00 00 08 88 88 00 00 00 FF 9F'
+ '00 00 FE 1F 00 00 F8 1F 00 00 F0 0F 00 00 E0 07'
+ '00 00 C0 03 00 00 80 01 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 01 00 00 00 01 00 00 80 03'
+ '00 00 C0 07 00 00 E0 0F 00 00 F8 3F 00 00'
+} */
+
+
+/* BINRES warning_sm.ico */
+IDI_TT_WARN_SM ICON LOADONCALL DISCARDABLE warning_sm.ico
+/* {
+ '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
+ '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
+ '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
+ '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
+ '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
+ '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 03 33'
+ '33 33 33 33 33 33 00 00 00 00 00 00 00 03 0B BB'
+ 'BB BB BB BB BB 03 00 BB BB 30 3B BB B0 30 00 BB'
+ 'BB 30 3B BB B0 30 00 0B BB BB BB BB 03 00 00 0B'
+ 'BB B0 BB BB 03 00 00 00 BB 30 3B B0 30 00 00 00'
+ 'BB 00 0B B0 30 00 00 00 0B 00 0B 03 00 00 00 00'
+ '0B B0 BB 03 00 00 00 00 00 BB B0 30 00 00 00 00'
+ '00 BB B0 30 00 00 00 00 00 0B 03 00 00 00 00 00'
+ '00 0B 03 00 00 00 00 00 00 00 30 00 00 00 80 00'
+ '00 00 00 00 00 00 00 00 00 00 80 01 00 00 80 01'
+ '00 00 C0 03 00 00 C0 03 00 00 E0 07 00 00 E0 07'
+ '00 00 F0 0F 00 00 F0 0F 00 00 F8 1F 00 00 F8 1F'
+ '00 00 FC 3F 00 00 FC 3F 00 00 FE 7F 00 00'
+} */
+
+
+/* BINRES error_sm.ico */
+IDI_TT_ERRO_SM ICON LOADONCALL DISCARDABLE error_sm.ico
+/* {
+ '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
+ '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
+ '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
+ '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
+ '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
+ '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
+ '08 88 88 80 00 00 00 08 81 11 11 88 80 00 00 01'
+ '19 99 99 11 88 00 00 19 99 99 99 99 18 80 01 99'
+ 'F9 99 99 F9 91 80 01 9F FF 99 9F FF 91 88 19 99'
+ 'FF F9 FF F9 99 18 19 99 9F FF FF 99 99 18 19 99'
+ '99 FF F9 99 99 18 19 99 9F FF FF 99 99 10 19 99'
+ 'FF F9 FF F9 99 10 01 9F FF 99 9F FF 91 00 01 99'
+ 'F9 99 99 F9 91 00 00 19 99 99 99 99 10 00 00 01'
+ '19 99 99 11 00 00 00 00 01 11 11 00 00 00 F8 1F'
+ '00 00 E0 07 00 00 E0 03 00 00 C0 01 00 00 80 01'
+ '00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 01 00 00 00 01 00 00 80 03 00 00 80 03'
+ '00 00 C0 07 00 00 E0 0F 00 00 F8 3F 00 00'
+} */
+
+
/*
* Everything specific to any language goes
* in one of the specific files.
More information about the wine-patches
mailing list