mirror of
https://github.com/reactos/reactos.git
synced 2024-12-27 17:44:45 +00:00
Sync to Wine-20050211
Francois Gouget <fgouget@free.fr> - Assorted spelling fixes. Dimitrie O. Paun <dpaun@rogers.com> - Use the LVCFMT_{LEFT,RIGHT,CENTER} enumeration flags properly. Alexandre Julliard <julliard@winehq.org> - Store the "managed" flag as a window property instead of the Wine-specific WS_EX_MANAGED style bit. Paul Vriens <Paul.Vriens@xs4all.nl> - Remove needless check for horizontal or vertical pager. Paul Vriens <Paul.Vriens@xs4all.nl> - Remove the checking/setting of the defaults in TRACKBAR_Create. svn path=/trunk/; revision=13513
This commit is contained in:
parent
709af1f28a
commit
2b5f93358a
6 changed files with 14 additions and 34 deletions
|
@ -1085,7 +1085,6 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
uMsg, wParam, lParam);
|
uMsg, wParam, lParam);
|
||||||
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
|
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
|
||||||
}
|
}
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -254,7 +254,7 @@ typedef struct tagLISTVIEW_INFO
|
||||||
BOOL bRedraw; /* Turns on/off repaints & invalidations */
|
BOOL bRedraw; /* Turns on/off repaints & invalidations */
|
||||||
BOOL bAutoarrange; /* Autoarrange flag when NOT in LVS_AUTOARRANGE */
|
BOOL bAutoarrange; /* Autoarrange flag when NOT in LVS_AUTOARRANGE */
|
||||||
BOOL bFocus;
|
BOOL bFocus;
|
||||||
BOOL bDoChangeNotify; /* send change notification messages? */
|
BOOL bDoChangeNotify; /* send change notification messages? */
|
||||||
INT nFocusedItem;
|
INT nFocusedItem;
|
||||||
RECT rcFocus;
|
RECT rcFocus;
|
||||||
DWORD dwStyle; /* the cached window GWL_STYLE */
|
DWORD dwStyle; /* the cached window GWL_STYLE */
|
||||||
|
@ -4145,7 +4145,7 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr)
|
||||||
|
|
||||||
for (i = infoPtr->nItemCount - 1; i >= 0; i--)
|
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 (!bSuppress) notify_deleteitem(infoPtr, i);
|
||||||
if (!(infoPtr->dwStyle & LVS_OWNERDATA))
|
if (!(infoPtr->dwStyle & LVS_OWNERDATA))
|
||||||
{
|
{
|
||||||
|
@ -6296,11 +6296,11 @@ static void column_fill_hditem(LISTVIEW_INFO *infoPtr, HDITEMW *lphdi, INT nColu
|
||||||
lphdi->mask |= HDI_FORMAT;
|
lphdi->mask |= HDI_FORMAT;
|
||||||
|
|
||||||
/* set text alignment (leftmost column must be left-aligned) */
|
/* 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;
|
lphdi->fmt |= HDF_LEFT;
|
||||||
else if (lpColumn->fmt & LVCFMT_RIGHT)
|
else if ((lpColumn->fmt & LVCFMT_JUSTIFYMASK) == LVCFMT_RIGHT)
|
||||||
lphdi->fmt |= HDF_RIGHT;
|
lphdi->fmt |= HDF_RIGHT;
|
||||||
else if (lpColumn->fmt & LVCFMT_CENTER)
|
else if ((lpColumn->fmt & LVCFMT_JUSTIFYMASK) == LVCFMT_CENTER)
|
||||||
lphdi->fmt |= HDF_CENTER;
|
lphdi->fmt |= HDF_CENTER;
|
||||||
|
|
||||||
if (lpColumn->fmt & LVCFMT_BITMAP_ON_RIGHT)
|
if (lpColumn->fmt & LVCFMT_BITMAP_ON_RIGHT)
|
||||||
|
|
|
@ -836,16 +836,6 @@ PAGER_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
|
|
||||||
if (dwStyle & PGS_DRAGNDROP)
|
if (dwStyle & PGS_DRAGNDROP)
|
||||||
FIXME("[%p] Drag and Drop style is not implemented yet.\n", hwnd);
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -650,7 +650,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style,
|
||||||
{
|
{
|
||||||
STATUSWINDOWPART *part=NULL;
|
STATUSWINDOWPART *part=NULL;
|
||||||
BOOL changed = FALSE;
|
BOOL changed = FALSE;
|
||||||
INT oldStyle;
|
INT oldStyle;
|
||||||
|
|
||||||
if (style & SBT_OWNERDRAW) {
|
if (style & SBT_OWNERDRAW) {
|
||||||
TRACE("part %d, text %p\n",nPart,text);
|
TRACE("part %d, text %p\n",nPart,text);
|
||||||
|
@ -890,9 +890,9 @@ STATUSBAR_WMCreate (HWND hwnd, LPCREATESTRUCTA lpCreate)
|
||||||
dwStyle = GetWindowLongW (hwnd, GWL_STYLE);
|
dwStyle = GetWindowLongW (hwnd, GWL_STYLE);
|
||||||
|
|
||||||
/* statusbars on managed windows should not have SIZEGRIP style */
|
/* statusbars on managed windows should not have SIZEGRIP style */
|
||||||
if ((dwStyle & SBARS_SIZEGRIP) && lpCreate->hwndParent)
|
if ((dwStyle & SBARS_SIZEGRIP) && lpCreate->hwndParent &&
|
||||||
if (GetWindowLongW (lpCreate->hwndParent, GWL_EXSTYLE) & WS_EX_MANAGED)
|
GetPropA( lpCreate->hwndParent, "__wine_x11_managed" ))
|
||||||
SetWindowLongW (hwnd, GWL_STYLE, dwStyle & ~SBARS_SIZEGRIP);
|
SetWindowLongW (hwnd, GWL_STYLE, dwStyle & ~SBARS_SIZEGRIP);
|
||||||
|
|
||||||
if ((hdc = GetDC (hwnd))) {
|
if ((hdc = GetDC (hwnd))) {
|
||||||
TEXTMETRICW tm;
|
TEXTMETRICW tm;
|
||||||
|
|
|
@ -64,7 +64,7 @@
|
||||||
* enablebtn.exe, getbmp.exe, getbtn.exe, getflags.exe, hidebtn.exe,
|
* enablebtn.exe, getbmp.exe, getbtn.exe, getflags.exe, hidebtn.exe,
|
||||||
* indetbtn.exe, insbtn.exe, pressbtn.exe, setbtnsz.exe, setcmdid.exe,
|
* indetbtn.exe, insbtn.exe, pressbtn.exe, setbtnsz.exe, setcmdid.exe,
|
||||||
* setparnt.exe, setrows.exe, toolwnd.exe.
|
* setparnt.exe, setrows.exe, toolwnd.exe.
|
||||||
* - Microsofts controlspy examples.
|
* - Microsoft's controlspy examples.
|
||||||
* - Charles Petzold's 'Programming Windows': gadgets.exe
|
* - Charles Petzold's 'Programming Windows': gadgets.exe
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -6080,7 +6080,7 @@ TOOLBAR_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
TRACKMOUSEEVENT trackinfo;
|
TRACKMOUSEEVENT trackinfo;
|
||||||
INT nHit;
|
INT nHit;
|
||||||
TBUTTON_INFO *btnPtr;
|
TBUTTON_INFO *btnPtr;
|
||||||
|
|
||||||
if (infoPtr->dwStyle & TBSTYLE_FLAT) {
|
if (infoPtr->dwStyle & TBSTYLE_FLAT) {
|
||||||
/* fill in the TRACKMOUSEEVENT struct */
|
/* fill in the TRACKMOUSEEVENT struct */
|
||||||
trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);
|
trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);
|
||||||
|
|
|
@ -1336,7 +1336,7 @@ static LRESULT
|
||||||
TRACKBAR_Create (HWND hwnd, LPCREATESTRUCTW lpcs)
|
TRACKBAR_Create (HWND hwnd, LPCREATESTRUCTW lpcs)
|
||||||
{
|
{
|
||||||
TRACKBAR_INFO *infoPtr;
|
TRACKBAR_INFO *infoPtr;
|
||||||
DWORD oldStyle, newStyle;
|
DWORD dwStyle;
|
||||||
|
|
||||||
infoPtr = (TRACKBAR_INFO *)Alloc (sizeof(TRACKBAR_INFO));
|
infoPtr = (TRACKBAR_INFO *)Alloc (sizeof(TRACKBAR_INFO));
|
||||||
if (!infoPtr) return -1;
|
if (!infoPtr) return -1;
|
||||||
|
@ -1359,19 +1359,10 @@ TRACKBAR_Create (HWND hwnd, LPCREATESTRUCTW lpcs)
|
||||||
|
|
||||||
TRACKBAR_InitializeThumb (infoPtr);
|
TRACKBAR_InitializeThumb (infoPtr);
|
||||||
|
|
||||||
oldStyle = newStyle = GetWindowLongW (hwnd, GWL_STYLE);
|
dwStyle = 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);
|
|
||||||
|
|
||||||
/* Create tooltip control */
|
/* Create tooltip control */
|
||||||
if (newStyle & TBS_TOOLTIPS) {
|
if (dwStyle & TBS_TOOLTIPS) {
|
||||||
|
|
||||||
infoPtr->hwndToolTip =
|
infoPtr->hwndToolTip =
|
||||||
CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, 0,
|
CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, 0,
|
||||||
|
|
Loading…
Reference in a new issue