Akihiro Sagawa : comdlg32: Apply 3D effects to sample text area.
Alexandre Julliard
julliard at winehq.org
Tue Feb 14 13:23:33 CST 2012
Module: wine
Branch: master
Commit: 0352a7089cfbea4ef68da89e2616a62e0920f2be
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0352a7089cfbea4ef68da89e2616a62e0920f2be
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date: Tue Feb 14 23:38:14 2012 +0900
comdlg32: Apply 3D effects to sample text area.
---
dlls/comdlg32/comdlg32.rc | 2 +-
dlls/comdlg32/fontdlg.c | 16 +---------------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc
index d1f95b5..13c544a 100644
--- a/dlls/comdlg32/comdlg32.rc
+++ b/dlls/comdlg32/comdlg32.rc
@@ -264,7 +264,7 @@ FONT 8, "MS Shell Dlg"
COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP
- CTEXT "",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE
LTEXT "Scr&ipt:",stc7 ,98,114,40,9
COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c
index 8068e82..c081e91 100644
--- a/dlls/comdlg32/fontdlg.c
+++ b/dlls/comdlg32/fontdlg.c
@@ -1115,7 +1115,6 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE
{
PAINTSTRUCT ps;
HDC hdc;
- HPEN hOrigPen;
HFONT hOrigFont;
LOGFONTW lf = *(lpcf->lpLogFont);
@@ -1127,22 +1126,9 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE
ps.rcPaint.right, ps.rcPaint.bottom);
/* Paint frame */
- MoveToEx( hdc, info.rcWindow.left, info.rcWindow.bottom, NULL );
- hOrigPen=SelectObject( hdc, CreatePen( PS_SOLID, 2,
- GetSysColor( COLOR_3DSHADOW ) ));
- LineTo( hdc, info.rcWindow.left, info.rcWindow.top );
- LineTo( hdc, info.rcWindow.right, info.rcWindow.top );
- DeleteObject(SelectObject( hdc, CreatePen( PS_SOLID, 2,
- GetSysColor( COLOR_3DLIGHT ) )));
- LineTo( hdc, info.rcWindow.right, info.rcWindow.bottom );
- LineTo( hdc, info.rcWindow.left, info.rcWindow.bottom );
- DeleteObject(SelectObject( hdc, hOrigPen ));
+ DrawEdge( hdc, &info.rcWindow, EDGE_SUNKEN, BF_RECT|BF_ADJUST );
/* Draw the sample text itself */
- info.rcWindow.right--;
- info.rcWindow.bottom--;
- info.rcWindow.top++;
- info.rcWindow.left++;
hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) );
SetTextColor( hdc, lpcf->rgbColors );
More information about the wine-cvs
mailing list