Commit Graph

74 Commits

Author SHA1 Message Date
Paul Cornett
5b4a70247c use "new" wx-prefixed macros in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 07:07:55 +00:00
Paul Cornett
8b4ae731d3 use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 00:02:23 +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
6f58f3d7e0 Allow to customize wxGrid column auto-sizing.
By default the columns are auto-sized to fit just their label, which is fast
but not very user-friendly. Allow customizing this behaviour by handling the
(new) wxEVT_GRID_COL_AUTO_SIZE event.

Closes #15077.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-05 21:11:59 +00:00
Vadim Zeitlin
2328f46863 Allow hiding/showing already hidden/shown wxGrid rows/columns.
Don't assert if an already hidden/shown row/column is being hidden/shown again
but simply don't do anything. This is more convenient because the code outside
wxGrid has no efficient way to only hide a row/column if it's currently shown.

Closes #14960.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-12 03:09:12 +00:00
Vadim Zeitlin
83c0a84c8c Re-lay out the grid sample window after auto-sizing the grid.
Changing the size of the grid without updating the sizer resulted in
overlapping windows and a mess on the display.

Closes #14948.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-03 20:47:18 +00:00
Vadim Zeitlin
ccc040255c Fix wxGrid editors background painting.
There were two fundamental problems: first, we painted on a separately created
wxClientDC instead of using the wxPaintDC already available in wxGrid. Second,
we invalidated the control while painting, resulting in endless repainting, at
least under wxGTK.

Fix the first problem by passing wxDC to wxGridCellEditor::PaintBackground()
and the second one by not refreshing the control from there as it just seems
unnecessary.

Also pass the attribute by reference for consistency with
wxGridCellRenderer::Draw() and because this pointer can never be NULL.

Closes #2628.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-17 16:44:02 +00:00
Vadim Zeitlin
1dc17bcafb Make TAB behaviour in wxGrid more configurable.
Allow making TAB/Shift-TAB wrap to the next/previous row or going to the
next/previous control when the cursor is at the end/beginning of the current
row easily.

Also add wxEVT_GRID_TABBING event to allow customizing TAB behaviour even
further.

Update the sample to show the different possible standard behaviours and a
stupid example of a custom one (it would be probably more useful to implement
something a tad more realistic, e.g. tabbing to the next non-empty cell).

Closes #14711.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-13 22:55:18 +00:00
Vadim Zeitlin
ea805d32e4 Remove unnecessary statement from the grid sample.
No real changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-03 15:36:21 +00:00
Vadim Zeitlin
3253852a7e VC6 compilation fix for the grid sample.
Use Connect() instead of Bind() which is not available for VC6.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 23:41:30 +00:00
Vadim Zeitlin
779e28da63 Add wxGrid::Render() for drawing the grid to any wxDC.
In particular, this allows to print the grid contents easily.

Closes #14294.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-27 13:00:19 +00:00
Vadim Zeitlin
e709239889 Use wxHAS_IMAGES_IN_RESOURCES instead of explicit platform checks.
Add a special symbol which is defined only if the icons and other images (e.g.
cursor) are in the separate resource files and don't need to be embedded as
XPMs in the main program.

This makes the checks more clear and more customizable as it's enough to
change wxHAS_IMAGES_IN_RESOURCES definition instead of changing many platform
checks.

Closes #14050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:28:58 +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
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +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
Vadim Zeitlin
e39877cdb7 Remove selection showing code from the grid sample.
This code is broken as it doesn't always show the selection correctly and
doesn't handle rows-or-columns selection mode at all. Until we can fix it
properly it's better to not have it at all so that at least people avoid
copying the wrong code into their own programs.

Closes #12195.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 11:56:11 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +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
ba9574c310 Added support for corner, row and column headers renderers to wxGrid.
Make it possible to customize the appearance of wxGrid corner window and its
row and column headers by defining custom renderers for them.

