Commit Graph

47 Commits

Author SHA1 Message Date
jonkraber
7f52ff751f Fix clipping of cell contents in wxGrid
Use wxDCClipper, now that it doesn't lose the previously set clipping
region any more, in wxGridCellStringRenderer::Draw() to ensure that we
don't overflow the area allocated for the cell.

Closes #17872.
2017-12-24 15:46:57 +01:00
Vadim Zeitlin
2e8988c3d6 Add wxGridCellRenderer::GetBest{Height,Width}() and use them in wxGrid.
Allow the renderer to specify the best height at the given width (or vice
versa) instead of the best size in both direction which is not defined for
e.g. wxGridCellAutoWrapStringRenderer.

Closes #15943.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-04 22:12:42 +00:00
Vadim Zeitlin
8965331963 Simplify wxGridCellAutoWrapStringRenderer::GetBestSize().
The code there was pretty wild, making clearly wrong assumptions (column size
doesn't, and AFAICS never did, include 20 pixel margin) and also was clearly
uncertain about what it was doing by trying to limit the number of iterations
to some arbitrary cutoff when it is pretty clear that the loop increasing the
width and decreasing the height on each iteration will reach the condition of
"width >= height*1.68" sooner or later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-04 00:14:10 +00:00
Vadim Zeitlin
85d2dec9f0 Don't crash in wxGridCellAutoWrapStringRenderer when the column is hidden.
Our methods should arguably not be called at all in this case, but if this
does happen, at least don't crash.

Closes #15464.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-04 00:14:05 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
0ec98fd6c9 Improve wxGrid cell wrapping in wxGridCellAutoWrapStringRenderer.
Wrap the words too long to be shown on one line on several lines.

Also take the line breaks and TABs into account.

Closes #15249.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-16 10:50:54 +00:00
Vadim Zeitlin
1d8d3cc5a1 Add support for custom numeric formats to wxGrid.
Allow %e and %g formats (as well as their upper-letter equivalents) in
addition to the default %f format for number display in wxGrid.

Closes #13583.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 13:23:33 +00:00
Dimitri Schoolwerth
d13b34d3f2 No code changes, fixed various typos.
Applied patch by snowleopard2 fixing typos in interface/. Extended the fixes throughout trunk.

Closes #13076.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-03 20:31:32 +00:00
Dimitri Schoolwerth
80fdcdb90e No changes, synchronised source names that appear commented at the top of files with the actual path to the files.
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:14:35 +00:00
Vadim Zeitlin
db890987c6 Add documentation for several grid cell renderer/editor classes.
Document the previously undocumented renderers and editors.

Closes #11965.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-22 11:20:50 +00:00
Vadim Zeitlin
cfbc15ee04 Allow changing horizontal alignment of numeric cells in wxGrid.
wxGridCellAttr didn't provide any way to query its alignment attributes
without falling back to the (always defined) default alignment so the code in
wxGridCellNumberRenderer and similar classes simply always used right
alignment,

Add a new wxGridCellAttr::GetNonDefaultAlignment() function which allows to
retrieve the alignment defined in the attribute and use it to use right
alignment by default but allow overriding it.

Add a test to the sample showing a non right-aligned numeric cell.

Incidentally fix a long-standing bug in wxGridCell{DateTime,Enum}Renderers
which used wxRIGHT instead of wxALIGN_RIGHT and so were not aligned properly
even by default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-27 01:47:38 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +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
Francesco Montorsi
191e43fd02 revert r59246; the window parameter was there by purpose (i.e. for consistency with other Get* methods -- even if unused); document what the win parameter does in the various wxRenderer::Get* methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-02 20:09:10 +00:00
Francesco Montorsi
01a65e7c58 fix rendering of wxGrid on wxMSW when a dialog is over the grid.
To test the bug: open the "grid" sample and popup the about box, then move it over the grid; without this fix portions of wxGrid were painted as gray (disabled colour) even if the wxGrid itself was not disabled.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-01 17:21:46 +00:00
Francesco Montorsi
88c87a11a8 use wxRenderer::GetCheckBoxSize() instead of doing wrong calculations in wxGridCellBoolRenderer::GetBestSize; this fixes checkbox rendering under wxMSW (tested on wxMSW,wxGTK)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-01 16:53:53 +00:00
Francesco Montorsi
f8d0234d39 move wxGridCellRenderer::Draw before other derived classes implementations (no real change)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-01 16:09:44 +00:00
Vadim Zeitlin
5c3a7f71a6 fix handling of long lines in wxGridCellAutoWrapStringRenderer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-25 00:09:23 +00:00
Francesco Montorsi
85fe9f6f89 fix for PCH-less builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-11 16:23:31 +00:00
Francesco Montorsi
29efc6e4a4 split wxGrid implementation in grideditors.cpp (for wxGridCellEditor-derived classes), gridctrl.cpp (for wxGridCellRenderer-derived classes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-11 15:49:37 +00:00
Vadim Zeitlin
763163a80a split wxEVT_GRID_CELL_CHANGE into wxEVT_GRID_CELL_CHANGING/ED pair for consistency with all the other controls; provide access to new/old value of the cell in the event object
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-22 22:58:49 +00:00
Stefan Neis
86647b53e9 Don't force ColWidth to always grow for wxGridCellAutoWrapStringRenderer (#1798)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-29 15:14:42 +00:00
Vadim Zeitlin
6a147dfefd compilation fix after wxDateTime::ParseFormat() changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-07 01:20:45 +00:00
Václav Slavík
e0a050e347 more changes to make wx compile without implicit wxString->char* conversion (for STL build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-20 07:44:45 +00:00
Vadim Zeitlin
1d5fda5dc6 extract setting max length in wxGridCellTextEditor::DoCreate() and call it from wxGridCellAutoWrapStringEditor::Create() to ensure that it honours the base editor parameters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-01 22:05:12 +00:00
Paul Cornett
df9fac6d21 header cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-03 14:28:36 +00:00
Mart Raudsepp
90e572f1e5 Spelling fixes from Andreas Mohr (patch #1360064)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-19 01:07:56 +00:00
Michael Wetherell
4a10ea8b13 Warning fixes for win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 22:08:05 +00:00
Vadim Zeitlin
fbfb8bcc3f added missing consts and pass objects by const reference instead of by value (patch 1205869)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 21:43:15 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Włodzimierz Skiba
7448de8d8d [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 17:08:42 +00:00
Julian Smart
3103e8a97e Typo correction patch [ 1208110 ] Lots of typo corrections
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:20:43 +00:00
Włodzimierz Skiba
ca65c0440a Code cleaning: wxID_ANY, wxDefaultSize, wxDefaultPosition, true, false, wxEmptyString, tabs and white spaces.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-17 16:22:36 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Julian Smart
f7556ff05f Removed old grid code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 18:50:10 +00:00
Vadim Zeitlin
e2b87f38d9 allow compilation with wxUSE_DATETIME == 0 (patch 679822)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-06 00:53:46 +00:00
Julian Smart
8dd8f87530 Applied patch [ 605592 ] Unicode patch for dirctrlg.cpp
Markus Greither

 just compiled the wxWindows CVS trunk using
BCC5.5.1 and UNICODE. I noticed a small bug in
girctrlg.cpp, that prevented compilation. There are more
such glitches in the wxGrid, but as I was running out of
time, I disabled this for now. Otherwise, compilation
worked fine and I was able to run the minimal sample
(using UNICOWS on my WIN98SE).

(I also corrected some wxGrid Unicode string typos -- JACS)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-06 14:42:47 +00:00
Vadim Zeitlin
3a8c693aea renamed scrolwin file - no other way to make wxGTK/Univ compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-03 18:14:22 +00:00
George Tasker
b53dc7d661 Fixed compilation if wxUSE_NEW_GRID and wxUSE_GRID are both set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-10 23:20:31 +00:00
George Tasker
ffd98768ba Initialized m_startint in the constructor to avoid cloning of uninitialized value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-10 17:01:25 +00:00
Julian Smart
bc00e7155e Updates for 2.3.1; fixed syntax error in makefile.b32 but this probably
means that the 'version' fix for BC++ doesn't work (misapplied?)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-09 17:43:16 +00:00
Vadim Zeitlin
161f4f7380 applied Unicode fixes for mingw32 (patch 429654)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-03 02:58:56 +00:00
Vadim Zeitlin
5c737c4c37 link preventing typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-28 18:55:40 +00:00
Vadim Zeitlin
7ac05a91ab compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-28 15:05:05 +00:00
Vadim Zeitlin
d10f4bf950 applied tons of wxGrid patches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-27 15:22:28 +00:00