Commit Graph

67 Commits

Author SHA1 Message Date
Vadim Zeitlin
40e7f56c71 applied patch for calculating the tree items size with non default font (patch 520965)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-21 15:09:13 +00:00
Vadim Zeitlin
6f0dd6b274 fixed SetForegroundColour() for the generic tree ctrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-20 17:42:05 +00:00
Kendall Bennett
574c939ef1 Merges from Scitech Branch (George Davison):
Added wxDisplayChangedEvent and triggering in MSW, when display mode changes
this event gets triggered. I don't know what should happen with other OS's
since I am not familiar with how they handle mode changes.

Watcome Version 11 now compiles with wide character support.

Fixed watcom warnings in
	html/htmlwin.h
	imagbmp.h
	listctrl.h
	imagbmp.cpp
	quantize.cpp
	strconv.cpp
	variant.cpp
	dirctrlg.cpp
	treectlg.cpp
	m_style.cpp
	fontenum.cpp
	listctrl.cpp
	ole\dataobj.cpp
	textctrl.cpp
	window.cpp
	xml.cpp

msw/setup.h
	with watcom version 11 it now compiles with wide character support.

xrc/xml.cpp
	fixed memory leak and compile warnings


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-07 18:46:31 +00:00
Vadim Zeitlin
be93a00bb4 made XPMs const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-12 15:00:25 +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
Václav Slavík
cf31a1d7b6 fix order of initializiton of rootless treectrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-05 23:27:42 +00:00
Vadim Zeitlin
0a33446c8e don't crash in UnselectAll() if the tree has no root
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-03 17:39:28 +00:00
Robert Roebling
d21d2e5adf Smooth Aqua buttons in wxTreeCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-17 01:20:25 +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
Robert Roebling
17d5bdf9e9 Aqua gets Aqua tree buttons automatically now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-15 13:49:05 +00:00
Robert Roebling
f6eaeda1b0 Small optical fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-10 11:55:16 +00:00
Robert Roebling
2593f03384 Changed wxTreeCtrl to look Mac-like under Mac
automatically.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-10 11:21:28 +00:00
Robert Roebling
dd5a32cc2d Changed semantics of clicking beside the text control
when editing a label. This now accepts the input.
 My attempt to make the focus return to the owning
   tree and list control window failed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-09 21:15:56 +00:00
Vadim Zeitlin
607d9cfc56 oops, a typo in the last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-09 14:38:23 +00:00
Vadim Zeitlin
59a2e6354d ItemHasChildren() should return TRUE for the items which have plus button as they could have children even if they currently don't
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-09 14:35:54 +00:00
Václav Slavík
e76520fdf8 fixed rendering of expanded nodes with exactly one child
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-07 22:44:02 +00:00
Václav Slavík
2b84e565c6 applied Greg's refinment of hist treectrl patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-23 19:39:04 +00:00
Mattia Barbon
9e0a12c958 Changed char* to wxChar* in wxColour constructor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-16 19:05:56 +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
0800a4ba40 typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 12:07:45 +00:00
Vadim Zeitlin
7009f411aa refresh the tree ctrl when its back/foreground colour changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 12:06:53 +00:00
Vadim Zeitlin
ebb987b77b double click handling is finally correct in the treectrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-21 15:17:48 +00:00
Robert Roebling
c9c4b3a009 Fixed focus event problems with control derived
from wxScrolledWindow.
  If wxTreeCtrl has no +/. button, toggle branch,
    otherwise send activate event upon double-click.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-21 11:12:42 +00:00
Vadim Zeitlin
68eb5f6337 allow user code to override key handling in wxTreeCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 19:25:00 +00:00
Vadim Zeitlin
de57703a0c fixed text fg colour for selected but unfocused items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 15:22:15 +00:00
Vadim Zeitlin
b771aa29dd draw the selected items in another colour when the control doesn't have focus, a bit like MSW does
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 14:13:34 +00:00
Robert Roebling
618a5e382a Applied Greg's patch to tree control and related.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-18 13:09:26 +00:00
Vadim Zeitlin
5716a1abb1 compilation fixes for VC++ in release mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-15 15:26:27 +00:00
Vadim Zeitlin
cdebf9851e use item colour when drawing the focused item if we don't highlight it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 19:49:37 +00:00
Vadim Zeitlin
837f2b6872 don't draw the focused item rect around the image
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 19:29:47 +00:00
Vadim Zeitlin
cdb3cffe0e don't draw the selected item background if we don't have the focus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 19:12:13 +00:00
Robert Roebling
4f5fffcc74 Fix tree control invalid pointer after drag bug.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 21:37:15 +00:00
Robert Roebling
2cc7838931 Up-ported code to make tree item visible when programmatically
selected.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 19:36:25 +00:00
Robert Roebling
ef70f0ecdb Mac-ify wxTreeCtrl further.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 14:27:25 +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
Robert Roebling
87dde0b5fc Forgot ! in wxTreeCtrl flag test.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-30 15:53:35 +00:00
Stefan Csomor
ed4ddd3393 adapted background color for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-29 21:11:26 +00:00
Robert Roebling
b77d96500a wxTreeCtrl Mac look
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-27 19:17:10 +00:00
Robert Roebling
c22886bdaf Tried to make wxTreeCtrl on Mac look more Maccy. Part I.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-27 13:07:09 +00:00
Kendall Bennett
33ac7e6f01 Updates to fix Watcom C/C++ 11.0 compiler warning problems. Now compiles
clean with this compiler. Hopefully I did this without breaking other
compilers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-02 19:48:15 +00:00
Julian Smart
3d5aff50cb Remvoed a yield in HitTest because of undesirable consequences
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 17:05:15 +00:00
Julian Smart
3da2715fb8 Corrected include/wx/palette.h; added wxGenericTreeCtrl::SetFont
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-24 16:38:02 +00:00
Julian Smart
a69cb1cc9d No longer paint the selection background under the image
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-18 17:13:31 +00:00
Vadim Zeitlin
6359fa0e03 argh! patch misapplied the patch in another place as well, fixing this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 12:29:24 +00:00
Vadim Zeitlin
0326c494a9 oops... wrong patch, second try
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 12:25:51 +00:00
Vadim Zeitlin
42191a1dbf fix for clicking on the button from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 12:23:54 +00:00
Julian Smart
cd66f45bfe Changed wxYield calls to wxYieldIfNeeded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-22 12:10:02 +00:00
George Tasker
ed2ec17c54 Changed declaration of TREE events from being in both treectlg and treectrl to having it just once in treebase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-01 15:27:16 +00:00
Vadim Zeitlin
2e4df4bfaf 1. made compilation with WXWIN_COMPATIBILITY_EVENT_TYPES really work
2. moved ~50% of the event types in their own headers/sources from event.h/cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 17:16:40 +00:00
Julian Smart
c3c979c7b8 Modified treectrlg.cpp not to crash in HitTest if there's no m_anchor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 16:12:43 +00:00