From b0622101b66d5c69d523425df764fb96312c92cc Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 10 Dec 2003 04:14:35 +0000 Subject: [PATCH] System classes must not have the CS_GLOBALCLASS style. --- controls/button.c | 2 +- controls/combo.c | 2 +- controls/desktop.c | 2 +- controls/edit.c | 2 +- controls/icontitle.c | 2 +- controls/listbox.c | 4 ++-- controls/menu.c | 2 +- controls/scroll.c | 2 +- controls/static.c | 2 +- windows/dialog.c | 2 +- windows/mdi.c | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/controls/button.c b/controls/button.c index ec63309436c..f778ce466df 100644 --- a/controls/button.c +++ b/controls/button.c @@ -104,7 +104,7 @@ static WORD checkBoxWidth = 0, checkBoxHeight = 0; const struct builtin_class_descr BUTTON_builtin_class = { "Button", /* name */ - CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ + CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ ButtonWndProcA, /* procA */ ButtonWndProcW, /* procW */ NB_EXTRA_BYTES, /* extra */ diff --git a/controls/combo.c b/controls/combo.c index 9ec0dff2ae7..75c7ef89184 100644 --- a/controls/combo.c +++ b/controls/combo.c @@ -83,7 +83,7 @@ static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM const struct builtin_class_descr COMBO_builtin_class = { "ComboBox", /* name */ - CS_GLOBALCLASS | CS_PARENTDC | CS_DBLCLKS, /* style */ + CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */ ComboWndProcA, /* procA */ ComboWndProcW, /* procW */ sizeof(HEADCOMBO *), /* extra */ diff --git a/controls/desktop.c b/controls/desktop.c index 10fc475241c..24a80522263 100644 --- a/controls/desktop.c +++ b/controls/desktop.c @@ -48,7 +48,7 @@ static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LP const struct builtin_class_descr DESKTOP_builtin_class = { DESKTOP_CLASS_ATOM, /* name */ - CS_GLOBALCLASS, /* style */ + CS_DBLCLKS, /* style */ NULL, /* procA (winproc is Unicode only) */ DesktopWndProc, /* procW */ 0, /* extra */ diff --git a/controls/edit.c b/controls/edit.c index e95929977cf..2eac5a4e004 100644 --- a/controls/edit.c +++ b/controls/edit.c @@ -285,7 +285,7 @@ LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); const struct builtin_class_descr EDIT_builtin_class = { "Edit", /* name */ - CS_GLOBALCLASS | CS_DBLCLKS | CS_PARENTDC, /* style */ + CS_DBLCLKS | CS_PARENTDC, /* style */ EditWndProcA, /* procA */ EditWndProcW, /* procW */ sizeof(EDITSTATE *), /* extra */ diff --git a/controls/icontitle.c b/controls/icontitle.c index 44173cd71db..9f89c4e29c6 100644 --- a/controls/icontitle.c +++ b/controls/icontitle.c @@ -47,7 +47,7 @@ static LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPAR const struct builtin_class_descr ICONTITLE_builtin_class = { ICONTITLE_CLASS_ATOM, /* name */ - CS_GLOBALCLASS, /* style */ + 0, /* style */ NULL, /* procA (winproc is Unicode only) */ IconTitleWndProc, /* procW */ 0, /* extra */ diff --git a/controls/listbox.c b/controls/listbox.c index 3f807e30b67..d72ecc334d3 100644 --- a/controls/listbox.c +++ b/controls/listbox.c @@ -139,7 +139,7 @@ static LRESULT LISTBOX_GetItemRect( LB_DESCR *descr, INT index, RECT *rect ); const struct builtin_class_descr LISTBOX_builtin_class = { "ListBox", /* name */ - CS_GLOBALCLASS | CS_DBLCLKS /*| CS_PARENTDC*/, /* style */ + CS_DBLCLKS /*| CS_PARENTDC*/, /* style */ ListBoxWndProcA, /* procA */ ListBoxWndProcW, /* procW */ sizeof(LB_DESCR *), /* extra */ @@ -154,7 +154,7 @@ const struct builtin_class_descr LISTBOX_builtin_class = const struct builtin_class_descr COMBOLBOX_builtin_class = { "ComboLBox", /* name */ - CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS, /* style */ + CS_DBLCLKS | CS_SAVEBITS, /* style */ ComboLBWndProcA, /* procA */ ComboLBWndProcW, /* procW */ sizeof(LB_DESCR *), /* extra */ diff --git a/controls/menu.c b/controls/menu.c index 52c43c1feac..24bb79653c7 100644 --- a/controls/menu.c +++ b/controls/menu.c @@ -184,7 +184,7 @@ DWORD WINAPI DrawMenuBarTemp(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFO const struct builtin_class_descr MENU_builtin_class = { POPUPMENU_CLASS_ATOMA, /* name */ - CS_GLOBALCLASS | CS_SAVEBITS, /* style */ + CS_DROPSHADOW | CS_SAVEBITS | CS_DBLCLKS, /* style */ NULL, /* procA (winproc is Unicode only) */ PopupMenuWndProc, /* procW */ sizeof(HMENU), /* extra */ diff --git a/controls/scroll.c b/controls/scroll.c index 5c87c2d437b..036fe62e7bd 100644 --- a/controls/scroll.c +++ b/controls/scroll.c @@ -132,7 +132,7 @@ static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPA const struct builtin_class_descr SCROLL_builtin_class = { "ScrollBar", /* name */ - CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ + CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ NULL, /* procA (winproc is Unicode only) */ ScrollBarWndProc, /* procW */ sizeof(SCROLLBAR_INFO), /* extra */ diff --git a/controls/static.c b/controls/static.c index c020d4c339b..f185e1eb900 100644 --- a/controls/static.c +++ b/controls/static.c @@ -80,7 +80,7 @@ static pfPaint staticPaintFunc[SS_TYPEMASK+1] = const struct builtin_class_descr STATIC_builtin_class = { "Static", /* name */ - CS_GLOBALCLASS | CS_DBLCLKS | CS_PARENTDC, /* style */ + CS_DBLCLKS | CS_PARENTDC, /* style */ StaticWndProcA, /* procA */ StaticWndProcW, /* procW */ STATIC_EXTRA_BYTES, /* extra */ diff --git a/windows/dialog.c b/windows/dialog.c index 11af59bb306..572a2eebccc 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -97,7 +97,7 @@ typedef struct const struct builtin_class_descr DIALOG_builtin_class = { DIALOG_CLASS_ATOMA, /* name */ - CS_GLOBALCLASS | CS_SAVEBITS | CS_DBLCLKS, /* style */ + CS_SAVEBITS | CS_DBLCLKS, /* style */ DefDlgProcA, /* procA */ DefDlgProcW, /* procW */ DLGWINDOWEXTRA, /* extra */ diff --git a/windows/mdi.c b/windows/mdi.c index 8661587f627..c3904f43e18 100644 --- a/windows/mdi.c +++ b/windows/mdi.c @@ -182,7 +182,7 @@ static void MDI_PostUpdate(HWND hwnd, MDICLIENTINFO* ci, WORD recalc) const struct builtin_class_descr MDICLIENT_builtin_class = { "MDIClient", /* name */ - CS_GLOBALCLASS, /* style */ + 0, /* style */ MDIClientWndProcA, /* procA */ MDIClientWndProcW, /* procW */ sizeof(MDICLIENTINFO), /* extra */