mirror of
https://github.com/reactos/reactos.git
synced 2025-08-03 22:56:00 +00:00
Sync to Wine-0_9_4:
Eric Pouech <eric.pouech@wanadoo.fr> - Const correctness fixes. - Removed some dead-code. svn path=/trunk/; revision=20346
This commit is contained in:
parent
5fccaf46f0
commit
74ab94870a
2 changed files with 2 additions and 3 deletions
|
@ -385,7 +385,7 @@ static HWND COMDLG32_FR_DoFindReplace(
|
||||||
hmod = (HMODULE)pdata->fr.hInstance;
|
hmod = (HMODULE)pdata->fr.hInstance;
|
||||||
if(pdata->fr.Flags & FR_WINE_UNICODE)
|
if(pdata->fr.Flags & FR_WINE_UNICODE)
|
||||||
{
|
{
|
||||||
htemplate = FindResourceW(hmod, (LPWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG);
|
htemplate = FindResourceW(hmod, (LPCWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -1076,7 +1076,6 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcf)
|
||||||
HDC hdc;
|
HDC hdc;
|
||||||
HPEN hOrigPen;
|
HPEN hOrigPen;
|
||||||
HFONT hOrigFont;
|
HFONT hOrigFont;
|
||||||
COLORREF rgbPrev;
|
|
||||||
LOGFONTW lf = *(lpcf->lpLogFont);
|
LOGFONTW lf = *(lpcf->lpLogFont);
|
||||||
|
|
||||||
MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2);
|
MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2);
|
||||||
|
@ -1104,7 +1103,7 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcf)
|
||||||
info.rcWindow.top++;
|
info.rcWindow.top++;
|
||||||
info.rcWindow.left++;
|
info.rcWindow.left++;
|
||||||
hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) );
|
hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) );
|
||||||
rgbPrev=SetTextColor( hdc, lpcf->rgbColors );
|
SetTextColor( hdc, lpcf->rgbColors );
|
||||||
|
|
||||||
DrawTextW( hdc,
|
DrawTextW( hdc,
|
||||||
sample_lang_text[CHARSET_ORDER[lpcf->lpLogFont->lfCharSet]],
|
sample_lang_text[CHARSET_ORDER[lpcf->lpLogFont->lfCharSet]],
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue