Changeset 2835 for trunk/include

Timestamp:

Feb 20, 2000, 7:29:58 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

Location:

trunk/include/win

Files:

• commctrl.h (modified) (10 diffs)
• treeview.h (modified) (5 diffs)
• winuser.h (modified) (2 diffs)

trunk/include/win/commctrl.h

@@ -1 @@
-/* $Id: commctrl.h,v 1.21 2000-02-16 17:20:28 cbratschi Exp $ */
+/* $Id: commctrl.h,v 1.22 2000-02-20 18:26:07 cbratschi Exp $ */
 /*
  * Common controls definitions
@@ -120 +120 @@
 
 #define I_IMAGECALLBACK          (-1)
+#define I_IMAGENONE              (-2)
 #define I_INDENTCALLBACK         (-1)
 #define I_CHILDRENCALLBACK       (-1)
@@ -339 +340 @@
 #define UDM_SETRANGE32     (WM_USER+111)
 #define UDM_GETRANGE32     (WM_USER+112)
+#define UDM_SETPOS32       (WM_USER+113)
+#define UDM_GETPOS32       (WM_USER+114)
 
 HWND WINAPI CreateUpDownControl (DWORD, INT, INT, INT, INT,
@@ -880 +883 @@
 #define TBSTATE_MARKED          0x80
 
-#define TBSTYLE_BUTTON          0x00
-#define TBSTYLE_SEP             0x01
-#define TBSTYLE_CHECK           0x02
-#define TBSTYLE_GROUP           0x04
+#define TBSTYLE_BUTTON          0x00 //obsolete
+#define TBSTYLE_SEP             0x01 //obsolete
+#define TBSTYLE_CHECK           0x02 //obsolete
+#define TBSTYLE_GROUP           0x04 //obsolete
 #define TBSTYLE_CHECKGROUP      (TBSTYLE_GROUP | TBSTYLE_CHECK)
-#define TBSTYLE_DROPDOWN        0x08
-
+#define TBSTYLE_DROPDOWN        0x08 //obsolete
+#define TBSTYLE_AUTOSIZE        0x0010 //obsolete
+#define TBSTYLE_NOPREFIX        0x0020 //obsolete
 #define TBSTYLE_TOOLTIPS        0x0100
 #define TBSTYLE_WRAPABLE        0x0200
@@ -893 +897 @@
 #define TBSTYLE_LIST            0x1000
 #define TBSTYLE_CUSTOMERASE     0x2000
+#define TBSTYLE_REGISTERDROP    0x4000
+#define TBSTYLE_TRANSPARENT     0x8000
+#define TBSTYLE_EX_DRAWDDARROWS       0x00000001
+#define TBSTYLE_EX_MIXEDBUTTONS       0x00000008
+#define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x00000010
+
+#define BTNS_BUTTON     TBSTYLE_BUTTON      // 0x0000
+#define BTNS_SEP        TBSTYLE_SEP         // 0x0001
+#define BTNS_CHECK      TBSTYLE_CHECK       // 0x0002
+#define BTNS_GROUP      TBSTYLE_GROUP       // 0x0004
+#define BTNS_CHECKGROUP TBSTYLE_CHECKGROUP  // (TBSTYLE_GROUP | TBSTYLE_CHECK)
+#define BTNS_DROPDOWN   TBSTYLE_DROPDOWN    // 0x0008
+#define BTNS_AUTOSIZE   TBSTYLE_AUTOSIZE    // 0x0010
+#define BTNS_NOPREFIX   TBSTYLE_NOPREFIX    // 0x0020
+#define BTNS_SHOWTEXT   0x0040
+#define BTNS_WHOLEDROPDOWN  0x0080
 
 #define TBIF_IMAGE              0x00000001
@@ -1240 +1260 @@
 #define TTS_ALWAYSTIP           0x01
 #define TTS_NOPREFIX            0x02
+#define TTS_NOANIMATE           0x10
+#define TTS_NOFADE              0x20
+#define TTS_BALLOON             0x40
 
 #define TTF_IDISHWND            0x0001
@@ -1443 +1466 @@
 #define RBBS_GRIPPERALWAYS      0x00000080
 #define RBBS_NOGRIPPER          0x00000100
+#define RBBS_USECHEVRON         0x00000200
+#define RBBS_HIDETITLE          0x00000400
 
 #define RBNM_ID                 0x00000001
@@ -1491 +1516 @@
 #define RB_GETPALETTE           (WM_USER+38)
 #define RB_MOVEBAND             (WM_USER+39)
+#define RB_PUSHCHEVRON          (WM_USER + 43)
 #define RB_GETDROPTARGET        CCM_GETDROPTARGET
 #define RB_SETCOLORSCHEME       CCM_SETCOLORSCHEME
@@ -1944 +1970 @@
 #define TVC_BYKEYBOARD        0x02
 
+#define TVNRET_DEFAULT          0
+#define TVNRET_SKIPOLD          1
+#define TVNRET_SKIPNEW          2
 
 typedef struct _TREEITEM *HTREEITEM;
@@ -2527 +2556 @@
 #define LVN_FIRST               (0U-100U)
 #define LVN_LAST                (0U-199U)
+
+// Property sheet reserved      (0U-200U) -  (0U-299U) - see prsht.h
+
 #define LVN_ITEMCHANGING        (LVN_FIRST-0)
 #define LVN_ITEMCHANGED         (LVN_FIRST-1)

trunk/include/win/treeview.h

@@ -1 @@
-/* $Id: treeview.h,v 1.11 2000-02-18 17:12:43 cbratschi Exp $ */
+/* $Id: treeview.h,v 1.12 2000-02-20 18:26:07 cbratschi Exp $ */
 /*
  * Treeview class extra info
@@ -12 +12 @@
 
 #define MINIMUM_INDENT        10
+#define ITEM_VSPACE            2
 #define TV_REFRESH_DELAY     100     /* 100 ms delay between two refreshes */
 #define TV_DEFAULTITEMHEIGHT  16
