Commit Graph

330 Commits

Author SHA1 Message Date
Dimitri Schoolwerth
33b26197a5 Fixed keyboard navigation in generic tree control.
Under MSW any cursor key presses would not be handled by the generic tree control (and it would lose focus). Added the style wxWANTS_CHARS to the creation of wxGenericTreeCtrl to fix keyboard navigation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 06:06:34 +00:00
Vadim Zeitlin
59cd3bbd6c Fix child selection in multi-selection generic wxTreeCtrl.
The children which are not currently shown on the screen shouldn't be affected
by Shift-selecting in multi-selection control.

Closes #1312.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 00:44:47 +00:00
Robin Dunn
c141046071 Fix the size of the tree's text editing box on Cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-25 23:18:19 +00:00
Dimitri Schoolwerth
4c51a665c6 Fixed various typos.
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch.

Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot").

Closes #13063 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 14:17:38 +00:00
Stefan Csomor
6485c8d7fb replace usage of objective-c keyword 'id'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 07:22:56 +00:00
Julian Smart
887b919bde Added wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT to fix tree and list control selection rendering.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-25 09:38:35 +00:00
Stefan Csomor
2895324520 merging back XTI branch part 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:31:53 +00:00
Steve Lamerton
2a4a928df7 Send generic wxTreeCtrl wxEVT_COMMAND_TREE_KEY_DOWN events from OnKeyDown rather than OnChar. This change means it sends events for the same keys as the wxMSW control. It also fixes the failing unit test.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-22 10:06:39 +00:00
Vadim Zeitlin
e90c93b605 Use wxFont::Bold() in wxGenericTreeCtrl instead of wrongly duplicating it.
Creating a new wxFont from the components of the existing one doesn't always
work because we may not have a valid value for the old font family so attempt
to use it as a family of the new font results in an assert.

Just use wxFont::Bold() instead to avoid the problem. It's much shorter and
obviously correct and doesn't result in asserts.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 17:43:06 +00:00
Vadim Zeitlin
fbf3385651 Make keyboard navigation in generic wxTreeCtrl more Mac-like under OS X.
In the native OS X tree control right cursor arrow expands the current item
and the left one collapses it if it's expanded, make the generic control work
like this too under Mac.

Closes #12019.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-06 12:58:22 +00:00
Vadim Zeitlin
5708ae18f2 Add wxTreeCtrl::{Clear,Set}FocusedItem().
Allow changing just the currently focused (not selected) item and also
removing the focus completely.

Closes #11599.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-02 12:01:30 +00:00
Stefan Csomor
7eb8aeb8b1 using statically allocated font objects for speedup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-08 18:47:41 +00:00
Vadim Zeitlin
5cb3a695e0 Add wxTreeCtrl::SelectChildren() method.
Add MSW and generic implementation, documentation and change to the sample
showing it.

