Changeset 5415 for trunk/include

Timestamp:

Mar 31, 2001, 3:23:34 PM (24 years ago)

Author:

sandervl

Message:

header updates for comctl32

Location:

trunk/include/win

Files:

• comboex.h (modified) (2 diffs)
• commctrl.h (modified) (4 diffs)
• header.h (modified) (2 diffs)
• hotkey.h (modified) (2 diffs)
• ipaddress.h (modified) (2 diffs)
• listview.h (modified) (1 diff)
• nativefont.h (modified) (2 diffs)
• pager.h (modified) (2 diffs)
• progress.h (modified) (2 diffs)
• propsheet.h (modified) (2 diffs)
• rebar.h (modified) (2 diffs)
• tab.h (modified) (2 diffs)
• toolbar.h (modified) (2 diffs)
• tooltips.h (modified) (2 diffs)
• trackbar.h (modified) (2 diffs)
• treeview.h (modified) (2 diffs)
• updown.h (modified) (2 diffs)

trunk/include/win/comboex.h

@@ -1 @@
-/* $Id: comboex.h,v 1.3 2000-11-17 14:32:48 sandervl Exp $ */
+/* $Id: comboex.h,v 1.4 2001-03-31 13:23:33 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 #endif
 
-VOID COMBOEX_Register (VOID);
-VOID COMBOEX_Unregister (VOID);
-
 #ifdef __cplusplus
 }

trunk/include/win/commctrl.h

@@ -1 @@
-/* $Id: commctrl.h,v 1.38 2001-01-10 20:53:46 sandervl Exp $ */
+/* $Id: commctrl.h,v 1.39 2001-03-31 13:23:33 sandervl Exp $ */
 /*
  * Common controls definitions
@@ -121 +121 @@
     HWND hwndToolTips;
 } NMTOOLTIPSCREATED, *LPNMTOOLTIPSCREATED;
+
+typedef struct tagNMMOUSE
+{
+    NMHDR   hdr;
+    DWORD   dwItemSpec;
+    DWORD   dwItemData;
+    POINT   pt;
+    DWORD   dwHitInfo;   /* info where on item or control the mouse is */
+} NMMOUSE, *LPNMMOUSE;
+
+typedef struct tagNMOBJECTNOTIFY
+{
+    NMHDR   hdr;
+    int     iItem;
+#ifdef __IID_DEFINED__
+    const IID *piid;
+#else
+    const void *piid;
+#endif
+    void    *pObject;
+    HRESULT hResult;
+    DWORD   dwFlags;
+} NMOBJECTNOTIFY, *LPNMOBJECTNOTIFY;
+
+typedef struct tagNMKEY
+{
+    NMHDR   hdr;
+    UINT    nVKey;
+    UINT    uFlags;
+} NMKEY, *LPNMKEY;
+
+typedef struct tagNMCHAR
+{
+    NMHDR   hdr;
+    UINT    ch;
+    DWORD   dwItemPrev;           /* Item previously selected */
+    DWORD   dwItemNext;           /* Item to be selected */
+} NMCHAR, *LPNMCHAR;
 
 
@@ -3391 +3429 @@
 #define CBEN_DRAGBEGIN WINELIB_NAME_AW(CBEN_DRAGBEGIN)
 
