From 188b816d6d521e12b32e51fdbd1bac86d456b06c Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期三, 17 七月 2024 17:47:43 +0800
Subject: [PATCH] update
---
jrj/xframe/xcontrol/xtreeview.hpp | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/jrj/xframe/xcontrol/xtreeview.hpp b/jrj/xframe/xcontrol/xtreeview.hpp
index 4fa7b47..f0601aa 100644
--- a/jrj/xframe/xcontrol/xtreeview.hpp
+++ b/jrj/xframe/xcontrol/xtreeview.hpp
@@ -49,6 +49,7 @@
#define TV_FIRST 0x1100
+#ifdef XWIN
struct SCROLLINFO
{
int cbSize;
@@ -59,6 +60,8 @@
int nPos;
int nTrackPos;
};
+#endif
+
struct tvitem
{
@@ -123,7 +126,7 @@
return (HTREEITEM)SendMessage(GetHWND(), TVM_GETNEXTITEM, TVGN_CARET,0);
}
- string GetItemLabel(HTREEITEM hItem)
+ xstring GetItemLabel(HTREEITEM hItem)
{
int TVM_GETITEM = TV_FIRST + 62;
@@ -387,7 +390,7 @@
return InsertChildItemEx(hItem, label, ele.ptr(), image,image2);
}
- HTREEITEM InsertChildItemEx(HTREEITEM hItem,string label,int data,int image = 0,int image2 = 0)
+ HTREEITEM InsertChildItemEx(HTREEITEM hItem,string label,LPARAM data,int image = 0,int image2 = 0)
{
int TVM_INSERTITEM = TV_FIRST + 50;
@@ -520,13 +523,13 @@
void SetLineAtRoot(bool value)
{
- int GWL_STYLE = -16;
- int TVS_LINESATROOT = 0x0004;
- int style = GetWindowLong(GetHWND(), GWL_STYLE);
+ int GWL_STYLE_ = -16;
+ int TVS_LINESATROOT_ = 0x0004;
+ int style = GetWindowLong(GetHWND(), GWL_STYLE_);
if (value)
- SetWindowLong(GetHWND(), GWL_STYLE, style | TVS_LINESATROOT);
+ SetWindowLong(GetHWND(), GWL_STYLE_, style | TVS_LINESATROOT_);
else
- SetWindowLong(GetHWND(), GWL_STYLE, style & ~TVS_LINESATROOT);
+ SetWindowLong(GetHWND(), GWL_STYLE_, style & ~TVS_LINESATROOT_);
}
};
\ No newline at end of file
--
Gitblit v1.9.3