Closes #11620.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-26 12:43:39 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Vadim Zeitlin
842adaf697 simplify ScrollTo()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-28 21:50:55 +00:00
Vadim Zeitlin
756c98b02e fix bug in generic wxTreeCtrl: calling SelectItem(true) on an already selected item shouldn't toggle its selection (see #10830)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-06 14:15:06 +00:00
Stefan Csomor
f1c40652a0 reworked font handling for osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-20 13:56:57 +00:00
Robert Roebling
ec2f175241 Never show tree lines when there are tree buttons under OS X and GTK+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-28 17:30:41 +00:00
Robert Roebling
668674c1e2 If a selected item is about to be deleted, try to select the next one first, otherwise the parent, like the wxMSW does
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-19 20:18:53 +00:00
Francesco Montorsi
977a41ec3e use YieldFor() in wxTopLevelWindowGTK::RequestUserAttention; comment on the use of YieldFor() in wxProgressDialog; add some TODOs near wxYieldIfNeeded()/wxSafeYield() calls in wxListCtrl, wxDataViewCtrl, wxTreeCtrl (closes #10320)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-15 15:42:15 +00:00
Vadim Zeitlin
c0c133e13b add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 11:45:59 +00:00
Vadim Zeitlin
ec676e4ff1 Mac build fixes after latest change (closes #10433)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-25 19:18:58 +00:00
Vadim Zeitlin
ce43f9e115 use GetBoundingRect() for the in place text control positioning instead of duplicating its code (see #9591)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-25 18:21:36 +00:00
Vadim Zeitlin
136b7e61f5 corrections to size calculations for state images (see #9591)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-25 18:20:26 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-19 13:55:27 +00:00
Robert Roebling
c0d2308b25 Use paint handler instead of wxClientDC to draw DnD visual effects within wxTreeCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-15 20:57:06 +00:00
Stefan Csomor
7ac5e1c908 adding 10.4 build compatibility for osx cocoa, see #10361
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-12 20:14:39 +00:00
Vadim Zeitlin
9f2968ad0b make colours used by list and tree controls more consistent with the system theme settings; also use the correct colour for the status bar (closes #10089)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-25 13:03:24 +00:00
Paul Cornett
e253521dda fix for assert failure when first paint event occurs before first idle event, #10085
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-20 16:50:20 +00:00
Vadim Zeitlin
e822d1bd5f fix more Borland release build warnings about unused variable/code without effect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-20 10:30:49 +00:00
Vadim Zeitlin
419875a6f5 use renderer for drawing the item background on ports other than GTK2 and Mac too (why not?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-20 08:58:52 +00:00
Vadim Zeitlin
cac09ce8b7 cache the item text size to optimize tree layout/painting (#9956)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-13 21:28:57 +00:00
Vadim Zeitlin
8239070ba9 no real changes, just some reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-13 20:55:34 +00:00
Stefan Csomor
530a427a4c adaptions to new osx ouside the main trees
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-02 17:00:30 +00:00
Stefan Csomor
96f04e1df6 OSX regrouping
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-29 19:50:14 +00:00
Robert Roebling
4754ab1630 Next part of tree state icon patches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-24 12:48:01 +00:00
Robert Roebling
03966fcb3f #9591: Item state (icons) for wxTreeCtrl on any platform
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-16 17:50:40 +00:00
Stefan Csomor
33ddeabab9 fixing file paths after renaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-11 19:23:52 +00:00
Václav Slavík
ec64d5ca7b no need to export private list/arrays of generic controls' implementations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-24 15:07:30 +00:00
Paul Cornett
04ee05f92a fix a huge number of build errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-17 18:26:00 +00:00
Václav Slavík
ad1c5f459b fixed wxGenericTreeCtrl::DoThaw to call base class' method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-04 10:06:05 +00:00
Vadim Zeitlin
6621957fe2 use platform-specific styles in xTR_DEFAULT_STYLE but don't impose them forcefully in wxGenericTreeCtrl ctor as this prevents people from using them even if they explicitly want to do it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-12 23:06:09 +00:00
Robert Roebling
a8a8915453 Applied [ 1867939 ] fixes for wxTreeCtrl crashes when exiting from label editing to wxListCtrl as well and made code more similar to wxTreeCtrl' code doing the same
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-10 14:58:21 +00:00
Robert Roebling
d0e2c75cfa Simplified code and applied [ 1867939 ] fixes for wxTreeCtrl crashes when exiting from label editing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-10 14:35:30 +00:00
Vadim Zeitlin
17808a7596 move Freeze() and Thaw() to wxWindowBase to ensure that they behave consistently (i.e. recursively, as described in the docs) in all ports; removed different duplications of freeze count from derived classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-05 00:21:31 +00:00
Stefan Csomor
e51bc1ec1a font updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-01 05:21:11 +00:00
Stefan Csomor
9553702e46 mac cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-20 16:21:04 +00:00
Vadim Zeitlin
624f89c2d7 don't update the tree unnecessarily in Expand/CollapseAllChildren() (patch 1809520)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-20 14:55:50 +00:00
Vadim Zeitlin
f73eddd2a5 made wxTreeCtrl::GetNextVisible() behave in the same way in Win32 as in the generic version and implemented GetPrevVisible() in the generic version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-07 21:58:51 +00:00
Vadim Zeitlin
f0eebb39bc don't create m_dottedPen with an invalid 0 style which results in an assert under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-07 21:48:09 +00:00