[COMCTL32]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 22 Dec 2013 19:02:59 +0000 (19:02 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 22 Dec 2013 19:02:59 +0000 (19:02 +0000)
* Move some inclusions to the main header.
* Extract the resource related definitions into resource.h and include it in both the main header and the resource file.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61341

39 files changed:
reactos/dll/win32/comctl32/animate.c
reactos/dll/win32/comctl32/comboex.c
reactos/dll/win32/comctl32/comctl32.h
reactos/dll/win32/comctl32/comctl32undoc.c
reactos/dll/win32/comctl32/commctrl.c
reactos/dll/win32/comctl32/datetime.c
reactos/dll/win32/comctl32/dpa.c
reactos/dll/win32/comctl32/draglist.c
reactos/dll/win32/comctl32/dsa.c
reactos/dll/win32/comctl32/flatsb.c
reactos/dll/win32/comctl32/header.c
reactos/dll/win32/comctl32/hotkey.c
reactos/dll/win32/comctl32/imagelist.c
reactos/dll/win32/comctl32/ipaddress.c
reactos/dll/win32/comctl32/listview.c
reactos/dll/win32/comctl32/monthcal.c
reactos/dll/win32/comctl32/nativefont.c
reactos/dll/win32/comctl32/pager.c
reactos/dll/win32/comctl32/progress.c
reactos/dll/win32/comctl32/propsheet.c
reactos/dll/win32/comctl32/rebar.c
reactos/dll/win32/comctl32/resource.h [new file with mode: 0644]
reactos/dll/win32/comctl32/rsrc.rc
reactos/dll/win32/comctl32/smoothscroll.c
reactos/dll/win32/comctl32/status.c
reactos/dll/win32/comctl32/string.c
reactos/dll/win32/comctl32/syslink.c
reactos/dll/win32/comctl32/tab.c
reactos/dll/win32/comctl32/theme_button.c
reactos/dll/win32/comctl32/theme_combo.c
reactos/dll/win32/comctl32/theme_dialog.c
reactos/dll/win32/comctl32/theme_edit.c
reactos/dll/win32/comctl32/theme_listbox.c
reactos/dll/win32/comctl32/theming.c
reactos/dll/win32/comctl32/toolbar.c
reactos/dll/win32/comctl32/tooltips.c
reactos/dll/win32/comctl32/trackbar.c
reactos/dll/win32/comctl32/treeview.c
reactos/dll/win32/comctl32/updown.c

index 0cfa6d8..bbef603 100644 (file)
  *   - check for the 'rec ' list in some AVI files
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <string.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-#include <winnls.h>
-//#include "commctrl.h"
-#include <vfw.h>
-//#include "mmsystem.h"
 #include "comctl32.h"
-#include <wine/debug.h>
+
+#include <vfw.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(animate);
 
index 5155129..0d6e41f 100644 (file)
  * 
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(comboex);
 
index 38cac43..70e162a 100644 (file)
 #ifndef __WINE_COMCTL32_H
 #define __WINE_COMCTL32_H
 
-#define WIN32_NO_STATUS
+#include <config.h>
+
+#include <stdarg.h>
+#include <assert.h>
+
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#ifndef RC_INVOKED
-#include <stdarg.h>
-#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#define COBJMACROS
 
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
 #include <winuser.h>
-//#include "winnls.h"
+#include <winreg.h>
 #include <commctrl.h>
+#include <uxtheme.h>
+#include <vssym32.h>
 
-extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN;
-extern HBRUSH  COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN;
-
-/* Property sheet / Wizard */
-#define IDD_PROPSHEET 1006
-#define IDD_WIZARD    1020
-
-#define IDC_TABCONTROL   12320
-#define IDC_APPLY_BUTTON 12321
-#define IDC_BACK_BUTTON  12323
-#define IDC_NEXT_BUTTON  12324
-#define IDC_FINISH_BUTTON 12325
-#define IDC_SUNKEN_LINE   12326
-#define IDC_SUNKEN_LINEHEADER 12327
-
-#define IDS_CLOSE        4160
-
-/* Toolbar customization dialog */
-#define IDD_TBCUSTOMIZE     200
-
-#define IDC_AVAILBTN_LBOX   201
-#define IDC_RESET_BTN       202
-#define IDC_TOOLBARBTN_LBOX 203
-#define IDC_REMOVE_BTN      204
-#define IDC_HELP_BTN        205
-#define IDC_MOVEUP_BTN      206
-#define IDC_MOVEDN_BTN      207
+#include <wine/unicode.h>
+#include <wine/debug.h>
 
-#define IDS_SEPARATOR      1024
+#include "resource.h"
 
-/* Toolbar imagelist bitmaps */
-#define IDB_STD_SMALL       120
-#define IDB_STD_LARGE       121
-#define IDB_VIEW_SMALL      124
-#define IDB_VIEW_LARGE      125
-#define IDB_HIST_SMALL      130
-#define IDB_HIST_LARGE      131
-
-#define IDM_TODAY                      4163
-#define IDM_GOTODAY                    4164
-
-/* Treeview Checkboxes */
-
-#define IDT_CHECK        401
-
-
-/* Cursors */
-#define IDC_MOVEBUTTON                  102
-#define IDC_COPY                        104
-#define IDC_DIVIDER                     106
-#define IDC_DIVIDEROPEN                 107
-
-
-/* DragList resources */
-#define IDI_DRAGARROW                   501
-
-/* HOTKEY internal strings */
-#define HKY_NONE                        2048
-
-/* Tooltip icons */
-#define IDI_TT_INFO_SM                   22
-#define IDI_TT_WARN_SM                   25
-#define IDI_TT_ERROR_SM                  28
+extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN;
+extern HBRUSH  COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN;
 
 typedef struct
 {
@@ -138,8 +89,6 @@ INT  Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN;
 BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
 BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
 
-#define COMCTL32_VERSION_MINOR 81
-
 /* Our internal stack structure of the window procedures to subclass */
 typedef struct _SUBCLASSPROCS {
     SUBCLASSPROC subproc;
index bdf20f5..6c6cc77 100644 (file)
  *     COMCTL32.DLL (internally).
  *
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdarg.h>
-//#include <string.h>
-//#include <ctype.h>
-//#include <limits.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-#include <winreg.h>
-//#include "commctrl.h"
-//#include "objbase.h"
-//#include "winerror.h"
-
-#include <wine/unicode.h>
-#include "comctl32.h"
 
-#include <wine/debug.h>
+#include "comctl32.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
index a0315d1..3d5cd27 100644 (file)
  *   -- ICC_WIN95_CLASSES
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <string.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "wingdi.h"
-//#include "winuser.h"
-#include <winnls.h>
-//#include "commctrl.h"
-//#include "winerror.h"
-#include <winreg.h>
+#include "comctl32.h"
+
 #define NO_SHLWAPI_STREAM
 #include <shlwapi.h>
-#include "comctl32.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
index 825b442..6a13f55 100644 (file)
  */
 
 #include <math.h>
-//#include <string.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <limits.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
+
 #include "comctl32.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(datetime);
 
index eceabca..19fbe45 100644 (file)
  *     http://members.ozemail.com.au/~geoffch/samples/win32/shell/comctl32  
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <stdarg.h>
-//#include <limits.h>
+#include "comctl32.h"
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "commctrl.h"
 #include <objbase.h>
 
-#include "comctl32.h"
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(dpa);
 
 typedef struct _DPA
index 4b82f25..ecf7866 100644 (file)
  * 
  */
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
index 88a83c9..ce4ca81 100644 (file)
  *     http://members.ozemail.com.au/~geoffch/samples/win32/shell/comctl32  
  */
 
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <commctrl.h>
-
 #include "comctl32.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(dsa);
 
index e417397..5aed8a2 100644 (file)
  *
  */
 
-#include <stdarg.h>
-#include <string.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winerror.h>
-#include <winuser.h>
-#include <commctrl.h>
 #include "comctl32.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
index 1db2360..9f8fe84 100644 (file)
  *   - New Windows Vista features
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-#include <stdlib.h>
-//#include <string.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wine/unicode.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <vssym32.h>
-#include <uxtheme.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(header);
 
index 94ccae5..e436c4c 100644 (file)
  *
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(hotkey);
 
index dfce617..27d98ae 100644 (file)
  *    - Thread-safe locking
  */
 
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <stdlib.h>
-//#include <string.h>
-
-#define COBJMACROS
+#include "comctl32.h"
 
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
 #include <objbase.h>
-//#include "wingdi.h"
-#include <winnls.h>
-//#include "winuser.h"
-//#include "commctrl.h"
-#include "comctl32.h"
 #include <commoncontrols.h>
-#include <wine/debug.h>
 #include <wine/exception.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(imagelist);
index 4310f6f..35e7f06 100644 (file)
  * 
  */
 
-//#include <ctype.h>
-//#include <stdlib.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <wine/unicode.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ipaddress);
 
index 7a6b0ff..0d98cda 100644 (file)
  *   -- LVGroupComparE
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include <assert.h>
-//#include <ctype.h>
-//#include <string.h>
-//#include <stdlib.h>
-//#include <stdarg.h>
 #include <stdio.h>
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnt.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <uxtheme.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(listview);
 
index 675f622..2151e3c 100644 (file)
  *    -- search for FIXME
  */
 
-//#include <math.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <uxtheme.h>
-#include <vssym32.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(monthcal);
 
index 0ea3ec9..c64acfc 100644 (file)
  *   - All notifications.
  */
 
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
 #include "comctl32.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(nativefont);
 
index 9685acc..9a98de2 100644 (file)
  *       Robert Shearman <rob@codeweavers.com>
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(pager);
 
index f165714..1c52316 100644 (file)
  *
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <uxtheme.h>
-#include <vssym32.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(progress);
 
index 03b275f..0744b1d 100644 (file)
  *     o PSP_USEREFPARENT
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
-//#include "prsht.h"
 #include "comctl32.h"
-#include <uxtheme.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
 /******************************************************************************
  * Data structures
index d6eed2e..c94f302 100644 (file)
  *    at least RB_INSERTBAND
  */
 
-#include <assert.h>
-//#include <stdarg.h>
-#include <stdlib.h>
-//#include <string.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "wine/unicode.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <uxtheme.h>
-#include <vssym32.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(rebar);
 
diff --git a/reactos/dll/win32/comctl32/resource.h b/reactos/dll/win32/comctl32/resource.h
new file mode 100644 (file)
index 0000000..877210d
--- /dev/null
@@ -0,0 +1,62 @@
+#pragma once
+
+/* Property sheet / Wizard */
+#define IDD_PROPSHEET 1006
+#define IDD_WIZARD    1020
+
+#define IDC_TABCONTROL   12320
+#define IDC_APPLY_BUTTON 12321
+#define IDC_BACK_BUTTON  12323
+#define IDC_NEXT_BUTTON  12324
+#define IDC_FINISH_BUTTON 12325
+#define IDC_SUNKEN_LINE   12326
+#define IDC_SUNKEN_LINEHEADER 12327
+
+#define IDS_CLOSE        4160
+
+/* Toolbar customization dialog */
+#define IDD_TBCUSTOMIZE     200
+
+#define IDC_AVAILBTN_LBOX   201
+#define IDC_RESET_BTN       202
+#define IDC_TOOLBARBTN_LBOX 203
+#define IDC_REMOVE_BTN      204
+#define IDC_HELP_BTN        205
+#define IDC_MOVEUP_BTN      206
+#define IDC_MOVEDN_BTN      207
+
+#define IDS_SEPARATOR      1024
+
+/* Toolbar imagelist bitmaps */
+#define IDB_STD_SMALL       120
+#define IDB_STD_LARGE       121
+#define IDB_VIEW_SMALL      124
+#define IDB_VIEW_LARGE      125
+#define IDB_HIST_SMALL      130
+#define IDB_HIST_LARGE      131
+
+#define IDM_TODAY                      4163
+#define IDM_GOTODAY                    4164
+
+/* Treeview Checkboxes */
+
+#define IDT_CHECK        401
+
+/* Cursors */
+#define IDC_MOVEBUTTON                  102
+#define IDC_COPY                        104
+#define IDC_DIVIDER                     106
+#define IDC_DIVIDEROPEN                 107
+
+/* DragList resources */
+#define IDI_DRAGARROW                   501
+
+/* HOTKEY internal strings */
+#define HKY_NONE                        2048
+
+/* Tooltip icons */
+#define IDI_TT_INFO_SM                   22
+#define IDI_TT_WARN_SM                   25
+#define IDI_TT_ERROR_SM                  28
+
+#define COMCTL32_VERSION_MINOR 81
index 0ef81f1..c14d18e 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "winnls.h"
-#include "comctl32.h"
+#include <windef.h>
+#include <winuser.h>
+#include <commctrl.h>
+
+#include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
index 8527407..52fb8cb 100644 (file)
  *     - actually add smooth scrolling
  */
 
-#include <stdarg.h>
-
-#include <windef.h>
-//#include "winbase.h"
-#include <winreg.h>
-//#include "winerror.h"
-#include <winuser.h>
-#include <wine/debug.h>
+#include "comctl32.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
index 45df803..f2e8adb 100644 (file)
  *     -- CCS_VERT (defaults to RIGHT)
  */
 
-#include <stdarg.h>
-#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wine/unicode.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
-#include <commctrl.h>
 #include "comctl32.h"
-#include <uxtheme.h>
-#include <vssym32.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(statusbar);
 
index 8a579a5..0437cad 100644 (file)
  *
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdarg.h>
-//#include <string.h>
-//#include <stdlib.h> /* atoi */
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "winnls.h"
-
 #include "comctl32.h"
 
-#include <wine/unicode.h>
-
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 /*************************************************************************
index 385a335..7508519 100644 (file)
  * If you discover missing features, or bugs, please note them below.
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <wine/unicode.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(syslink);
 
index 58727b2..046d591 100644 (file)
  *
  */
 
-#include <assert.h>
-//#include <stdarg.h>
-//#include <string.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <uxtheme.h>
-#include <vssym32.h>
-#include <wine/debug.h>
-//#include <math.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(tab);
 
index 64f4def..ffbee17 100644 (file)
  *
  */
 
-#include <stdarg.h>
-//#include <string.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <uxtheme.h>
-#include <vssym32.h>
 #include "comctl32.h"
 
 #define BUTTON_TYPE 0x0f /* bit mask for the available button types */
index 7a49b07..1e8b46b 100644 (file)
  *
  */
 
-#include <stdarg.h>
-//#include <string.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <uxtheme.h>
-#include <vssym32.h>
 #include "comctl32.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(themingcombo);
 
index bbb7975..1b85671 100644 (file)
  *
  */
 
-#include <stdarg.h>
-//#include <string.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <uxtheme.h>
-#include <vssym32.h>
 #include "comctl32.h"
-#include <wine/debug.h>
 
 /**********************************************************************
  * The dialog subclass window proc.
index 28e89a9..8355941 100644 (file)
  *
  */
 
-#include <stdarg.h>
-//#include <string.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <uxtheme.h>
-#include <vssym32.h>
 #include "comctl32.h"
-#include <wine/debug.h>
 
 /* Draw themed border */
 static void nc_paint (HTHEME theme, HWND hwnd, HRGN region)
index 00de620..e6ce023 100644 (file)
  *
  */
 
-#include <stdarg.h>
-//#include <string.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <uxtheme.h>
-#include <vssym32.h>
 #include "comctl32.h"
-#include <wine/debug.h>
 
 /* Draw themed border */
 static void nc_paint (HTHEME theme, HWND hwnd, HRGN region)
index 862f87e..19481e5 100644 (file)
  *
  */
 
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
 #include "comctl32.h"
-#include <uxtheme.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(theming);
 
index 90a58b9..e803c3c 100644 (file)
  *
  */
 
-#include <stdarg.h>
-#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wine/unicode.h>
-#include <winnls.h>
-#include <commctrl.h>
 #include "comctl32.h"
-#include <uxtheme.h>
-#include <vssym32.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(toolbar);
 
index a51fa35..c1c9415 100644 (file)
  *
  */
 
-
-
-//#include <stdarg.h>
-//#include <string.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <wine/unicode.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(tooltips);
 
index cabad2c..c6aecd6 100644 (file)
  * 
  */
 
-#include <stdarg.h>
-//#include <stdio.h>
-#include <stdlib.h>
-//#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-//#include "winnls.h"
-//#include "commctrl.h"
-#include <uxtheme.h>
-#include <vssym32.h>
-#include <wine/debug.h>
-
 #include "comctl32.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(trackbar);
index 3d13de5..28a884b 100644 (file)
  *   Scroll (instead of repaint) as much as possible.
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include <assert.h>
-//#include <ctype.h>
-//#include <stdarg.h>
-//#include <string.h>
-//#include <limits.h>
-//#include <stdlib.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <uxtheme.h>
-#include <vssym32.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(treeview);
 
index 3216226..425b0fc 100644 (file)
  * 
  */
 
-//#include <stdlib.h>
-//#include <string.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "commctrl.h"
 #include "comctl32.h"
-#include <uxtheme.h>
-#include <vssym32.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(updown);