@@ -59 +60 @@
   UINT          uScrollTime;    /* max. time for scrolling in milliseconds*/
   UINT          uItemHeight;    /* item height, -1 for default item height */
-  UINT          uRealItemHeight;/* current item height in pixels */
+  UINT          uRealItemHeight;// current item height in pixels
+  UINT          uVScrollStep;   // scroll step in pixels
   UINT          uVisibleHeight; /* visible height of treeview in pixels */
   UINT          uTotalHeight;   /* total height of treeview in pixels */
@@ -67 +69 @@
   HTREEITEM     selectedItem;   /* handle to selected item or 0 if none */
   HTREEITEM     hotItem;        /* handle currently under cursor, 0 if none */
+  HTREEITEM     tipItem;        // item with tooltip
   HTREEITEM     editItem;       /* handle to item currently editted, 0 if none */
   HTREEITEM     firstVisible;   /* handle to first visible item */
@@ -73 +76 @@
   BOOL          insertBeforeorAfter; /* flag used by TVM_SETINSERTMARK */
   HIMAGELIST    dragList;       /* Bitmap of dragged item */
-  INT           cx,cy;          /* current x/y place in list */
+  POINT         lefttop;        //in pixels
   COLORREF      clrBk;
   COLORREF      clrText;

trunk/include/win/winuser.h

@@ -1 @@
-/* $Id: winuser.h,v 1.34 2000-02-14 17:27:55 cbratschi Exp $ */
+/* $Id: winuser.h,v 1.35 2000-02-20 18:26:08 cbratschi Exp $ */
 
 #ifndef __INCLUDE_WINUSER_H
@@ -343 +343 @@
 #define OBM_SIZE            32766
 #define OBM_OLD_CLOSE       32767
+
+//CB: Odin bitmaps -> unknown ID
+#define OBM_HELP            32730 //help button
+#define OBM_HELPD           32729 //pressed help button
 
 #define OCR_BUMMER          100