- Fix some TRACEs
- More A->W conversions missed by previous patch. - Fix off-by-one error in validating drag-n-drop from available buttons list box to actual buttons list box. - Unicode flag should be based on the notification window.
This commit is contained in:
parent
807fe07417
commit
56b9d3c739
|
@ -1771,7 +1771,7 @@ static void TOOLBAR_Cust_InsertAvailButton(HWND hwnd, PCUSTOMBUTTON btnInfoNew)
|
||||||
PCUSTOMBUTTON btnInfo;
|
PCUSTOMBUTTON btnInfo;
|
||||||
HWND hwndAvail = GetDlgItem(hwnd, IDC_AVAILBTN_LBOX);
|
HWND hwndAvail = GetDlgItem(hwnd, IDC_AVAILBTN_LBOX);
|
||||||
|
|
||||||
ERR("button %s, idCommand %d\n", debugstr_w(btnInfoNew->text), btnInfoNew->btn.idCommand);
|
TRACE("button %s, idCommand %d\n", debugstr_w(btnInfoNew->text), btnInfoNew->btn.idCommand);
|
||||||
|
|
||||||
count = SendMessageW(hwndAvail, LB_GETCOUNT, 0, 0);
|
count = SendMessageW(hwndAvail, LB_GETCOUNT, 0, 0);
|
||||||
|
|
||||||
|
@ -1828,7 +1828,7 @@ static void TOOLBAR_Cust_MoveButton(PCUSTDLG_INFO custInfo, HWND hwnd, INT nInde
|
||||||
EnableWindow(GetDlgItem(hwnd,IDC_MOVEDN_BTN), TRUE);
|
EnableWindow(GetDlgItem(hwnd,IDC_MOVEDN_BTN), TRUE);
|
||||||
|
|
||||||
SendMessageW(custInfo->tbHwnd, TB_DELETEBUTTON, nIndexFrom, 0);
|
SendMessageW(custInfo->tbHwnd, TB_DELETEBUTTON, nIndexFrom, 0);
|
||||||
SendMessageW(custInfo->tbHwnd, TB_INSERTBUTTONA, nIndexTo, (LPARAM)&(btnInfo->btn));
|
SendMessageW(custInfo->tbHwnd, TB_INSERTBUTTONW, nIndexTo, (LPARAM)&(btnInfo->btn));
|
||||||
|
|
||||||
TOOLBAR_SendNotify(&hdr, custInfo->tbInfo, TBN_TOOLBARCHANGE);
|
TOOLBAR_SendNotify(&hdr, custInfo->tbInfo, TBN_TOOLBARCHANGE);
|
||||||
}
|
}
|
||||||
|
@ -1991,19 +1991,13 @@ static LRESULT TOOLBAR_Cust_AvailDragListNotification(PCUSTDLG_INFO custInfo, HW
|
||||||
switch (pDLI->uNotification)
|
switch (pDLI->uNotification)
|
||||||
{
|
{
|
||||||
case DL_BEGINDRAG:
|
case DL_BEGINDRAG:
|
||||||
{
|
|
||||||
INT nCurrentItem = LBItemFromPt(hwndList, pDLI->ptCursor, TRUE);
|
|
||||||
INT nCount = SendMessageW(hwndList, LB_GETCOUNT, 0, 0);
|
|
||||||
/* no dragging for last item (separator) */
|
|
||||||
if (nCurrentItem >= (nCount - 1)) return FALSE;
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
|
||||||
case DL_DRAGGING:
|
case DL_DRAGGING:
|
||||||
{
|
{
|
||||||
INT nCurrentItem = LBItemFromPt(hwndList, pDLI->ptCursor, TRUE);
|
INT nCurrentItem = LBItemFromPt(hwndList, pDLI->ptCursor, TRUE);
|
||||||
INT nCount = SendMessageW(hwndList, LB_GETCOUNT, 0, 0);
|
INT nCount = SendMessageW(hwndList, LB_GETCOUNT, 0, 0);
|
||||||
/* no dragging past last item (separator) */
|
/* no dragging past last item (separator) */
|
||||||
if ((nCurrentItem >= 0) && (nCurrentItem < (nCount - 1)))
|
if ((nCurrentItem >= 0) && (nCurrentItem < nCount))
|
||||||
{
|
{
|
||||||
DrawInsert(hwnd, hwndList, nCurrentItem);
|
DrawInsert(hwnd, hwndList, nCurrentItem);
|
||||||
/* FIXME: native uses "move button" cursor */
|
/* FIXME: native uses "move button" cursor */
|
||||||
|
@ -2030,7 +2024,7 @@ static LRESULT TOOLBAR_Cust_AvailDragListNotification(PCUSTDLG_INFO custInfo, HW
|
||||||
INT nIndexTo = LBItemFromPt(hwndList, pDLI->ptCursor, TRUE);
|
INT nIndexTo = LBItemFromPt(hwndList, pDLI->ptCursor, TRUE);
|
||||||
INT nCount = SendMessageW(hwndList, LB_GETCOUNT, 0, 0);
|
INT nCount = SendMessageW(hwndList, LB_GETCOUNT, 0, 0);
|
||||||
INT nIndexFrom = SendDlgItemMessageW(hwnd, IDC_AVAILBTN_LBOX, LB_GETCURSEL, 0, 0);
|
INT nIndexFrom = SendDlgItemMessageW(hwnd, IDC_AVAILBTN_LBOX, LB_GETCURSEL, 0, 0);
|
||||||
if ((nIndexTo >= 0) && (nIndexTo < (nCount - 1)))
|
if ((nIndexTo >= 0) && (nIndexTo < nCount))
|
||||||
{
|
{
|
||||||
/* clear drag arrow */
|
/* clear drag arrow */
|
||||||
DrawInsert(hwnd, hwndList, -1);
|
DrawInsert(hwnd, hwndList, -1);
|
||||||
|
@ -2102,11 +2096,11 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
/* send TBN_QUERYDELETE notification */
|
/* send TBN_QUERYDELETE notification */
|
||||||
btnInfo->bRemovable = TOOLBAR_IsButtonRemovable(infoPtr, i, btnInfo);
|
btnInfo->bRemovable = TOOLBAR_IsButtonRemovable(infoPtr, i, btnInfo);
|
||||||
|
|
||||||
index = (int)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, 0);
|
index = (int)SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, 0);
|
||||||
SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
|
SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMHEIGHT, 0, infoPtr->nBitmapHeight + 8);
|
SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMHEIGHT, 0, infoPtr->nBitmapHeight + 8);
|
||||||
|
|
||||||
/* insert separator button into 'available buttons' list */
|
/* insert separator button into 'available buttons' list */
|
||||||
btnInfo = (PCUSTOMBUTTON)Alloc(sizeof(CUSTOMBUTTON));
|
btnInfo = (PCUSTOMBUTTON)Alloc(sizeof(CUSTOMBUTTON));
|
||||||
|
@ -2115,8 +2109,8 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
btnInfo->bVirtual = FALSE;
|
btnInfo->bVirtual = FALSE;
|
||||||
btnInfo->bRemovable = TRUE;
|
btnInfo->bRemovable = TRUE;
|
||||||
LoadStringW (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
|
LoadStringW (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
|
||||||
index = (int)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)btnInfo);
|
index = (int)SendDlgItemMessageW (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)btnInfo);
|
||||||
SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
|
SendDlgItemMessageW (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
|
||||||
|
|
||||||
/* insert all buttons into dsa */
|
/* insert all buttons into dsa */
|
||||||
for (i = 0;; i++)
|
for (i = 0;; i++)
|
||||||
|
@ -2150,7 +2144,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd,
|
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageW (hwnd,
|
||||||
IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
|
IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2171,10 +2165,10 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
TOOLBAR_Cust_InsertAvailButton(hwnd, btnInfo);
|
TOOLBAR_Cust_InsertAvailButton(hwnd, btnInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMHEIGHT, 0, infoPtr->nBitmapHeight + 8);
|
SendDlgItemMessageW (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMHEIGHT, 0, infoPtr->nBitmapHeight + 8);
|
||||||
|
|
||||||
/* select first item in the 'available' list */
|
/* select first item in the 'available' list */
|
||||||
SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETCURSEL, 0, 0);
|
SendDlgItemMessageW (hwnd, IDC_AVAILBTN_LBOX, LB_SETCURSEL, 0, 0);
|
||||||
|
|
||||||
/* append 'virtual' separator button to the 'toolbar buttons' list */
|
/* append 'virtual' separator button to the 'toolbar buttons' list */
|
||||||
btnInfo = (PCUSTOMBUTTON)Alloc(sizeof(CUSTOMBUTTON));
|
btnInfo = (PCUSTOMBUTTON)Alloc(sizeof(CUSTOMBUTTON));
|
||||||
|
@ -2183,12 +2177,12 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
btnInfo->bVirtual = TRUE;
|
btnInfo->bVirtual = TRUE;
|
||||||
btnInfo->bRemovable = FALSE;
|
btnInfo->bRemovable = FALSE;
|
||||||
LoadStringW (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
|
LoadStringW (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
|
||||||
index = (int)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)btnInfo);
|
index = (int)SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)btnInfo);
|
||||||
SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
|
SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
|
||||||
|
|
||||||
/* select last item in the 'toolbar' list */
|
/* select last item in the 'toolbar' list */
|
||||||
SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index, 0);
|
SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index, 0);
|
||||||
SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETTOPINDEX, index, 0);
|
SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETTOPINDEX, index, 0);
|
||||||
|
|
||||||
MakeDragList(GetDlgItem(hwnd, IDC_TOOLBARBTN_LBOX));
|
MakeDragList(GetDlgItem(hwnd, IDC_TOOLBARBTN_LBOX));
|
||||||
MakeDragList(GetDlgItem(hwnd, IDC_AVAILBTN_LBOX));
|
MakeDragList(GetDlgItem(hwnd, IDC_AVAILBTN_LBOX));
|
||||||
|
@ -2220,8 +2214,8 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
int count;
|
int count;
|
||||||
int index;
|
int index;
|
||||||
|
|
||||||
count = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
|
count = SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
|
||||||
index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
|
index = SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
|
||||||
|
|
||||||
/* send TBN_QUERYINSERT notification */
|
/* send TBN_QUERYINSERT notification */
|
||||||
nmtb.iItem = index;
|
nmtb.iItem = index;
|
||||||
|
@ -2229,7 +2223,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
TBN_QUERYINSERT);
|
TBN_QUERYINSERT);
|
||||||
|
|
||||||
/* get list box item */
|
/* get list box item */
|
||||||
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
|
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
|
||||||
|
|
||||||
if (index == (count - 1))
|
if (index == (count - 1))
|
||||||
{
|
{
|
||||||
|
@ -2261,21 +2255,21 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
|
|
||||||
case IDC_MOVEUP_BTN:
|
case IDC_MOVEUP_BTN:
|
||||||
{
|
{
|
||||||
int index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
|
int index = SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
|
||||||
TOOLBAR_Cust_MoveButton(custInfo, hwnd, index, index-1);
|
TOOLBAR_Cust_MoveButton(custInfo, hwnd, index, index-1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_MOVEDN_BTN: /* move down */
|
case IDC_MOVEDN_BTN: /* move down */
|
||||||
{
|
{
|
||||||
int index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
|
int index = SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
|
||||||
TOOLBAR_Cust_MoveButton(custInfo, hwnd, index, index+1);
|
TOOLBAR_Cust_MoveButton(custInfo, hwnd, index, index+1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_REMOVE_BTN: /* remove button */
|
case IDC_REMOVE_BTN: /* remove button */
|
||||||
{
|
{
|
||||||
int index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
|
int index = SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
|
||||||
|
|
||||||
if (LB_ERR == index)
|
if (LB_ERR == index)
|
||||||
break;
|
break;
|
||||||
|
@ -2295,8 +2289,8 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
int index;
|
int index;
|
||||||
int indexto;
|
int indexto;
|
||||||
|
|
||||||
index = SendDlgItemMessageA(hwnd, IDC_AVAILBTN_LBOX, LB_GETCURSEL, 0, 0);
|
index = SendDlgItemMessageW(hwnd, IDC_AVAILBTN_LBOX, LB_GETCURSEL, 0, 0);
|
||||||
indexto = SendDlgItemMessageA(hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
|
indexto = SendDlgItemMessageW(hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
|
||||||
|
|
||||||
TOOLBAR_Cust_AddButton(custInfo, hwnd, index, indexto);
|
TOOLBAR_Cust_AddButton(custInfo, hwnd, index, indexto);
|
||||||
}
|
}
|
||||||
|
@ -2314,25 +2308,25 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* delete items from 'toolbar buttons' listbox*/
|
/* delete items from 'toolbar buttons' listbox*/
|
||||||
count = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
|
count = SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
|
||||||
for (i = 0; i < count; i++)
|
for (i = 0; i < count; i++)
|
||||||
{
|
{
|
||||||
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, i, 0);
|
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, i, 0);
|
||||||
Free(btnInfo);
|
Free(btnInfo);
|
||||||
SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, 0, 0);
|
SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, 0, 0);
|
||||||
}
|
}
|
||||||
SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_RESETCONTENT, 0, 0);
|
SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_RESETCONTENT, 0, 0);
|
||||||
|
|
||||||
|
|
||||||
/* delete items from 'available buttons' listbox*/
|
/* delete items from 'available buttons' listbox*/
|
||||||
count = SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETCOUNT, 0, 0);
|
count = SendDlgItemMessageW (hwnd, IDC_AVAILBTN_LBOX, LB_GETCOUNT, 0, 0);
|
||||||
for (i = 0; i < count; i++)
|
for (i = 0; i < count; i++)
|
||||||
{
|
{
|
||||||
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETITEMDATA, i, 0);
|
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageW (hwnd, IDC_AVAILBTN_LBOX, LB_GETITEMDATA, i, 0);
|
||||||
Free(btnInfo);
|
Free(btnInfo);
|
||||||
SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, i, 0);
|
SendDlgItemMessageW (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, i, 0);
|
||||||
}
|
}
|
||||||
SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_RESETCONTENT, 0, 0);
|
SendDlgItemMessageW (hwnd, IDC_AVAILBTN_LBOX, LB_RESETCONTENT, 0, 0);
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
|
@ -2348,7 +2342,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
COLORREF oldBk = 0;
|
COLORREF oldBk = 0;
|
||||||
|
|
||||||
/* get item data */
|
/* get item data */
|
||||||
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, wParam, LB_GETITEMDATA, (WPARAM)lpdis->itemID, 0);
|
btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageW (hwnd, wParam, LB_GETITEMDATA, (WPARAM)lpdis->itemID, 0);
|
||||||
if (btnInfo == NULL)
|
if (btnInfo == NULL)
|
||||||
{
|
{
|
||||||
FIXME("btnInfo invalid!\n");
|
FIXME("btnInfo invalid!\n");
|
||||||
|
@ -3168,16 +3162,16 @@ TOOLBAR_Customize (HWND hwnd)
|
||||||
TOOLBAR_SendNotify ((NMHDR *) &nmhdr, infoPtr,
|
TOOLBAR_SendNotify ((NMHDR *) &nmhdr, infoPtr,
|
||||||
TBN_BEGINADJUST);
|
TBN_BEGINADJUST);
|
||||||
|
|
||||||
if (!(hRes = FindResourceA (COMCTL32_hModule,
|
if (!(hRes = FindResourceW (COMCTL32_hModule,
|
||||||
MAKEINTRESOURCEA(IDD_TBCUSTOMIZE),
|
MAKEINTRESOURCEW(IDD_TBCUSTOMIZE),
|
||||||
(LPSTR)RT_DIALOG)))
|
(LPWSTR)RT_DIALOG)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if(!(template = (LPVOID)LoadResource (COMCTL32_hModule, hRes)))
|
if(!(template = (LPVOID)LoadResource (COMCTL32_hModule, hRes)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
ret = DialogBoxIndirectParamA ((HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE),
|
ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE),
|
||||||
(LPDLGTEMPLATEA)template,
|
(LPDLGTEMPLATEW)template,
|
||||||
hwnd,
|
hwnd,
|
||||||
TOOLBAR_CustomizeDialogProc,
|
TOOLBAR_CustomizeDialogProc,
|
||||||
(LPARAM)&custInfo);
|
(LPARAM)&custInfo);
|
||||||
|
@ -3733,7 +3727,7 @@ TOOLBAR_GetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
|
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
|
||||||
|
|
||||||
TRACE("%s hwnd=%p stub!\n",
|
TRACE("%s hwnd=%p\n",
|
||||||
infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
|
infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
|
||||||
|
|
||||||
return infoPtr->bUnicode;
|
return infoPtr->bUnicode;
|
||||||
|
@ -5104,7 +5098,7 @@ TOOLBAR_SetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
|
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
|
||||||
BOOL bTemp;
|
BOOL bTemp;
|
||||||
|
|
||||||
TRACE("%s hwnd=%p stub!\n",
|
TRACE("%s hwnd=%p\n",
|
||||||
((BOOL)wParam) ? "TRUE" : "FALSE", hwnd);
|
((BOOL)wParam) ? "TRUE" : "FALSE", hwnd);
|
||||||
|
|
||||||
bTemp = infoPtr->bUnicode;
|
bTemp = infoPtr->bUnicode;
|
||||||
|
@ -5361,12 +5355,12 @@ TOOLBAR_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
infoPtr->nNumStrings = 0;
|
infoPtr->nNumStrings = 0;
|
||||||
|
|
||||||
infoPtr->bCaptured = FALSE;
|
infoPtr->bCaptured = FALSE;
|
||||||
infoPtr->bUnicode = IsWindowUnicode (hwnd);
|
|
||||||
infoPtr->nButtonDown = -1;
|
infoPtr->nButtonDown = -1;
|
||||||
infoPtr->nButtonDrag = -1;
|
infoPtr->nButtonDrag = -1;
|
||||||
infoPtr->nOldHit = -1;
|
infoPtr->nOldHit = -1;
|
||||||
infoPtr->nHotItem = -1;
|
infoPtr->nHotItem = -1;
|
||||||
infoPtr->hwndNotify = ((LPCREATESTRUCTW)lParam)->hwndParent;
|
infoPtr->hwndNotify = ((LPCREATESTRUCTW)lParam)->hwndParent;
|
||||||
|
infoPtr->bUnicode = IsWindowUnicode (infoPtr->hwndNotify);
|
||||||
infoPtr->bBtnTranspnt = (dwStyle & (TBSTYLE_FLAT | TBSTYLE_LIST));
|
infoPtr->bBtnTranspnt = (dwStyle & (TBSTYLE_FLAT | TBSTYLE_LIST));
|
||||||
infoPtr->dwDTFlags = (dwStyle & TBSTYLE_LIST) ? DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS: DT_CENTER | DT_END_ELLIPSIS;
|
infoPtr->dwDTFlags = (dwStyle & TBSTYLE_LIST) ? DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS: DT_CENTER | DT_END_ELLIPSIS;
|
||||||
infoPtr->bAnchor = FALSE; /* no anchor highlighting */
|
infoPtr->bAnchor = FALSE; /* no anchor highlighting */
|
||||||
|
|
Loading…
Reference in New Issue