Changeset 2805

Timestamp:

Feb 16, 2000, 6:21:06 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

Location:

trunk

Files:

• changelog (modified) (1 diff)
• include/win/commctrl.h (modified) (6 diffs)
• include/win/treeview.h (modified) (4 diffs)
• src/user32/win32wbase.cpp (modified) (2 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.733 2000-02-16 14:16:33 sandervl Exp $ */
+ /* $Id: changelog,v 1.734 2000-02-16 17:19:56 cbratschi Exp $ */
+
+ 2000-02-16: Christoph Bratschi <cbratschi@datacomm.ch>
+        - COMCTL32: treeview: switched to unicode, fixed many bugs
 
  2000-02-16: Sander van Leeuwen <sandervl@xs4all.nl>

trunk/include/win/commctrl.h

@@ -1 @@
-/* $Id: commctrl.h,v 1.20 2000-02-14 17:27:54 cbratschi Exp $ */
+/* $Id: commctrl.h,v 1.21 2000-02-16 17:20:28 cbratschi Exp $ */
 /*
  * Common controls definitions
@@ -1869 +1869 @@
 #define TVIF_CHILDREN         0x0040
 #define TVIF_INTEGRAL         0x0080
-#define TVIF_DI_SETITEM           0x1000
+#define TVIF_DI_SETITEM       0x1000
 
 #define TVI_ROOT              ((HTREEITEM)0xffff0000)     /* -65536 */
@@ -1883 +1883 @@
 #define TVIS_EXPANDED         0x0020
 #define TVIS_EXPANDEDONCE     0x0040
+#define TVIS_EXPANDPARTIAL    0x0080
 #define TVIS_OVERLAYMASK      0x0f00
 #define TVIS_STATEIMAGEMASK   0xf000
@@ -1974 +1975 @@
 #define TVITEM     WINELIB_NAME_AW(TVITEM)
 #define LPTVITEM   WINELIB_NAME_AW(LPTVITEM)
+#define LPTV_ITEM   LPTVITEM
 #define TV_ITEM     TVITEM
 
@@ -2087 +2089 @@
 
 #define TV_HITTESTINFO TVHITTESTINFO
+
+#define TV_KEYDOWN      NMTVKEYDOWN
+
+typedef struct tagTVKEYDOWN {
+    NMHDR hdr;
+    WORD wVKey;
+    UINT flags;
+} NMTVKEYDOWN, *LPNMTVKEYDOWN;
 
 
@@ -2303 +2313 @@
   SendMessageA((hwndTV), TVM_SETITEM, 0, (LPARAM)(TV_ITEM *)&_TVi); \
 }
+
+#define TreeView_SetUnicodeFormat(hwnd, fUnicode)  \
+    (BOOL)SendMessageA((hwnd), TVM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0)
+
+#define TreeView_GetUnicodeFormat(hwnd)  \
+    (BOOL)SendMessageA((hwnd), TVM_GETUNICODEFORMAT, 0, 0)
 
 /* Listview control */

trunk/include/win/treeview.h

@@ -1 @@
-/* $Id: treeview.h,v 1.8 2000-02-14 17:27:55 cbratschi Exp $ */
+/* $Id: treeview.h,v 1.9 2000-02-16 17:20:29 cbratschi Exp $ */
 /*
  * Treeview class extra info
@@ -5 +5 @@
  * Copyright 1998 Eric Kohl
  * Copyright 1998 Alex Priem
+ * Copyright 2000 Christoph Bratschi
  */
 
@@ -24 +25 @@
   UINT      state;
   UINT      stateMask;
-  LPSTR     pszText;
+  LPWSTR    pszText;
   int       cchTextMax;
   int       iImage;
@@ -49 +50 @@
 {
   UINT          uInternalStatus;
-  UINT          bAutoSize;      /* merge with uInternalStatus */
   INT           Timer;
   UINT          uNumItems;      /* number of valid TREEVIEW_ITEMs */

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.163 2000-02-16 14:28:22 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.164 2000-02-16 17:21:06 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -683 +683 @@
             }
 
-            //CB: timew32.exe, blockcad.exe -> children not shown!!!
             if (cs->style & WS_VISIBLE) ShowWindow(sw);