Commit Graph

193 Commits

Author SHA1 Message Date
Vadim Zeitlin
7880889720 Rebake everything using bakefile 0.2.7.
Also updated aclocal inputs and regenerated configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-22 16:53:10 +00:00
Vadim Zeitlin
c937bcac0f Add ellipsization support to wxDataViewCtrl.
Implemented ellipsization in the generic, GTK and both OS X Carbon and Cocoa
versions but it currently doesn't work well in GTK as it changes the item
alignment unconditionally, this will need to be fixed later.

The behaviour for the columns is currently inconsistent between ports too:
under MSW they (natively) use wxELLIPSIZE_END, under GTK -- wxELLIPSIZE_NONE
and under OS X the same ellipsization mode as the column contents, i.e.
wxELLIPSIZE_MIDDLE by default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-16 21:35:26 +00:00
Vadim Zeitlin
205bdf2069 Implement icon text column using native GTK renderers in wxDVC.
This has a possible advantage of a more native look and feel (although it's
hard to tell the difference between drawing the icon ourselves and how the
default GTK+ renderer does it to be honest) and a very real advantage of
allowing to edit in place cells with icons. It also reduces code duplication
in GTK implementation.

Modify the sample to make the icon-text column in the list model editable to
show that it works. This required storing the values of the second column as
well, so do it in its own array and to avoid calling it "m_array2", rename the
existing m_array to m_textColValues (which accounts for most of the diff in
the sample) and call the new one m_iconColValues.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-16 01:29:06 +00:00
Vadim Zeitlin
38c349189a Implement attributes support in generic wxDataViewIconTextRenderer.
Simply override RenderWithAttr() instead of Render().

Update the sample to show that this works now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 22:44:15 +00:00
Vadim Zeitlin
09a0ece0dc Fix display of items without attributes in Cocoa wxDVC.
The attribute used for the last item was reused for the next item in the same
column unless it was overridden in the attribute of this item, fix this by
remembering the original attribute and using it if no attributes are
explicitly specified.

Also change the sample to show the items without attributes in a column with
attributes and make the label correspond to the attribute of the item.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 17:30:48 +00:00
Vadim Zeitlin
77ea22ef1c Make the colours in the demo a bit more logical.
Make the colours of the items in the "attributes" column blue/green/red in
order instead of making all odd items blue and all even and divisible by 3
ones green while making the rest of them red -- it was a bit difficult to
figure out how it worked before.

Also correct wxDataViewItemAttr::SetItalic() check: comparing the remainder of
the division by 2 with 5 didn't risk to work.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 13:59:39 +00:00
Vadim Zeitlin
2d0d781336 Remove wxDataViewTextRendererAttr by merging it with wxDataViewTextRenderer.
There is no reason to have a separate class for rendering the text honouring
the attributes defined for it, wxDataViewTextRenderer itself already does this
perfectly well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 13:59:25 +00:00
Kevin Ollivier
d5e7ffcf7a Make sure all Bakefile formats that use CRLF line feeds are set to use CRLF in SVN.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 04:07:02 +00:00
Jouk Jansen
6470a6a950 adding dataview sample to OpenVMS make cascade
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-06 22:03:21 +00:00
Vadim Zeitlin
bb58fa37cd Don't hard code white background colour in generic wxDataViewCtrl.
wxDataViewMainWindow::OnPaint() always used the white brush to erase the
control background which was wrong, change it to use the background colour of
the control.

