[comctl32]

rename TBSTYLE_EX_UNDOC1 to TBSTYLE_EX_VERTICAL

svn path=/trunk/; revision=62470

diff --git a/reactos/dll/win32/comctl32/toolbar.c b/reactos/dll/win32/comctl32/toolbar.c
index e803c3c..6b6a2fd 100644 (file)
--- a/reactos/dll/win32/comctl32/toolbar.c
+++ b/reactos/dll/win32/comctl32/toolbar.c
@@ -205,7 +205,7 @@ typedef enum
 
 /* Used to find undocumented extended styles */
 #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \
 
 /* Used to find undocumented extended styles */
 #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \

-                        TBSTYLE_EX_UNDOC1 | \
+                        TBSTYLE_EX_VERTICAL | \

                         TBSTYLE_EX_MIXEDBUTTONS | \
                         TBSTYLE_EX_DOUBLEBUFFER | \
                         TBSTYLE_EX_HIDECLIPPEDBUTTONS)
                         TBSTYLE_EX_MIXEDBUTTONS | \
                         TBSTYLE_EX_DOUBLEBUFFER | \
                         TBSTYLE_EX_HIDECLIPPEDBUTTONS)


@@ -1257,7 +1257,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize)
 * the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE
 * flag, and set the TBSTATE_WRAP flags manually on the appropriate items.
 *
 * the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE
 * flag, and set the TBSTATE_WRAP flags manually on the appropriate items.
 *

-* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_UNDOC1 can be used also to allow
+* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_VERTICAL can be used also to allow

 * vertical toolbar lists.
 */
 
 * vertical toolbar lists.
 */
 


@@ -1273,7 +1273,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr)
     /* no layout is necessary. Applications may use this style */
     /* to perform their own layout on the toolbar.             */
     if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) &&
     /* no layout is necessary. Applications may use this style */
     /* to perform their own layout on the toolbar.             */
     if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) &&

-       !(infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1) )  return;
+       !(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) )  return;

 
     btnPtr = infoPtr->buttons;
     x  = infoPtr->nIndent;
 
     btnPtr = infoPtr->buttons;
     x  = infoPtr->nIndent;


@@ -3023,7 +3023,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr)
     cy = TOP_BORDER + infoPtr->nRows * infoPtr->nButtonHeight + BOTTOM_BORDER;
     cx = parent_rect.right - parent_rect.left;
 
     cy = TOP_BORDER + infoPtr->nRows * infoPtr->nButtonHeight + BOTTOM_BORDER;
     cx = parent_rect.right - parent_rect.left;
 

-    if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1))
+    if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL))

     {
         TOOLBAR_LayoutToolbar(infoPtr);
         InvalidateRect( infoPtr->hwndSelf, NULL, TRUE );
     {
         TOOLBAR_LayoutToolbar(infoPtr);
         InvalidateRect( infoPtr->hwndSelf, NULL, TRUE );


@@ -3333,7 +3333,7 @@ TOOLBAR_GetButtonInfoT(const TOOLBAR_INFO *infoPtr, INT Id, LPTBBUTTONINFOW lpTb
     if (lpTbInfo == NULL)
        return -1;
 
     if (lpTbInfo == NULL)
        return -1;
 

-    /* MSDN documents a iImageLabel field added in Vista but it is not present in
+    /* MSDN documents an iImageLabel field added in Vista but it is not present in

      * the headers and tests shows that even with comctl 6 Vista accepts only the
      * original TBBUTTONINFO size
      */
      * the headers and tests shows that even with comctl 6 Vista accepts only the
      * original TBBUTTONINFO size
      */


@@ -4132,7 +4132,7 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave)
                 {
                     /* separator */
                     nmtbr.tbButton.fsStyle = TBSTYLE_SEP;
                 {
                     /* separator */
                     nmtbr.tbButton.fsStyle = TBSTYLE_SEP;

-                    /* when inserting separators, iBitmap controls it's size.
+                    /* when inserting separators, iBitmap controls its size.

                        0 sets default size (width) */
                     nmtbr.tbButton.iBitmap = 0;
                 }
                        0 sets default size (width) */
                     nmtbr.tbButton.iBitmap = 0;
                 }

diff --git a/reactos/include/psdk/commctrl.h b/reactos/include/psdk/commctrl.h
index f2b5b33..ebb7dda 100644 (file)
--- a/reactos/include/psdk/commctrl.h
+++ b/reactos/include/psdk/commctrl.h
@@ -949,7 +949,6 @@ extern "C" {
 #define TBSTYLE_CUSTOMERASE 0x2000
 #define TBSTYLE_REGISTERDROP 0x4000
 #define TBSTYLE_TRANSPARENT 0x8000
 #define TBSTYLE_CUSTOMERASE 0x2000
 #define TBSTYLE_REGISTERDROP 0x4000
 #define TBSTYLE_TRANSPARENT 0x8000

-#define TBSTYLE_EX_DRAWDDARROWS 0x1

 
 #define BTNS_BUTTON TBSTYLE_BUTTON
 #define BTNS_SEP TBSTYLE_SEP
 
 #define BTNS_BUTTON TBSTYLE_BUTTON
 #define BTNS_SEP TBSTYLE_SEP


@@ -962,9 +961,12 @@ extern "C" {
 #define BTNS_SHOWTEXT 0x40
 #define BTNS_WHOLEDROPDOWN 0x80
 
 #define BTNS_SHOWTEXT 0x40
 #define BTNS_WHOLEDROPDOWN 0x80
 

-#define TBSTYLE_EX_MIXEDBUTTONS 0x8
-#define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x10
-#define TBSTYLE_EX_DOUBLEBUFFER 0x80
+#define TBSTYLE_EX_DRAWDDARROWS         0x00000001
+#define TBSTYLE_EX_MULTICOLUMN          0x00000002
+#define TBSTYLE_EX_VERTICAL             0x00000004
+#define TBSTYLE_EX_MIXEDBUTTONS         0x00000008
+#define TBSTYLE_EX_HIDECLIPPEDBUTTONS   0x00000010 /* don't show partially obscured buttons */
+#define TBSTYLE_EX_DOUBLEBUFFER         0x00000080 /* Double Buffer the toolbar */

 
   typedef struct _NMTBCUSTOMDRAW {
     NMCUSTOMDRAW nmcd;
 
   typedef struct _NMTBCUSTOMDRAW {
     NMCUSTOMDRAW nmcd;

diff --git a/reactos/include/reactos/wine/commctrl.h b/reactos/include/reactos/wine/commctrl.h
index 28ce67f..b7dcba3 100644 (file)
--- a/reactos/include/reactos/wine/commctrl.h
+++ b/reactos/include/reactos/wine/commctrl.h
@@ -63,7 +63,6 @@ typedef LVFINDINFOA *LPLVFINDINFOA;
 typedef LVFINDINFOW *LPLVFINDINFOW;
 
 #define SB_SETBORDERS (WM_USER+5)
 typedef LVFINDINFOW *LPLVFINDINFOW;
 
 #define SB_SETBORDERS (WM_USER+5)

-#define TBSTYLE_EX_UNDOC1 0x00000004 /* similar to TBSTYLE_WRAPABLE */

 
 /* these are undocumented and the names are guesses */
 typedef struct
 
 /* these are undocumented and the names are guesses */
 typedef struct