Author: fireball
Date: Sat Nov 7 20:53:41 2009
New Revision: 44015
URL:
http://svn.reactos.org/svn/reactos?rev=44015&view=rev
Log:
- Remove accidentally committed Wineisms. Build is fixed.
Modified:
trunk/reactos/include/psdk/commctrl.h
Modified: trunk/reactos/include/psdk/commctrl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re…
==============================================================================
--- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Nov 7 20:53:41 2009
@@ -394,15 +394,7 @@
/* UpDown */
#define UPDOWN_CLASSA "msctls_updown32"
-#if defined(__GNUC__)
-# define UPDOWN_CLASSW (const WCHAR []){
'm','s','c','t','l','s','_', \
-
'u','p','d','o','w','n','3','2',0
}
-#elif defined(_MSC_VER)
# define UPDOWN_CLASSW L"msctls_updown32"
-#else
-static const WCHAR UPDOWN_CLASSW[] = {
'm','s','c','t','l','s','_',
-
'u','p','d','o','w','n','3','2',0
};
-#endif
#define UPDOWN_CLASS WINELIB_NAME_AW(UPDOWN_CLASS)
typedef struct _UDACCEL
@@ -463,15 +455,7 @@
/* Progress Bar */
#define PROGRESS_CLASSA "msctls_progress32"
-#if defined(__GNUC__)
-# define PROGRESS_CLASSW (const WCHAR []){
'm','s','c','t','l','s','_', \
-
'p','r','o','g','r','e','s','s','3','2',0
}
-#elif defined(_MSC_VER)
# define PROGRESS_CLASSW L"msctls_progress32"
-#else
-static const WCHAR PROGRESS_CLASSW[] = {
'm','s','c','t','l','s','_',
-
'p','r','o','g','r','e','s','s','3','2',0
};
-#endif
#define PROGRESS_CLASS WINELIB_NAME_AW(PROGRESS_CLASS)
#define PBM_SETRANGE (WM_USER+1)
@@ -721,13 +705,7 @@
/* Header control */
#define WC_HEADERA "SysHeader32"
-#if defined(__GNUC__)
-# define WC_HEADERW (const WCHAR []){
'S','y','s','H','e','a','d','e','r','3','2',0
}
-#elif defined(_MSC_VER)
# define WC_HEADERW L"SysHeader32"
-#else
-static const WCHAR WC_HEADERW[] = {
'S','y','s','H','e','a','d','e','r','3','2',0
};
-#endif
#define WC_HEADER WINELIB_NAME_AW(WC_HEADER)
#define HDS_HORZ 0x0000
@@ -1036,13 +1014,7 @@
/* Win32 5.1 Button Theme */
#define WC_BUTTONA "Button"
-#if defined(__GNUC__)
-# define WC_BUTTONW (const WCHAR []){
'B','u','t','t','o','n',0 }
-#elif defined(_MSC_VER)
# define WC_BUTTONW L"Button"
-#else
-static const WCHAR WC_BUTTONW[] = {
'B','u','t','t','o','n',0 };
-#endif
#define WC_BUTTON WINELIB_NAME_AW(WC_BUTTON)
#define BCN_FIRST (0U-1250U)
@@ -1061,15 +1033,8 @@
/* Toolbar */
#define TOOLBARCLASSNAMEA "ToolbarWindow32"
-#if defined(__GNUC__)
-# define TOOLBARCLASSNAMEW (const WCHAR []){
'T','o','o','l','b','a','r', \
-
'W','i','n','d','o','w','3','2',0
}
-#elif defined(_MSC_VER)
# define TOOLBARCLASSNAMEW L"ToolbarWindow32"
-#else
-static const WCHAR TOOLBARCLASSNAMEW[] = {
'T','o','o','l','b','a','r',
-
'W','i','n','d','o','w','3','2',0
};
-#endif
+
#define TOOLBARCLASSNAME WINELIB_NAME_AW(TOOLBARCLASSNAME)
#define CMB_MASKED 0x02
@@ -1628,15 +1593,7 @@
/* Tool tips */
#define TOOLTIPS_CLASSA "tooltips_class32"
-#if defined(__GNUC__)
-# define TOOLTIPS_CLASSW (const WCHAR []){
't','o','o','l','t','i','p','s','_',
\
- 'c','l','a','s','s','3','2',0
}
-#elif defined(_MSC_VER)
# define TOOLTIPS_CLASSW L"tooltips_class32"
-#else
-static const WCHAR TOOLTIPS_CLASSW[] = {
't','o','o','l','t','i','p','s','_',
- 'c','l','a','s','s','3','2',0
};
-#endif
#define TOOLTIPS_CLASS WINELIB_NAME_AW(TOOLTIPS_CLASS)
#define INFOTIPSIZE 1024