diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 10 | ||||
| -rw-r--r-- | winsup/w32api/include/commctrl.h | 130 |
2 files changed, 93 insertions, 47 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 3611e0f54..e2ced147f 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,13 @@ +2003-03-29 Danny Smith <dannysmith@users.sourceforge.net> + + * include/commctrl.h (ANIMATE_CLASS,HOTKEY_CLASS,PROGRESS_CLASS, + STATUSCLASSNAME,TOOLBARCLASSNAME,TOOLTIPS_CLASS,TRACKBAR_CLASS, + UPDOWN_CLASS,WC_COMBOBOXEX,WC_HEADER,WC_IPADDRESS,WC_LISTVIEW, + WC_TABCONTROL,WC_TREEVIEW): Move UNICODE mappings out of + RC_INVOKED guard. + (WC_PAGESCROLLER,WC_NATIVEFONTCTL,WC_BUTTON,WC_STATIC,WC_EDIT, + WC_LISTBOX,WC_COMBOBOX,WC_SCROLLBAR): Add defines. + 2003-03-28 Bang Jun-Young <junyoung@netbsd.org> * include/winnt.h (WAITORTIMERCALLBACKFUNC): Add typedef. diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h index f96fb4dad..076c23b14 100644 --- a/winsup/w32api/include/commctrl.h +++ b/winsup/w32api/include/commctrl.h @@ -24,22 +24,28 @@ extern "C" { #endif /* ifndef SNDMSG */ #define DRAGLISTMSGSTRING TEXT("commctrl_DragListMsg") -#define ANIMATE_CLASSW L"SysAnimate32" -#define ANIMATE_CLASSA "SysAnimate32" #define HOTKEY_CLASSA "msctls_hotkey32" #define HOTKEY_CLASSW L"msctls_hotkey32" #define PROGRESS_CLASSA "msctls_progress32" #define PROGRESS_CLASSW L"msctls_progress32" #define STATUSCLASSNAMEA "msctls_statusbar32" #define STATUSCLASSNAMEW L"msctls_statusbar32" -#define TOOLBARCLASSNAMEW L"ToolbarWindow32" #define TOOLBARCLASSNAMEA "ToolbarWindow32" -#define TOOLTIPS_CLASSW L"tooltips_class32" +#define TOOLBARCLASSNAMEW L"ToolbarWindow32" #define TOOLTIPS_CLASSA "tooltips_class32" +#define TOOLTIPS_CLASSW L"tooltips_class32" #define TRACKBAR_CLASSA "msctls_trackbar32" #define TRACKBAR_CLASSW L"msctls_trackbar32" #define UPDOWN_CLASSA "msctls_updown32" #define UPDOWN_CLASSW L"msctls_updown32" +#define ANIMATE_CLASSA "SysAnimate32" +#define ANIMATE_CLASSW L"SysAnimate32" +#define DATETIMEPICK_CLASSW L"SysDateTimePick32" +#define DATETIMEPICK_CLASSA "SysDateTimePick32" +#define MONTHCAL_CLASSW L"SysMonthCal32" +#define MONTHCAL_CLASSA "SysMonthCal32" +#define REBARCLASSNAMEW L"ReBarWindow32" +#define REBARCLASSNAMEA "ReBarWindow32" #define WC_COMBOBOXEXW L"ComboBoxEx32" #define WC_COMBOBOXEXA "ComboBoxEx32" #define WC_IPADDRESSW L"SysIPAddress32" @@ -48,16 +54,81 @@ extern "C" { #define WC_LISTVIEWW L"SysListView32" #define WC_TABCONTROLA "SysTabControl32" #define WC_TABCONTROLW L"SysTabControl32" -#define WC_TREEVIEWA "SysTreeView32" +#define WC_TREEVIEWA ("SysTreeView32") #define WC_TREEVIEWW L"SysTreeView32" #define WC_HEADERA "SysHeader32" #define WC_HEADERW L"SysHeader32" -#define DATETIMEPICK_CLASSW L"SysDateTimePick32" -#define DATETIMEPICK_CLASSA "SysDateTimePick32" -#define MONTHCAL_CLASSW L"SysMonthCal32" -#define MONTHCAL_CLASSA "SysMonthCal32" -#define REBARCLASSNAMEW L"ReBarWindow32" -#define REBARCLASSNAMEA "ReBarWindow32" +#define WC_PAGESCROLLERW L"SysPager" +#define WC_PAGESCROLLERA "SysPager" +#define WC_NATIVEFONTCTLW L"NativeFontCtl" +#define WC_NATIVEFONTCTLA "NativeFontCtl" +#define WC_BUTTONA "Button" +#define WC_BUTTONW L"Button" +#define WC_STATICA "Static" +#define WC_STATICW L"Static" +#define WC_EDITA "Edit" +#define WC_EDITW L"Edit" +#define WC_LISTBOXA "ListBox" +#define WC_LISTBOXW L"ListBox" +#define WC_COMBOBOXA "ComboBox" +#define WC_COMBOBOXW L"ComboBox" +#define WC_SCROLLBARA "ScrollBar" +#define WC_SCROLLBARW L"ScrollBar" + +#ifdef UNICODE +#define HOTKEY_CLASS HOTKEY_CLASSW +#define PROGRESS_CLASS PROGRESS_CLASSW +#define STATUSCLASSNAME STATUSCLASSNAMEW +#define TOOLBARCLASSNAME TOOLBARCLASSNAMEW +#define TOOLTIPS_CLASS TOOLTIPS_CLASSW +#define TRACKBAR_CLASS TRACKBAR_CLASSW +#define UPDOWN_CLASS UPDOWN_CLASSW +#define ANIMATE_CLASS ANIMATE_CLASSW +#define DATETIMEPICK_CLASS DATETIMEPICK_CLASSW +#define MONTHCAL_CLASS MONTHCAL_CLASSW +#define REBARCLASSNAME REBARCLASSNAMEW +#define WC_COMBOBOXEX WC_COMBOBOXEXW +#define WC_HEADER WC_HEADERW +#define WC_IPADDRESS WC_IPADDRESSW +#define WC_LISTVIEW WC_LISTVIEWW +#define WC_TABCONTROL WC_TABCONTROLW +#define WC_TREEVIEW WC_TREEVIEWW +#define WC_PAGESCROLLER WC_PAGESCROLLERW +#define WC_NATIVEFONTCTL WC_NATIVEFONTCTLW +#define WC_BUTTON WC_BUTTONW +#define WC_STATIC WC_STATICW +#define WC_EDIT WC_EDITW +#define WC_LISTBOX WC_LISTBOXW +#define WC_COMBOBOX WC_COMBOBOXW +#define WC_SCROLLBAR WC_SCROLLBARW +#else +#define ANIMATE_CLASS ANIMATE_CLASSA +#define HOTKEY_CLASS HOTKEY_CLASSA +#define PROGRESS_CLASS PROGRESS_CLASSA +#define STATUSCLASSNAME STATUSCLASSNAMEA +#define TOOLBARCLASSNAME TOOLBARCLASSNAMEA +#define TOOLTIPS_CLASS TOOLTIPS_CLASSA +#define TRACKBAR_CLASS TRACKBAR_CLASSA +#define UPDOWN_CLASS UPDOWN_CLASSA +#define DATETIMEPICK_CLASS DATETIMEPICK_CLASSA +#define MONTHCAL_CLASS MONTHCAL_CLASSA +#define REBARCLASSNAME REBARCLASSNAMEA +#define WC_COMBOBOXEX WC_COMBOBOXEXA +#define WC_HEADER WC_HEADERA +#define WC_IPADDRESS WC_IPADDRESSA +#define WC_LISTVIEW WC_LISTVIEWA +#define WC_TABCONTROL WC_TABCONTROLA +#define WC_TREEVIEW WC_TREEVIEWA +#define WC_PAGESCROLLER WC_PAGESCROLLERA +#define WC_NATIVEFONTCTL WC_NATIVEFONTCTLA +#define WC_BUTTON WC_BUTTONA +#define WC_STATIC WC_STATICA +#define WC_EDIT WC_EDITA +#define WC_LISTBOX WC_LISTBOXA +#define WC_COMBOBOX WC_COMBOBOXA +#define WC_SCROLLBAR WC_SCROLLBARA +#endif + #define LVM_FIRST 0x1000 #define TV_FIRST 0x1100 #define HDM_FIRST 0x1200 @@ -2491,20 +2562,6 @@ WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*); #endif #ifdef UNICODE -#define ANIMATE_CLASS ANIMATE_CLASSW -#define HOTKEY_CLASS HOTKEY_CLASSW -#define PROGRESS_CLASS PROGRESS_CLASSW -#define STATUSCLASSNAME STATUSCLASSNAMEW -#define TOOLBARCLASSNAME TOOLBARCLASSNAMEW -#define TOOLTIPS_CLASS TOOLTIPS_CLASSW -#define TRACKBAR_CLASS TRACKBAR_CLASSW -#define UPDOWN_CLASS UPDOWN_CLASSW -#define WC_COMBOBOXEX WC_COMBOBOXEXW -#define WC_HEADER WC_HEADERW -#define WC_IPADDRESS WC_IPADDRESSW -#define WC_LISTVIEW WC_LISTVIEWW -#define WC_TABCONTROL WC_TABCONTROLW -#define WC_TREEVIEW WC_TREEVIEWW typedef HDITEMW HDITEM; typedef TOOLINFOW TOOLINFO,*PTOOLINFO,*LPTOOLINFO; typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO; @@ -2654,29 +2711,12 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO; #define DTN_WMKEYDOWN DTN_WMKEYDOWNW #define DTN_FORMAT DTN_FORMATW #define DTN_FORMATQUERY DTN_FORMATQUERYW -#define DATETIMEPICK_CLASS DATETIMEPICK_CLASSW -#define MONTHCAL_CLASS MONTHCAL_CLASSW -#define REBARCLASSNAME REBARCLASSNAMEW typedef REBARBANDINFOW REBARBANDINFO,*LPREBARBANDINFO; #define LPCREBARBANDINFO LPCREBARBANDINFOW #define REBARBANDINFO_V3_SIZE REBARBANDINFOW_V3_SIZE #define RB_INSERTBAND RB_INSERTBANDW #define RB_SETBANDINFO RB_SETBANDINFOW #else /* UNICODE */ -#define ANIMATE_CLASS ANIMATE_CLASSA -#define HOTKEY_CLASS HOTKEY_CLASSA -#define PROGRESS_CLASS PROGRESS_CLASSA -#define STATUSCLASSNAME STATUSCLASSNAMEA -#define TOOLBARCLASSNAME TOOLBARCLASSNAMEA -#define TOOLTIPS_CLASS TOOLTIPS_CLASSA -#define TRACKBAR_CLASS TRACKBAR_CLASSA -#define UPDOWN_CLASS UPDOWN_CLASSA -#define WC_COMBOBOXEX WC_COMBOBOXEXA -#define WC_HEADER WC_HEADERA -#define WC_IPADDRESS WC_IPADDRESSA -#define WC_LISTVIEW WC_LISTVIEWA -#define WC_TABCONTROL WC_TABCONTROLA -#define WC_TREEVIEW WC_TREEVIEWA typedef HDITEMA HDITEM; typedef TOOLINFOA TOOLINFO,*PTOOLINFO,*LPTOOLINFO; typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO; @@ -2819,19 +2859,15 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO; #define DTN_WMKEYDOWN DTN_WMKEYDOWNA #define DTN_FORMAT DTN_FORMATA #define DTN_FORMATQUERY DTN_FORMATQUERYA -#define DATETIMEPICK_CLASS DATETIMEPICK_CLASSA -#define MONTHCAL_CLASS MONTHCAL_CLASSA -#define REBARCLASSNAME REBARCLASSNAMEA typedef REBARBANDINFOA REBARBANDINFO,*LPREBARBANDINFO; #define LPCREBARBANDINFO LPCREBARBANDINFOA #define REBARBANDINFO_V3_SIZE REBARBANDINFOA_V3_SIZE #define RB_INSERTBAND RB_INSERTBANDA #define RB_SETBANDINFO RB_SETBANDINFOA #endif -#endif +#endif /* RC_INVOKED */ #ifdef __cplusplus } #endif #endif - |