Commit Graph

197 Commits

Author SHA1 Message Date
Vadim Zeitlin
ee4b272189 replaced untyped hash with a typed one; 64 bit fixes (don't cast pointers to long...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 21:06:59 +00:00
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 19:55:12 +00:00
Vadim Zeitlin
35cf1ec63c fixes to allow dragging in multiselection tree ctrl (patch 759421)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 13:03:30 +00:00
Vadim Zeitlin
8a000b6b9e added state image support (patch 530155)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 11:16:34 +00:00
Vadim Zeitlin
7ab0c3adb7 keep selected image in sync with the normal one if it hasn't been changed (patch 754906)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 11:04:37 +00:00
Robin Dunn
f2c3db9d7d Patch #753465 a fix for Bug#750363.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 18:53:42 +00:00
Julian Smart
b39dbf34b8 Applied patch [ 736322 ] Remove TWINE support, merge it in Wine.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-23 19:16:45 +00:00
Julian Smart
1fdf858b87 Applied patch [ 740012 ] GetKeyState returns 16-Bit value on WindowsNT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 18:43:03 +00:00
Julian Smart
7699361c96 Rationalised style handling in tree control
No longer use WS_EX_WINDOWEDGE since it seems to be obsolete,
and has no effect


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-13 15:20:50 +00:00
Ron Lee
04cd30dea2 Update wxList operators, TRUE, FALSE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 04:52:21 +00:00
Vadim Zeitlin
22f3361e1c use DECLARE_NO_COPY_CLASS() where applicable (patch 633384)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:38:11 +00:00
Vadim Zeitlin
df4ac4c7e9 fixed bug with wxTR_EDIT_LABELS not working with xwTR_MULTIPLE (bug 622089)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 20:21:41 +00:00
Ron Lee
99006e446e Added wxTreeCtrl::GetItemParent to deprecate GetParent.
Moved GetParent into WX_COMPAT_2_2 and exposed base GetParent in
that case too.

Replaced all lib/sample uses of wxTC::GetParent with GetItemParent.

Updated docs to suit.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-29 07:48:21 +00:00
Vadim Zeitlin
bfedf6212c reset virtual root to NULL in DeleteAllItems()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 23:22:38 +00:00
Vadim Zeitlin
7e1525b2e7 fixed warning about unused var
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 16:42:27 +00:00
Vadim Zeitlin
7bb8798ce7 fixed annoying beep when pressing space/return in the tree
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 16:41:04 +00:00
Václav Slavík
69a8b5b457 Fixed EVT_TREE_SEL_CHANGED and _CHANGING under MSLU (patch 631815)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 13:23:03 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Julian Smart
dd23c25cde Applied patch [ 605189 ] add edit cancel notify to wxTreeEvent
Benjamin I. Williams

Currently there is no way of receiving notification
that a user cancelled an edit operation on a wxTreeCtrl
tree node label.

This patch adds a method "IsEditCancelled" to the
wxTreeEvent class. During an EVT_TREE_END_LABEL_EDIT
event, the programmer can now determine whether or not
the edit operation was cancelled by the user (by
pressing <ESC>).

This patch provides this implementation for both
wxMSW's wxTreeCtrl and the wxGenericTreeCtrl. Both
situations have been tested and work well.

The patch is not very invasive, and is much smaller
than I had expected.

Please see the relevent discussion on the wx-dev list
for more details.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-05 19:50:41 +00:00
Vadim Zeitlin
2076893b53 use standard colour for the selected tree item text as well as background
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-04 14:30:25 +00:00
Julian Smart
de6ac3397d Applied patch [ 599043 ] fix for wxTreeCtrl/MSW right-click prob
Benjamin I. Williams

There currently is a very significant problem with the
right-click behavior in wxTreeCtrl. The attached patch
file fixes this problem.

To better understand the problem, load up the tree
control, and start right-clicking on items. Note how
the focus rectangle does not behave properly. Next,
enable multiple selection. Now select several items,
and start right-clicking on the selected items. Note
how the selection highlights disappear.

If you try the tree sample with the generic tree
control, you will notice that the problem does not
occur, and that the tree control behaves properly.

This patch brings the MSW tree control implementation
in line with the generic implementation. This is the
same behavior that one can notice in applications such
as windows explorer and Visual Studio.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-31 12:12:54 +00:00
Vadim Zeitlin
1944ad7618 1. more consistency in wxTree/ListEvent methods naming convention:
GetKeyCode() instead of GetCode()
2. wxTreeEvent::GetKeyEvent()::IsAltDown() now works under MSW
3. wxTreeEvent::GetKeyCode() works for alnum keys


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-07-21 14:29:13 +00:00
Vadim Zeitlin
bf43d750e6 fix tree icon refresh after collapsing a branch (patch 565294)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-07 20:39:22 +00:00
Vadim Zeitlin
44fbc477af made SetItemText() work for the item which we're about to start editing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-17 23:54:42 +00:00
Mattia Barbon
cd6bd27059 Moved text control subclassing code inside MSWOnNotify.
Now all edit controls for tree labels are subclassed (previously only the ones
  created by EditLabel were ).
Now GetEditControl() always returns a pointer to a textctrl when editing
  is in progress.
Removed #if-0 code in GetEditControl() to do the above.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-16 20:05:47 +00:00
Vadim Zeitlin
a37f9c6db4 always handle Enter ourselves while editing tree ctrl labels
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-12 22:27:37 +00:00
Václav Slavík
e961638138 fixed incorrect wxCHECK (was a wrong negation before)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-09 22:44:38 +00:00
Václav Slavík
0d6a01017d Don't allow expanding/collapsing hidden root
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-07 23:14:46 +00:00
Vadim Zeitlin
9c7df356f9 added raw key code and flags support (based on patch from Bryce Denney)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-07 21:06:59 +00:00
Václav Slavík
22fb32d507 restored old casts (there was a reason for them)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-17 00:51:18 +00:00
Vadim Zeitlin
efa3835048 another minor fix for wxTR_HIDE_ROOT case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-16 15:28:04 +00:00
Vadim Zeitlin
c9b142c9f8 fix for GetParent() in wxTR_HIDE_ROOT case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-16 15:10:12 +00:00
Vadim Zeitlin
a9c1265fca added support for wxTR_HIDE_ROOT style (patch 529614)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-16 15:08:20 +00:00
Vadim Zeitlin
deb1de3003 refresh the item whose image depends on the expanded/collapsed state after expanding it to ensure that it is shown correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-16 15:32:10 +00:00
Václav Slavík
a756f21001 use the new wxSystemSettings API everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-08 23:53:01 +00:00
Vadim Zeitlin
cf48ccc00c fixed handling of the items with indirect data broken yesterday
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-23 13:38:23 +00:00
Vadim Zeitlin
502a2b1810 fixed sorting the items which have indirect data (i.e. images set for open/closed state) and made indirect data handling much simpler and more efficient as a side effect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-23 01:00:32 +00:00
Vadim Zeitlin
5ece068d9f compilation fix for old mingw32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-18 18:26:52 +00:00
Václav Slavík
c6f4913a76 applied patch that adds wxTR_FULL_ROW_HIGHLIGHT to wxTreeCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-17 00:30:23 +00:00
Vadim Zeitlin
d00407b2c6 fixed flicker in wxTreeCtrl::SetItemXXX()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-15 22:20:54 +00:00
Julian Smart
13ff9344d6 Attempted to fix splittree problem by not pushing event handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-01 12:26:27 +00:00
Vadim Zeitlin
8191741f68 pass correct key code in TREE_KEY_DOWN event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-24 22:52:18 +00:00
Vadim Zeitlin
b09bda689c added wxTreeEvent::GetKeyEvent() to allow to retrieve the key event flags from EVT_TREE_KEY_DOWN event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-24 16:39:49 +00:00
Vadim Zeitlin
bf9b6266fa applied patch 446014 (misc mingw fixes from Mattia)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 19:02:17 +00:00
Vadim Zeitlin
d7926e0b76 backported fix for proper tree ctrl refershing after changing item colour/font from 2.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 01:28:18 +00:00
Vadim Zeitlin
5438a5665e applied patch 439186 (mingw and VC5 fixes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 23:02:09 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Vadim Zeitlin
c8f144761c fix for crash when pressing TAB in the tree text control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-09 15:57:51 +00:00
Julian Smart
ae090fdb7f Support for Cygwin 1.0 (thought it worked before, but...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-08 15:04:00 +00:00
Julian Smart
b07664068b Applied patch #420395 (adding wxCLIP_SIBBLINGS capability -- but not by default)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-16 11:14:37 +00:00