Modified: trunk/reactos/lib/comctl32/datetime.c
Modified: trunk/reactos/lib/comctl32/listview.c
Modified: trunk/reactos/lib/comctl32/pager.c
Modified: trunk/reactos/lib/comctl32/status.c
Modified: trunk/reactos/lib/comctl32/toolbar.c
Modified: trunk/reactos/lib/comctl32/trackbar.c
--- trunk/reactos/lib/comctl32/datetime.c 2005-02-12 20:37:04 UTC (rev 13512)
+++ trunk/reactos/lib/comctl32/datetime.c 2005-02-12 20:51:20 UTC (rev 13513)
@@ -1085,7 +1085,6 @@
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
- return 0;
}
--- trunk/reactos/lib/comctl32/listview.c 2005-02-12 20:37:04 UTC (rev 13512)
+++ trunk/reactos/lib/comctl32/listview.c 2005-02-12 20:51:20 UTC (rev 13513)
@@ -254,7 +254,7 @@
BOOL bRedraw; /* Turns on/off repaints & invalidations */
BOOL bAutoarrange; /* Autoarrange flag when NOT in LVS_AUTOARRANGE */
BOOL bFocus;
- BOOL bDoChangeNotify; /* send change notification messages? */
+ BOOL bDoChangeNotify; /* send change notification messages? */
INT nFocusedItem;
RECT rcFocus;
DWORD dwStyle; /* the cached window GWL_STYLE */
@@ -4145,7 +4145,7 @@
for (i = infoPtr->nItemCount - 1; i >= 0; i--)
{
- /* send LVN_DELETEITEM notification, if not supressed */
+ /* send LVN_DELETEITEM notification, if not suppressed */
if (!bSuppress) notify_deleteitem(infoPtr, i);
if (!(infoPtr->dwStyle & LVS_OWNERDATA))
{
@@ -6296,11 +6296,11 @@
lphdi->mask |= HDI_FORMAT;
/* set text alignment (leftmost column must be left-aligned) */
- if (nColumn == 0 || lpColumn->fmt & LVCFMT_LEFT)
+ if (nColumn == 0 || (lpColumn->fmt & LVCFMT_JUSTIFYMASK) == LVCFMT_LEFT)
lphdi->fmt |= HDF_LEFT;
- else if (lpColumn->fmt & LVCFMT_RIGHT)
+ else if ((lpColumn->fmt & LVCFMT_JUSTIFYMASK) == LVCFMT_RIGHT)
lphdi->fmt |= HDF_RIGHT;
- else if (lpColumn->fmt & LVCFMT_CENTER)
+ else if ((lpColumn->fmt & LVCFMT_JUSTIFYMASK) == LVCFMT_CENTER)
lphdi->fmt |= HDF_CENTER;
if (lpColumn->fmt & LVCFMT_BITMAP_ON_RIGHT)
--- trunk/reactos/lib/comctl32/pager.c 2005-02-12 20:37:04 UTC (rev 13512)
+++ trunk/reactos/lib/comctl32/pager.c 2005-02-12 20:51:20 UTC (rev 13513)
@@ -836,16 +836,6 @@
if (dwStyle & PGS_DRAGNDROP)
FIXME("[%p] Drag and Drop style is not implemented yet.\n", hwnd);
- /*
- * If neither horizontal nor vertical style specified, default to vertical.
- * This is probably not necessary, since the style may be set later on as
- * the control is initialized, but just in case it isn't, set it here.
- */
- if (!(dwStyle & PGS_HORZ) && !(dwStyle & PGS_VERT))
- {
- dwStyle |= PGS_VERT;
- SetWindowLongA(hwnd, GWL_STYLE, dwStyle);
- }
return 0;
}
--- trunk/reactos/lib/comctl32/status.c 2005-02-12 20:37:04 UTC (rev 13512)
+++ trunk/reactos/lib/comctl32/status.c 2005-02-12 20:51:20 UTC (rev 13513)
@@ -650,7 +650,7 @@
{
STATUSWINDOWPART *part=NULL;
BOOL changed = FALSE;
- INT oldStyle;
+ INT oldStyle;
if (style & SBT_OWNERDRAW) {
TRACE("part %d, text %p\n",nPart,text);
@@ -890,9 +890,9 @@
dwStyle = GetWindowLongW (hwnd, GWL_STYLE);
/* statusbars on managed windows should not have SIZEGRIP style */
- if ((dwStyle & SBARS_SIZEGRIP) && lpCreate->hwndParent)
- if (GetWindowLongW (lpCreate->hwndParent, GWL_EXSTYLE) & WS_EX_MANAGED)
- SetWindowLongW (hwnd, GWL_STYLE, dwStyle & ~SBARS_SIZEGRIP);
+ if ((dwStyle & SBARS_SIZEGRIP) && lpCreate->hwndParent &&
+ GetPropA( lpCreate->hwndParent, "__wine_x11_managed" ))
+ SetWindowLongW (hwnd, GWL_STYLE, dwStyle & ~SBARS_SIZEGRIP);
if ((hdc = GetDC (hwnd))) {
TEXTMETRICW tm;
--- trunk/reactos/lib/comctl32/toolbar.c 2005-02-12 20:37:04 UTC (rev 13512)
+++ trunk/reactos/lib/comctl32/toolbar.c 2005-02-12 20:51:20 UTC (rev 13513)
@@ -64,7 +64,7 @@
* enablebtn.exe, getbmp.exe, getbtn.exe, getflags.exe, hidebtn.exe,
* indetbtn.exe, insbtn.exe, pressbtn.exe, setbtnsz.exe, setcmdid.exe,
* setparnt.exe, setrows.exe, toolwnd.exe.
- * - Microsofts controlspy examples.
+ * - Microsoft's controlspy examples.
* - Charles Petzold's 'Programming Windows': gadgets.exe
*/
@@ -6080,7 +6080,7 @@
TRACKMOUSEEVENT trackinfo;
INT nHit;
TBUTTON_INFO *btnPtr;
-
+
if (infoPtr->dwStyle & TBSTYLE_FLAT) {
/* fill in the TRACKMOUSEEVENT struct */
trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);
--- trunk/reactos/lib/comctl32/trackbar.c 2005-02-12 20:37:04 UTC (rev 13512)
+++ trunk/reactos/lib/comctl32/trackbar.c 2005-02-12 20:51:20 UTC (rev 13513)
@@ -1336,7 +1336,7 @@
TRACKBAR_Create (HWND hwnd, LPCREATESTRUCTW lpcs)
{
TRACKBAR_INFO *infoPtr;
- DWORD oldStyle, newStyle;
+ DWORD dwStyle;
infoPtr = (TRACKBAR_INFO *)Alloc (sizeof(TRACKBAR_INFO));
if (!infoPtr) return -1;
@@ -1359,19 +1359,10 @@
TRACKBAR_InitializeThumb (infoPtr);
- oldStyle = newStyle = GetWindowLongW (hwnd, GWL_STYLE);
- if (oldStyle & TBS_VERT) {
- if (! (oldStyle & (TBS_LEFT | TBS_RIGHT | TBS_BOTH)) )
- newStyle |= TBS_RIGHT;
- } else {
- if (! (oldStyle & (TBS_TOP | TBS_BOTTOM | TBS_BOTH)) )
- newStyle |= TBS_BOTTOM;
- }
- if (newStyle != oldStyle)
- SetWindowLongW (hwnd, GWL_STYLE, newStyle);
+ dwStyle = GetWindowLongW (hwnd, GWL_STYLE);
/* Create tooltip control */
- if (newStyle & TBS_TOOLTIPS) {
+ if (dwStyle & TBS_TOOLTIPS) {
infoPtr->hwndToolTip =
CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, 0,