[ros-diffs] [fireball] 44020: - Merge 44019.

Author: fireball
Date: Sat Nov  7 21:19:08 2009
New Revision: 44020

URL: http://svn.reactos.org/svn/reactos?rev=44020&view=rev
Log:
- Merge 44019.

Modified:
    branches/arwinss/reactos/include/psdk/commctrl.h   (contents, props changed)

Modified: branches/arwinss/reactos/include/psdk/commctrl.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/co…
==============================================================================
--- branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Nov  7 21:19:08
2009
@@ -1595,6 +1595,25 @@
 #define TOOLTIPS_CLASSA         "tooltips_class32"
 # define TOOLTIPS_CLASSW        L"tooltips_class32"
 #define TOOLTIPS_CLASS          WINELIB_NAME_AW(TOOLTIPS_CLASS)
+
+#if (_WIN32_WINNT >= 0x501)
+#define BUTTON_IMAGELIST_ALIGN_LEFT 0
+#define BUTTON_IMAGELIST_ALIGN_RIGHT 1
+#define BUTTON_IMAGELIST_ALIGN_TOP 2
+#define BUTTON_IMAGELIST_ALIGN_BOTTOM 3
+#define BUTTON_IMAGELIST_ALIGN_CENTER 4
+
+typedef struct
+{
+    HIMAGELIST himl;
+    RECT margin;
+    UINT uAlign;
+} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST;
+
+#define BCM_FIRST   0x1600
+#define BCM_GETIDEALSIZE    (BCM_FIRST + 1)
+#define BCM_SETIMAGELIST    (BCM_FIRST + 2)
+#endif /* _WIN32_WINNT */
 
 #define INFOTIPSIZE             1024
 

Propchange: branches/arwinss/reactos/include/psdk/commctrl.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov  7 21:19:08 2009
@@ -1,2 +1,2 @@

/branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos/include/psdk/commctrl.h:42000-43670,44013,44015
+/trunk/reactos/include/psdk/commctrl.h:42000-43670,44013,44015,44019