mirror of
https://github.com/reactos/reactos.git
synced 2024-07-08 13:45:06 +00:00
exchange members for ansi and unicode WNDPROC in builtin_class_descr. Reduces diff to wine a bit more.
svn path=/trunk/; revision=38713
This commit is contained in:
Timo Kreuzer
parent
f51273a2eb
commit
27521056a9
|
|
@ -150,23 +150,13 @@ static WORD checkBoxWidth = 0, checkBoxHeight = 0;
|
|||
*/
|
||||
const struct builtin_class_descr BUTTON_builtin_class =
|
||||
{
|
||||
#ifdef __REACTOS__
|
||||
L"Button", /* name */
|
||||
CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */
|
||||
ButtonWndProcW, /* procW */
|
||||
ButtonWndProcA, /* procA */
|
||||
NB_EXTRA_BYTES, /* extra */
|
||||
(LPWSTR)IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#else
|
||||
"Button", /* name */
|
||||
CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */
|
||||
ButtonWndProcA, /* procA */
|
||||
ButtonWndProcW, /* procW */
|
||||
NB_EXTRA_BYTES, /* extra */
|
||||
IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -82,23 +82,13 @@ static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM
|
|||
*/
|
||||
const struct builtin_class_descr COMBO_builtin_class =
|
||||
{
|
||||
#ifdef __REACTOS__
|
||||
L"ComboBox", /* name */
|
||||
CS_PARENTDC | CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS, /* style */
|
||||
(WNDPROC) ComboWndProcW, /* procW */
|
||||
(WNDPROC) ComboWndProcA, /* procA */
|
||||
sizeof(HEADCOMBO *), /* extra */
|
||||
(LPCWSTR) IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#else
|
||||
"ComboBox", /* name */
|
||||
CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */
|
||||
ComboWndProcA, /* procA */
|
||||
ComboWndProcW, /* procW */
|
||||
sizeof(HEADCOMBO *), /* extra */
|
||||
IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -295,23 +295,13 @@ LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
|||
*/
|
||||
const struct builtin_class_descr EDIT_builtin_class =
|
||||
{
|
||||
#ifdef __REACTOS__
|
||||
L"Edit", /* name */
|
||||
CS_DBLCLKS | CS_PARENTDC, /* style */
|
||||
(WNDPROC)EditWndProcW, /* procW */
|
||||
(WNDPROC)EditWndProcA, /* procA */
|
||||
sizeof(EDITSTATE *), /* extra */
|
||||
(LPWSTR)IDC_IBEAM, /* cursor */
|
||||
0 /* brush */
|
||||
#else
|
||||
"Edit", /* name */
|
||||
CS_DBLCLKS | CS_PARENTDC, /* style */
|
||||
EditWndProcA, /* procA */
|
||||
EditWndProcW, /* procW */
|
||||
sizeof(EDITSTATE *), /* extra */
|
||||
IDC_IBEAM, /* cursor */
|
||||
0 /* brush */
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -37,15 +37,6 @@ static LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPAR
|
|||
*/
|
||||
const struct builtin_class_descr ICONTITLE_builtin_class =
|
||||
{
|
||||
#ifdef __REACTOS__
|
||||
ICONTITLE_CLASS_ATOM, /* name */
|
||||
0, /* style */
|
||||
IconTitleWndProc, /* procW */
|
||||
NULL, /* procA (winproc is Unicode only) */
|
||||
0, /* extra */
|
||||
IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#else
|
||||
ICONTITLE_CLASS_ATOM, /* name */
|
||||
0, /* style */
|
||||
NULL, /* procA (winproc is Unicode only) */
|
||||
|
|
@ -53,7 +44,6 @@ const struct builtin_class_descr ICONTITLE_builtin_class =
|
|||
0, /* extra */
|
||||
IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -149,23 +149,13 @@ static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect
|
|||
*/
|
||||
const struct builtin_class_descr LISTBOX_builtin_class =
|
||||
{
|
||||
#ifdef __REACTOS__
|
||||
L"ListBox", /* name */
|
||||
CS_DBLCLKS /*| CS_PARENTDC*/, /* style */
|
||||
(WNDPROC)ListBoxWndProcW, /* procW */
|
||||
(WNDPROC)ListBoxWndProcA, /* procA */
|
||||
sizeof(LB_DESCR *), /* extra */
|
||||
(LPCWSTR) IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#else
|
||||
"ListBox", /* name */
|
||||
CS_DBLCLKS /*| CS_PARENTDC*/, /* style */
|
||||
ListBoxWndProcA, /* procA */
|
||||
ListBoxWndProcW, /* procW */
|
||||
sizeof(LB_DESCR *), /* extra */
|
||||
IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -174,23 +164,13 @@ const struct builtin_class_descr LISTBOX_builtin_class =
|
|||
*/
|
||||
const struct builtin_class_descr COMBOLBOX_builtin_class =
|
||||
{
|
||||
#ifdef __REACTOS__
|
||||
L"ComboLBox", /* name */
|
||||
CS_DBLCLKS | CS_SAVEBITS, /* style */
|
||||
(WNDPROC)ListBoxWndProcW, /* procW */
|
||||
(WNDPROC)ListBoxWndProcA, /* procA */
|
||||
sizeof(LB_DESCR *), /* extra */
|
||||
(LPCWSTR) IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#else
|
||||
"ComboLBox", /* name */
|
||||
CS_DBLCLKS | CS_SAVEBITS, /* style */
|
||||
ListBoxWndProcA, /* procA */
|
||||
ListBoxWndProcW, /* procW */
|
||||
sizeof(LB_DESCR *), /* extra */
|
||||
IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifndef __REACTOS__
|
||||
|
|
|
|||
|
|
@ -82,8 +82,8 @@ const struct builtin_class_descr SCROLL_builtin_class =
|
|||
{
|
||||
L"ScrollBar", /* name */
|
||||
CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */
|
||||
ScrollBarWndProcW, /* procW */
|
||||
ScrollBarWndProcA, /* procA */
|
||||
ScrollBarWndProcW, /* procW */
|
||||
0, /* extra */
|
||||
IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
|
|
|
|||
|
|
@ -97,23 +97,13 @@ static pfPaint staticPaintFunc[SS_TYPEMASK+1] =
|
|||
*/
|
||||
const struct builtin_class_descr STATIC_builtin_class =
|
||||
{
|
||||
#ifdef __REACTOS__
|
||||
L"Static", /* name */
|
||||
CS_DBLCLKS | CS_PARENTDC, /* style */
|
||||
(WNDPROC) StaticWndProcW, /* procW */
|
||||
(WNDPROC) StaticWndProcA, /* procA */
|
||||
STATIC_EXTRA_BYTES, /* extra */
|
||||
(LPCWSTR) IDC_ARROW, /* cursor */ /* FIXME Wine uses IDC_ARROWA */
|
||||
0 /* brush */
|
||||
#else
|
||||
"Static", /* name */
|
||||
CS_DBLCLKS | CS_PARENTDC, /* style */
|
||||
StaticWndProcA, /* procA */
|
||||
StaticWndProcW, /* procW */
|
||||
STATIC_EXTRA_BYTES, /* extra */
|
||||
IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
#endif
|
||||
};
|
||||
|
||||
static __inline void set_ui_state( HWND hwnd, LONG flags )
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ struct builtin_class_descr
|
|||
{
|
||||
LPCWSTR name; /* class name */
|
||||
UINT style; /* class style */
|
||||
WNDPROC procW; /* Unicode window procedure */
|
||||
WNDPROC procA; /* Ansi window procedure */
|
||||
WNDPROC procW; /* Unicode window procedure */
|
||||
INT extra; /* window extra bytes */
|
||||
LPCWSTR cursor; /* cursor name */
|
||||
HBRUSH brush; /* brush or system color */
|
||||
|
|
|
|||
|
|
@ -128,8 +128,8 @@ const struct builtin_class_descr DIALOG_builtin_class =
|
|||
{
|
||||
DIALOG_CLASS_ATOMW, /* name */
|
||||
CS_SAVEBITS | CS_DBLCLKS, /* style */
|
||||
(WNDPROC) DefDlgProcW, /* procW */
|
||||
(WNDPROC) DefDlgProcA, /* procA */
|
||||
(WNDPROC) DefDlgProcW, /* procW */
|
||||
DLGWINDOWEXTRA, /* extra */
|
||||
(LPCWSTR) IDC_ARROW, /* cursor */
|
||||
0 /* brush */
|
||||
|
|
|
|||
|
|
@ -203,8 +203,8 @@ const struct builtin_class_descr MDICLIENT_builtin_class =
|
|||
{
|
||||
L"MDIClient", /* name */
|
||||
0, /* style */
|
||||
MDIClientWndProcW, /* procW */
|
||||
MDIClientWndProcA, /* procA */
|
||||
MDIClientWndProcW, /* procW */
|
||||
sizeof(MDICLIENTINFO), /* extra */
|
||||
IDC_ARROW, /* cursor */
|
||||
(HBRUSH)(COLOR_APPWORKSPACE+1) /* brush */
|
||||
|
|
|
|||
|
|
@ -80,8 +80,8 @@ const struct builtin_class_descr POPUPMENU_builtin_class =
|
|||
{
|
||||
POPUPMENU_CLASS_ATOMW, /* name */
|
||||
CS_SAVEBITS | CS_DBLCLKS, /* style */
|
||||
(WNDPROC) PopupMenuWndProcW, /* FIXME - procW */
|
||||
(WNDPROC) NULL, /* FIXME - procA */
|
||||
(WNDPROC) PopupMenuWndProcW, /* FIXME - procW */
|
||||
sizeof(MENUINFO *), /* extra */
|
||||
(LPCWSTR) IDC_ARROW, /* cursor */
|
||||
(HBRUSH)(COLOR_MENU + 1) /* brush */
|
||||
|
|
|
|||
Loading…
Reference in a new issue