Also add tests for setting wxDataViewCtrl foreground and background colours to
the dataview sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-26 16:43:19 +00:00
Vadim Zeitlin
d12d9edacb Rebake all the samples, demos and tests makefiles.
This should have been committed together with the changes to the debug flags
handling in build/bakefiles in r61887.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-12 13:38:08 +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
43b2d5e7c3 Put braces around all calls to wxLogFunctions() inside an if statement.
This suppresses all the remaining g++ -Wparentheses warnings and uses consistent style everywhere.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-20 16:47:54 +00:00
Robert Roebling
0a807957e6 Closes #10495: wxDataViewCtrl needs a way to start the label editor programmatically, also Windows port now emits vetoable ..._EDITING_STARTED event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-01 13:57:38 +00:00
Vadim Zeitlin
ab5c51e5b2 don't update stc.h when not building the library, it doesn't make sense to do this in the samples makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-12 09:13:36 +00:00
Kevin Ollivier
23513e07f5 Rebake after latest changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-26 02:04:16 +00:00
Chris Elliott
95ff11c4bb update bakefile to 0.2.6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-24 10:36:24 +00:00
Robert Roebling
1c9588456e Add test for wxDataViewColumn::GetWidth
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-07 19:33:35 +00:00
Kevin Ollivier
2fd716136a Rebake after last change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-15 16:14:56 +00:00
Kevin Ollivier
0f425df617 Rebake after Mac bundle change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-13 05:27:13 +00:00
Robert Roebling
a82e28dd03 Change Compare() method to being const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-10 14:06:04 +00:00
Robert Roebling
ecc322264b Implement vetoing editing in wxDataViewTextRenderer under GTK+ and test it in the sample (see also #10495)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-09 20:49:22 +00:00
Francesco Montorsi
caa4f8ff5c fix typo (part of r59384)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-06 20:45:56 +00:00
Francesco Montorsi
ecad59d882 remove wxT() and _() macros to make the sample more readable; add File->Clear log menuitem; re-add m_container flag in MyMusicTreeModelNode and describe in a TODO/FIXME item why it's needed; warn when selecting the ninth symphony is not possible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-06 20:45:04 +00:00
Robert Roebling
d2ee27fe25 added test for wxDataViewCtrl::Expand() and ::Collapse()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-06 19:20:25 +00:00
Robert Roebling
4931e96a36 Add new line at the end of the file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-06 19:13:54 +00:00
Vadim Zeitlin
bfb9ad8b60 2nd (blind) fix for VC6 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-05 23:41:27 +00:00
Vadim Zeitlin
03dfc8f515 set svn properties correctly for the new files (please use the auto-props!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-05 14:00:46 +00:00
Vadim Zeitlin
a4991d4333 (blind) fix for VC6 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-05 13:58:12 +00:00
Francesco Montorsi
8bf6f04451 build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-04 23:23:28 +00:00
Francesco Montorsi
81c3f0fce3 all code revisited.
Main additions:
- now it's possible to change the DVC style dynamically
- make models more robust against deleting items, and against other allowed user actions
- comment portions of the code to make it more didactive

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-04 22:33:18 +00:00
Francesco Montorsi
bf19b714f0 reorganize the sample splitting it in two source files and an additional header; most important: don't tile all the controls into the main frame: it becomes too big; rather use a notebook control to properly layout them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-04 17:21:40 +00:00
Kevin Ollivier
7da00c46e1 Land the rest of the changes made by a rebake after r59067.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-02 20:11:39 +00:00
Robert Roebling
05527158e5 Use wxDF_UNICODETEXT to make wxMSW crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-21 15:14:33 +00:00
Paul Cornett
8c2654ce3d build fixes and cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-20 17:50:51 +00:00
Robert Roebling
9623be70d0 Typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-20 13:54:26 +00:00
Robert Roebling
d0a0c6e36a Minor error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-20 13:54:06 +00:00
Robert Roebling
e4de825ee6 Add event based Drop API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-20 13:46:21 +00:00
Robert Roebling
591cc82deb Simplified event based Drag API for wxDataViewCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-20 11:58:52 +00:00
Robert Roebling
15cac64f75 New eventb based Drag interface for wxDataViewCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-19 22:27:06 +00:00
Robert Roebling
95b20f41b6 Rename XxxxCol() -> XxxxColumn() and resolve inheritance problems from it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-19 14:44:47 +00:00
Vadim Zeitlin
31848e7da5 remove MSVC solution files from svn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-17 13:22:59 +00:00
Robert Roebling
dc813e6c7e Added wxDataViewListCtrl, use it in the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-16 15:04:00 +00:00
Robert Roebling
8eff6c56f0 Change GetValue() and SetValue() to GetValueByRow() and SetValueByRow() in row based interface, Add wxDataViewListStore (WIP)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-16 11:23:37 +00:00
Vadim Zeitlin
b44f5137ce link with wininet.lib under Windows to avoid linking errors in wxUSE_URL_NATIVE==1 build (#10338)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-15 13:33:51 +00:00
Francesco Montorsi
d6a3ec35c8 don't crash if an item has a NULL ID
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-14 16:10:02 +00:00
Robert Roebling
10ab6d4f65 Correct wxDataViewCtrl::IsExpanded and add test for it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-17 22:26:40 +00:00
Vadim Zeitlin
fbc25b5107 make first column non-draggable to test support for this flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-09 23:31:32 +00:00
Vadim Zeitlin
fba41cf33a skip the header click event to allow sorting (done in the default handler) to take place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-08 21:14:00 +00:00
Vadim Zeitlin
fed76ce1e7 test non-resizeable and resizeable but with min size set columns
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-08 16:50:26 +00:00