Add demonstration of this new feature to the grid sample and update the
documentation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-14 00:45:29 +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
48715f6048 don't use deprecated EVT_GRID_CELL_CHANGED synonym
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-04 10:14:06 +00:00
Vadim Zeitlin
c6b22707d3 show the new size of the grid row/col which was resized (test for r60435 changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-29 22:00:54 +00:00
Vadim Zeitlin
82edfbe7d9 add a possibility to disable individual grid rows/columns resizing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-26 17:02:53 +00:00
Francesco Montorsi
e6f1eb5622 force use of generic about dialog as to test unfocused-repainting of wxGrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-01 15:53:42 +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
Francesco Montorsi
41f02b9acc always call SetIcon() on the main frame of the sample; some small cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 01:01:00 +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
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
Vadim Zeitlin
613de0e89e handle actions of the columns popup menu in wxHeaderCtrl itself (but the derived class must implement UpdateColumnVisibility()); also renamed wxHD_DRAGDROP to wxHD_ALLOW_REORDER as it will be possible to reorder columns interactively using a customization dialog and not just by dragging them soon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-15 22:42:37 +00:00
Vadim Zeitlin
e8f25dbbce added a helper function to show the popup menu allowing to configure the columns in header control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-15 11:03:59 +00:00
Vadim Zeitlin
3b367af8cd added a button to reset the column order and the display of hidden columns to the tabular grid frame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-14 22:07:44 +00:00
Vadim Zeitlin
009c72169f add support for hiding columns when using native header control in wxGrid; also added convenient Hide/ShowCol() methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-14 17:28:57 +00:00
Vadim Zeitlin
53698f1db2 removed testing code leftovers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-14 10:08:49 +00:00
Vadim Zeitlin
11393d2900 add support for sorting to grid columns
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-14 00:02:30 +00:00
Vadim Zeitlin
cd68daf58a support column reordering using drag and drop when using wxHeaderCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-13 00:24:39 +00:00
Francesco Montorsi
7dfb6dc4a9 use wxAboutBox() to make it evident a wxGrid refreshing bug under wxMSW (probably correlated to the window disabler used by the generic about box)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-10 16:20:07 +00:00
Vadim Zeitlin
e7ae8a69ea demonstrate column reordering -- currently it demonstrates that it's completely broken in various and interesting ways
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-01 00:23:34 +00:00
Vadim Zeitlin
24973882e4 removed small and tabular grid tests which didn't seem to do anything useful (will replace the latter with a test of column reodering soon)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-30 21:13:46 +00:00
Vadim Zeitlin
8a3e536cd5 - Main change is the addition of wxGridSelectRowsOrColumns selection mode
(which is still probably buggy, wxGridSelection needs to be reviewed)
- Add XYToCell() overloads returning wxGridCellCoords (instead of modifying the
  argument passed by reference -- where did this come from?) and document them.
- Added GoToCell() which does make the new current cell visible unlike
  SetGridCursor() (which was documented as doing it, but wasn't)
- Changed SetCurrentCell() to only not change the cell if wxEVT_GRID_SELECT_CELL
  it generates is vetoed, not just processed as this seems to make more sense
- Split jumbo (~400 lines) ProcessGridCellMouseEvent() function into chunks
- Add many more comments to make reading this code seem less like puzzle
  solving for the next unfortunate soul to do it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-19 23:33:04 +00:00
Vadim Zeitlin
4a25320b90 add SetUseNativeColLabels() test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-15 14:05:16 +00:00
Vadim Zeitlin
1bf55f4cda use wxString::Format() instead of hardcoding floating point numbers string representation, this doesn't work in locales using decimal comma (#9714)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-13 16:33:19 +00:00
Vadim Zeitlin
4f6c80fecd add a numeric column test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-06 02:20:21 +00:00
Vadim Zeitlin
6f292345cf fix reference counting problems with wxGridCellWithAttr (re-#9567)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-13 21:37:58 +00:00
Vadim Zeitlin
92c01615ec remove/replace redundant SetAutoLayout() and Fit() calls, leave just SetSizer[AndFit]() ones (patch 1905759)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-15 02:08:02 +00:00
Robert Roebling
71cf399ff0 Playing with wxgrid, adding optionnally native columns labels
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-20 15:05:03 +00:00
Chris Elliott
1583600031 fixes as per http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/92325
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-10 07:44:34 +00:00
Vadim Zeitlin
de38156422 don't set incorrect initial value of '0' for the bool cell (replaces patch 1774557)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-15 10:43:41 +00:00
Vadim Zeitlin
7b1bf3ad2d added wxLog::DisableTimestamp() to be used as a synonym for SetTimestamp(wxEmptyString)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-27 12:09:55 +00:00
Vadim Zeitlin
733f486aac added support for wxGRID_AUTOSIZE in wxGrid::SetRow/ColLabelSize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-15 17:44:41 +00:00