comctl32/button: Merge theming logic.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/button: Merge theming logic.
f1cc2da2 · Nikolay Sivov · Alexandre Julliard · 2723e947 · f1cc2da2 · f1cc2da2
Commit f1cc2da2 authored Feb 11, 2018 by Nikolay Sivov Committed by Alexandre Julliard Feb 12, 2018
Showing with 0 additions and 8 deletions

Makefile.in dlls/comctl32/Makefile.in +0 -1

button.c dlls/comctl32/button.c +0 -0

theme_button.c dlls/comctl32/theme_button.c +0 -0

theming.c dlls/comctl32/theming.c +0 -7

No files found.
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -34,7 +34,6 @@ C_SRCS = \
 	syslink.c \
 	tab.c \
 	taskdialog.c \
-	theme_button.c \
 	theme_combo.c \
 	theme_dialog.c \
 	theme_listbox.c \

--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
--- a/dlls/comctl32/theme_button.c
+++ b/dlls/comctl32/theme_button.c
--- a/dlls/comctl32/theming.c
+++ b/dlls/comctl32/theming.c
@@ -34,14 +34,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(theming);
 typedef LRESULT (CALLBACK* THEMING_SUBCLASSPROC)(HWND, UINT, WPARAM, LPARAM,
    ULONG_PTR);

-extern LRESULT CALLBACK THEMING_ButtonSubclassProc (HWND, UINT, WPARAM, LPARAM,
-                                                    ULONG_PTR) DECLSPEC_HIDDEN;
 extern LRESULT CALLBACK THEMING_ComboSubclassProc (HWND, UINT, WPARAM, LPARAM,
                                                   ULONG_PTR) DECLSPEC_HIDDEN;
 extern LRESULT CALLBACK THEMING_DialogSubclassProc (HWND, UINT, WPARAM, LPARAM,
                                                    ULONG_PTR) DECLSPEC_HIDDEN;
-extern LRESULT CALLBACK THEMING_EditSubclassProc (HWND, UINT, WPARAM, LPARAM,
-                                                  ULONG_PTR) DECLSPEC_HIDDEN;
 extern LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND, UINT, WPARAM, LPARAM,
                                                     ULONG_PTR) DECLSPEC_HIDDEN;
 extern LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND, UINT, WPARAM, LPARAM,
@@ -57,7 +53,6 @@ static const struct ThemingSubclass
 } subclasses[] = {
    /* Note: list must be sorted by class name */
    {dialogClass,          THEMING_DialogSubclassProc},
-    {WC_BUTTONW,           THEMING_ButtonSubclassProc},
    {WC_COMBOBOXW,         THEMING_ComboSubclassProc},
    {comboLboxClass,       THEMING_ListBoxSubclassProc},
    {WC_LISTBOXW,          THEMING_ListBoxSubclassProc},
@@ -96,7 +91,6 @@ MAKE_SUBCLASS_PROC(1)
 MAKE_SUBCLASS_PROC(2)
 MAKE_SUBCLASS_PROC(3)
 MAKE_SUBCLASS_PROC(4)
-MAKE_SUBCLASS_PROC(5)

 static const WNDPROC subclassProcs[NUM_SUBCLASSES] = {
    subclass_proc0,
@@ -104,7 +98,6 @@ static const WNDPROC subclassProcs[NUM_SUBCLASSES] = {
    subclass_proc2,
    subclass_proc3,
    subclass_proc4,
-    subclass_proc5,
 };

 /***********************************************************************