+#define CBES_EX_NOEDITIMAGE          0x00000001
+#define CBES_EX_NOEDITIMAGEINDENT    0x00000002
+#define CBES_EX_PATHWORDBREAKPROC    0x00000004
+#define CBES_EX_NOSIZELIMIT          0x00000008
+#define CBES_EX_CASESENSITIVE        0x00000010
+
 typedef struct tagCOMBOBOXEXITEMA
 {
@@ -3420 +3464 @@
 
 #define COMBOBOXEXITEM WINELIB_NAME_AW(COMBOBOXEXITEM)
-
+#define PCOMBOBOXEXITEM WINELIB_NAME_AW(PCOMBOBOXEXITEM)
+#define PCCOMBOBOXEXITEM WINELIB_NAME_AW(PCCOMBOEXITEM) /* Yes, there's a BOX missing */
+
+#define CBENF_KILLFOCUS               1
+#define CBENF_RETURN                  2
+#define CBENF_ESCAPE                  3
+#define CBENF_DROPDOWN                4
+
+#define CBEMAXSTRLEN 260
+
+typedef struct tagNMCBEENDEDITW
+{
+    NMHDR hdr;
+    BOOL fChanged;
+    int iNewSelection;
+    WCHAR szText[CBEMAXSTRLEN];
+    int iWhy;
+} NMCBEENDEDITW, *LPNMCBEENDEDITW, *PNMCBEENDEDITW;
+
+typedef struct tagNMCBEENDEDITA
+{
+    NMHDR hdr;
+    BOOL fChanged;
+    int iNewSelection;
+    char szText[CBEMAXSTRLEN];
+    int iWhy;
+} NMCBEENDEDITA, *LPNMCBEENDEDITA, *PNMCBEENDEDITA;
+
+#define NMCBEENDEDIT WINELIB_NAME_AW(NMCBEENDEDIT)
+#define LPNMCBEENDEDIT WINELIB_NAME_AW(LPNMCBEENDEDIT)
+#define PNMCBEENDEDIT WINELIB_NAME_AW(PNMCBEENDEDIT)
+
+typedef struct
+{
+    NMHDR hdr;
+    COMBOBOXEXITEMA ceItem;
+} NMCOMBOBOXEXA, *PNMCOMBOBOXEXA;
+
+typedef struct
+{
+    NMHDR hdr;
+    COMBOBOXEXITEMW ceItem;
+} NMCOMBOBOXEXW, *PNMCOMBOBOXEXW;
+
+#define NMCOMBOBOXEX WINELIB_NAME_AW(NMCOMBOBOXEX)
+#define PNMCOMBOBOXEX WINELIB_NAME_AW(PNMCOMBOBOXEX)
+
+typedef struct
+{
+    NMHDR hdr;
+    int iItemid;
+    char szText[CBEMAXSTRLEN];
+} NMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA;
+
+typedef struct
+{
+    NMHDR hdr;
+    int iItemid;
+    WCHAR szText[CBEMAXSTRLEN];
+} NMCBEDRAGBEGINW, *PNMCBEDRAGBEGINW, *LPNMCBEDRAGBEGINW;
+
+#define NMCBEDRAGBEGIN WINELIB_NAME_AW(NMCBEDRAGBEGIN)
+#define PNMCBEDRAGBEGIN WINELIB_NAME_AW(PNMCBEDRAGBEGIN)
+#define LPNMCBEDRAGBEGIN WINELIB_NAME_AW(LPNMCBEDRAGBEGIN)
 
 /* Hotkey control */

trunk/include/win/header.h

@@ -1 @@
-/* $Id: header.h,v 1.10 2000-04-18 16:04:55 cbratschi Exp $ */
+/* $Id: header.h,v 1.11 2001-03-31 13:23:33 sandervl Exp $ */
 
 /*
@@ -72 +72 @@
 extern LRESULT HEADER_Layout(HWND hwnd,WPARAM wParam,LPARAM lParam);
 
-extern VOID HEADER_Register (VOID);
-extern VOID HEADER_Unregister (VOID);
 
 #endif /* __WINE_HEADER_H_ */

trunk/include/win/hotkey.h

@@ -1 @@
-/* $Id: hotkey.h,v 1.5 2000-02-25 16:58:33 cbratschi Exp $ */
+/* $Id: hotkey.h,v 1.6 2001-03-31 13:23:33 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 
 
-extern VOID HOTKEY_Register (VOID);
-extern VOID HOTKEY_Unregister (VOID);
 
 #endif  /* __WINE_HOTKEY_H */

trunk/include/win/ipaddress.h

@@ -1 @@
-/* $Id: ipaddress.h,v 1.2 2000-02-25 16:58:33 cbratschi Exp $ */
+/* $Id: ipaddress.h,v 1.3 2001-03-31 13:23:33 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 
 
-extern void IPADDRESS_Register (void);
-extern void IPADDRESS_Unregister (void);
 
 #endif  /* __WINE_IPADDRESS_H */

trunk/include/win/listview.h

@@ -100 +100 @@
 #define IF_NOREDRAW     1
 
-extern VOID LISTVIEW_Register (VOID);
-extern VOID LISTVIEW_Unregister (VOID);
 
 #endif  /* __WINE_LISTVIEW_H */

trunk/include/win/nativefont.h

@@ -1 @@
-/* $Id: nativefont.h,v 1.2 2000-03-17 17:10:52 cbratschi Exp $ */
+/* $Id: nativefont.h,v 1.3 2001-03-31 13:23:33 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 
 
-extern VOID NATIVEFONT_Register (VOID);
-extern VOID NATIVEFONT_Unregister (VOID);
-
 #endif  /* __WINE_NATIVEFONT_H */

trunk/include/win/pager.h

@@ -1 @@
-/* $Id: pager.h,v 1.2 2000-03-17 17:10:52 cbratschi Exp $ */
+/* $Id: pager.h,v 1.3 2001-03-31 13:23:33 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 
 
-extern VOID PAGER_Register (VOID);
-extern VOID PAGER_Unregister (VOID);
-
 #endif  /* __WINE_PAGER_H */

trunk/include/win/progress.h

@@ -1 @@
-/* $Id: progress.h,v 1.2 2000-03-17 17:10:52 cbratschi Exp $ */
+/* $Id: progress.h,v 1.3 2001-03-31 13:23:34 sandervl Exp $ */
 
 /*
@@ -26 +26 @@
 
 
-extern VOID PROGRESS_Register (VOID);
-extern VOID PROGRESS_Unregister (VOID);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+VOID PROGRESS_Register (VOID);
+VOID PROGRESS_Unregister (VOID);
+
+#ifdef __cplusplus
+}
+#endif
+
 
 #endif  /* __WINE_PROGRESS_H */

trunk/include/win/propsheet.h

@@ -1 @@
-/* $Id: propsheet.h,v 1.1 1999-05-24 20:19:17 ktk Exp $ */
+/* $Id: propsheet.h,v 1.2 2001-03-31 13:23:34 sandervl Exp $ */
 
 /*
@@ -18 +18 @@
 
 
-extern VOID PROPSHEET_Register (VOID);
-extern VOID PROPSHEET_UnRegister (VOID);
 
 #endif  /* __WINE_PROPSHEET_H */

trunk/include/win/rebar.h

@@ -1 @@
-/* $Id: rebar.h,v 1.4 2000-03-18 16:10:55 cbratschi Exp $ */
+/* $Id: rebar.h,v 1.5 2001-03-31 13:23:34 sandervl Exp $ */
 
 /*
@@ -66 +66 @@
 
 
-extern VOID REBAR_Register (VOID);
-extern VOID REBAR_Unregister (VOID);
 
 #endif  /* __WINE_REBAR_H */

trunk/include/win/tab.h

@@ -1 @@
-/* $Id: tab.h,v 1.4 2000-05-22 17:18:55 cbratschi Exp $ */
+/* $Id: tab.h,v 1.5 2001-03-31 13:23:34 sandervl Exp $ */
 
 /*
@@ -51 +51 @@
 
 
-extern VOID TAB_Register (VOID);
-extern VOID TAB_Unregister (VOID);
 
 #endif  /* __WINE_TAB_H */

trunk/include/win/toolbar.h

@@ -1 @@
-/* $Id: toolbar.h,v 1.8 2000-08-06 20:31:01 sandervl Exp $ */
+/* $Id: toolbar.h,v 1.9 2001-03-31 13:23:34 sandervl Exp $ */
 
 /*
@@ -83 +83 @@
 
 
-extern VOID TOOLBAR_Register (VOID);
-extern VOID TOOLBAR_Unregister (VOID);
 
 #endif  /* __WINE_TOOLBAR_H */

trunk/include/win/tooltips.h

@@ -1 @@
-/* $Id: tooltips.h,v 1.5 2000-08-06 20:31:01 sandervl Exp $ */
+/* $Id: tooltips.h,v 1.6 2001-03-31 13:23:34 sandervl Exp $ */
 
 /*
@@ -59 +59 @@
 
 
-extern VOID TOOLTIPS_Register (VOID);
-extern VOID TOOLTIPS_Unregister (VOID);
 
 #endif  /* __WINE_TOOLTIPS_H */

trunk/include/win/trackbar.h

@@ -1 @@
-/* $Id: trackbar.h,v 1.6 2000-05-22 17:18:57 cbratschi Exp $ */
+/* $Id: trackbar.h,v 1.7 2001-03-31 13:23:34 sandervl Exp $ */
 
 /*
@@ -50 +50 @@
 #define TB_REFRESH_DELAY       1
 
-extern VOID TRACKBAR_Register (VOID);
-extern VOID TRACKBAR_Unregister (VOID);
 
 #endif  /* __WINE_TRACKBAR_H */

trunk/include/win/treeview.h

@@ -1 @@
-/* $Id: treeview.h,v 1.19 2000-05-22 17:18:59 cbratschi Exp $ */
+/* $Id: treeview.h,v 1.20 2001-03-31 13:23:34 sandervl Exp $ */
 /*
  * Treeview class extra info
@@ -135 +135 @@
 #define TV_INFOTIP_TIMER_SET 4
 
-extern VOID TREEVIEW_Register (VOID);
-extern VOID TREEVIEW_Unregister (VOID);
-
 #endif  /* __WINE_TREEVIEW_H */

trunk/include/win/updown.h

@@ -1 @@
-/* $Id: updown.h,v 1.3 2000-03-18 16:10:57 cbratschi Exp $ */
+/* $Id: updown.h,v 1.4 2001-03-31 13:23:34 sandervl Exp $ */
 
 /*
@@ -37 +37 @@
 } NM_UPDOWN;
 
-extern VOID UPDOWN_Register (VOID);
-extern VOID UPDOWN_Unregister (VOID);
-
 #endif  /* __WINE_UPDOWN_H */