mirror of
https://github.com/reactos/reactos.git
synced 2024-07-05 12:15:46 +00:00
sync user32 button and static to wine 1.1.22
svn path=/trunk/; revision=41296
This commit is contained in:
Christoph von Wittich
parent
c071c35012
commit
342bd4f186
|
|
@ -330,6 +330,7 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg,
|
|||
{
|
||||
SendMessageW( hWnd, BM_SETSTATE, TRUE, 0 );
|
||||
set_button_state( hWnd, get_button_state( hWnd ) | BUTTON_BTNPRESSED );
|
||||
SetCapture( hWnd );
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*
|
||||
* NOTES
|
||||
*
|
||||
|
|
@ -68,7 +68,7 @@ static COLORREF color_3dshadow, color_3ddkshadow, color_3dhighlight;
|
|||
|
||||
typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style );
|
||||
|
||||
static pfPaint staticPaintFunc[SS_TYPEMASK+1] =
|
||||
static const pfPaint staticPaintFunc[SS_TYPEMASK+1] =
|
||||
{
|
||||
STATIC_PaintTextfn, /* SS_LEFT */
|
||||
STATIC_PaintTextfn, /* SS_CENTER */
|
||||
|
|
@ -95,9 +95,10 @@ static pfPaint staticPaintFunc[SS_TYPEMASK+1] =
|
|||
/*********************************************************************
|
||||
* static class descriptor
|
||||
*/
|
||||
static const WCHAR staticW[] = {'S','t','a','t','i','c',0};
|
||||
const struct builtin_class_descr STATIC_builtin_class =
|
||||
{
|
||||
L"Static", /* name */
|
||||
staticW, /* name */
|
||||
CS_DBLCLKS | CS_PARENTDC, /* style */
|
||||
StaticWndProcA, /* procA */
|
||||
StaticWndProcW, /* procW */
|
||||
|
|
@ -106,6 +107,7 @@ const struct builtin_class_descr STATIC_builtin_class =
|
|||
0 /* brush */
|
||||
};
|
||||
|
||||
/* REACTOS ONLY */
|
||||
static __inline void set_ui_state( HWND hwnd, LONG flags )
|
||||
{
|
||||
SetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET, flags );
|
||||
|
|
@ -116,6 +118,29 @@ static __inline LONG get_ui_state( HWND hwnd )
|
|||
return GetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET );
|
||||
}
|
||||
|
||||
/* Retrieve the UI state for the control */
|
||||
static BOOL STATIC_update_uistate(HWND hwnd, BOOL unicode)
|
||||
{
|
||||
LONG flags, prevflags;
|
||||
|
||||
if (unicode)
|
||||
flags = DefWindowProcW(hwnd, WM_QUERYUISTATE, 0, 0);
|
||||
else
|
||||
flags = DefWindowProcA(hwnd, WM_QUERYUISTATE, 0, 0);
|
||||
|
||||
prevflags = get_ui_state(hwnd);
|
||||
|
||||
if (prevflags != flags)
|
||||
{
|
||||
set_ui_state(hwnd, flags);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* END REACTOS ONLY */
|
||||
|
||||
static void setup_clipping(HWND hwnd, HDC hdc, HRGN *orig)
|
||||
{
|
||||
RECT rc;
|
||||
|
|
@ -144,27 +169,6 @@ static void restore_clipping(HDC hdc, HRGN hrgn)
|
|||
DeleteObject(hrgn);
|
||||
}
|
||||
|
||||
/* Retrieve the UI state for the control */
|
||||
static BOOL STATIC_update_uistate(HWND hwnd, BOOL unicode)
|
||||
{
|
||||
LONG flags, prevflags;
|
||||
|
||||
if (unicode)
|
||||
flags = DefWindowProcW(hwnd, WM_QUERYUISTATE, 0, 0);
|
||||
else
|
||||
flags = DefWindowProcA(hwnd, WM_QUERYUISTATE, 0, 0);
|
||||
|
||||
prevflags = get_ui_state(hwnd);
|
||||
|
||||
if (prevflags != flags)
|
||||
{
|
||||
set_ui_state(hwnd, flags);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* STATIC_SetIcon
|
||||
*
|
||||
|
|
@ -241,6 +245,7 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style )
|
|||
SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight,
|
||||
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
|
||||
}
|
||||
|
||||
}
|
||||
return hOldBitmap;
|
||||
}
|
||||
|
|
@ -306,7 +311,7 @@ static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name, DWORD style )
|
|||
/* Windows doesn't try to load a standard cursor,
|
||||
probably because most IDs for standard cursors conflict
|
||||
with the IDs for standard icons anyway */
|
||||
return hicon;
|
||||
return hicon;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -387,14 +392,14 @@ static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc)
|
|||
HBRUSH hBrush;
|
||||
HWND parent = GetParent(hwnd);
|
||||
|
||||
if(!parent) parent = hwnd;
|
||||
hBrush = (HBRUSH) SendMessageW( GetParent(hwnd),
|
||||
if (!parent) parent = hwnd;
|
||||
hBrush = (HBRUSH) SendMessageW( parent,
|
||||
WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd );
|
||||
if (!hBrush) /* did the app forget to call DefWindowProc ? */
|
||||
{
|
||||
/* FIXME: DefWindowProc should return different colors if a
|
||||
manifest is present */
|
||||
hBrush = (HBRUSH)DefWindowProcW(GetParent(hwnd), WM_CTLCOLORSTATIC,
|
||||
hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC,
|
||||
(WPARAM)hdc, (LPARAM)hwnd);
|
||||
}
|
||||
return hBrush;
|
||||
|
|
@ -622,7 +627,7 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam,
|
|||
lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style );
|
||||
break;
|
||||
default:
|
||||
FIXME("STM_SETIMAGE: Unhandled type %x\n", wParam);
|
||||
FIXME("STM_SETIMAGE: Unhandled type %lx\n", wParam);
|
||||
break;
|
||||
}
|
||||
STATIC_TryPaintFcn( hwnd, full_style );
|
||||
|
|
@ -701,7 +706,7 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style )
|
|||
RECT rc;
|
||||
HBRUSH hBrush;
|
||||
HFONT hFont, hOldFont = NULL;
|
||||
DWORD wFormat;
|
||||
WORD wFormat;
|
||||
INT len, buf_size;
|
||||
WCHAR *text;
|
||||
|
||||
|
|
@ -733,6 +738,9 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style )
|
|||
return;
|
||||
}
|
||||
|
||||
if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_RIGHT)
|
||||
wFormat = DT_RIGHT | (wFormat & ~(DT_LEFT | DT_CENTER));
|
||||
|
||||
if (style & SS_NOPREFIX)
|
||||
wFormat |= DT_NOPREFIX;
|
||||
else if (get_ui_state(hwnd) & UISF_HIDEACCEL)
|
||||
|
|
@ -753,7 +761,7 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style )
|
|||
}
|
||||
|
||||
if ((hFont = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET )))
|
||||
hOldFont = (HFONT)SelectObject( hdc, hFont );
|
||||
hOldFont = SelectObject( hdc, hFont );
|
||||
|
||||
/* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned
|
||||
brush is not used */
|
||||
|
|
@ -899,7 +907,7 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style )
|
|||
if (brush.lbStyle == BS_SOLID)
|
||||
SetBkColor(hdc, brush.lbColor);
|
||||
}
|
||||
GetClientRect(hwnd, &rcClient);
|
||||
GetClientRect(hwnd, &rcClient);
|
||||
if (style & SS_CENTERIMAGE)
|
||||
{
|
||||
INT x, y;
|
||||
|
|
@ -918,12 +926,6 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style )
|
|||
SelectObject(hMemDC, oldbitmap);
|
||||
DeleteDC(hMemDC);
|
||||
}
|
||||
else
|
||||
{
|
||||
RECT rcClient;
|
||||
GetClientRect( hwnd, &rcClient );
|
||||
FillRect( hdc, &rcClient, hbrush );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -221,13 +221,13 @@ snmpapi -
|
|||
reactos/dll/win32/snmpapi/main.c # Synced at 20090222
|
||||
|
||||
User32 -
|
||||
reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_13
|
||||
reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_22
|
||||
reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_13
|
||||
reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_13
|
||||
reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_13
|
||||
reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_13
|
||||
reactos/dll/win32/user32/controls/scrollbar.c # Forked
|
||||
reactos/dll/win32/user32/controls/static.c # Synced at 20071024
|
||||
reactos/dll/win32/user32/controls/static.c # Synced to Wine-1_1_22
|
||||
|
||||
reactos/dll/win32/user32/misc/dde.c # Synced to wine 1.1.17 (dde_misc.c)
|
||||
reactos/dll/win32/user32/misc/ddeclient.c # Synced to wine 1.1.17
|
||||
|
|
|
|||
Loading…
Reference in a new issue