Commit Graph

256 Commits

Author SHA1 Message Date
Michael Bedward
695a326318 Added Paul Gamman's patch for 0 as FALSE in bool editor and renderer.
Fixed bug in grid selection code that caused crashes (e.g. when grid
had just 1 col and mode was row selection).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 10:43:16 +00:00
Bryan Petty
3ca6a5f046 second merge of the 2.2 branch (RL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 06:11:51 +00:00
Michael Bedward
b1944ebcd0 Removed redundant m_left etc. variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-04 05:22:34 +00:00
Michael Bedward
c909783630 Renamed existing wxGrid::SelectBlock to HighlightBlock.
Added new wxGrid::SelectBlock that does what the name suggests
(consistent with the other SelectXXX functions).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-28 05:12:32 +00:00
Michael Bedward
ae9cab0676 Fix for bug where the cell highlight was not cleared from a cell
that was only partially in view.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-27 06:37:41 +00:00
Michael Bedward
a0948e2723 Added another hack to the collection of hacks in
wxGridCellTextEditor::SetSize so that the caret will show
for cells in the first row.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-27 06:23:33 +00:00
Michael Bedward
4c7277db42 Changed cell and label alignment functions to use wxALIGN_XXX defs.
SetXXXAlignment() functions still accept wxTOP, wxLEFT etc
for (some) backwards compatibility.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-27 01:57:24 +00:00
Michael Bedward
632efa475b Changes as per patch from Paul Gammans to fix bug with edit control
handling.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-24 06:16:49 +00:00
Michael Bedward
d82323930c Added ForceRefresh() to request immediate repainting of a grid.
Calling Refresh() doesn't do this because of our minimal OnPaint
handler (to reduce screen flicker).

Setting of position coords for wxGridEvents now takes account of
row and col label sizes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-21 06:51:22 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Stefan Neis
399b60a0ad Improved selection mode handling in wxGrid::SelectBlock
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-13 22:11:24 +00:00
Stefan Neis
6fc0f38fe0 More compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-13 12:04:25 +00:00
Stefan Neis
0b7e6e7da2 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-11 18:01:18 +00:00
Stefan Neis
c78b3acd0c Added WXUNUSED_GTK and WXUNUSED_GTK_AND_MOTIF
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-11 17:28:36 +00:00
Stefan Neis
aa5e1f75d9 Added many WXUNUSED, untabified once again.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-11 13:59:41 +00:00
Stefan Neis
4a64bee465 Fixed remaining int vs. long warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-11 13:27:39 +00:00
Stefan Neis
e32352cf66 Changed wxGridCellCoords from long to int (get rid of most HP warnings?)
Added Shift/Control+Click handling for labels.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-10 12:27:27 +00:00
Julian Smart
3f8e5072f7 Small fixes for Tex2RTF but alas, we still get memory problems.
Added wxUSE_MFC setting (doesn't include windows.h, removes own memory
tracing); added include <ctype.h> in case where PCH isn't used;
wxExit now exits :-)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-10 11:18:22 +00:00
Vadim Zeitlin
d7da975624 1. fixed warning which was hiding a bug in wxGrid::SendEvent()
2. started documenting wxDateTime
3. and wxLongLong


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-10 01:15:17 +00:00
Stefan Neis
6b10575493 Make correct cell visible for cursor movement.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-09 15:55:17 +00:00
Stefan Neis
ca4f2b729c Modified keyboard and mouse handling wrt selecting blocks/cells.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-09 14:25:07 +00:00
Stefan Neis
d95b0c2ba0 Changed Shift+Arrow handling
Fixed Ctrl/Shift/Alt/Meta handling in generated events.
Added display of Ctrl/Shift/Alt/Meta status to griddemo.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-09 13:57:02 +00:00
Julian Smart
5fa399c9e2 Made VC++ makefiles and project files a bit more consistent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-08 08:32:31 +00:00
Michael Bedward
cb9fb5bb00 Modified <shift>+arrow key behaviour so that the starting cell is
included in the selection


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-07 10:07:36 +00:00
Michael Bedward
2a7750d939 Moved current cell initialization from wxGrid::OnPaint to
wxGrid::DrawHighlight to accommodate wxGTK behaviour.

Removed redundant m_displayed member var from wxGrid.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-07 07:41:58 +00:00
Stefan Neis
5c8fc7c1de Improved handling of selection/deselection events.
Improved keyboard navigation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-04 23:09:37 +00:00
Stefan Neis
043d16b225 Bugfixes; added selection modes demo to griddemo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-04 19:56:39 +00:00
Stefan Neis
f1567cddea Added SetSelectionMode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-04 16:35:58 +00:00
Stefan Neis
b58088819b Added extended selection support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-03 16:44:33 +00:00
Vadim Zeitlin
a95e38c034 1. wxGrid row can't be resized to less than minimal height
2. memory leaks fixed in wxHashTableLong
3. and in wxGrid
4. changed newgrid sample to use char buffers
5. fixed double clicking owner-drawn buttons
6. compilation fix in enhmeta.cpp for !wxUSE_DND
7. bug introduced earlier today in wxGridCellAttr::GetEditor() fixed
8. bool renderer/editor now look as good as I may ever make them look
   good under MSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-02 00:58:11 +00:00
Vadim Zeitlin
c4608a8af3 1. warning in gtk/menu.cpp fixed
2. Unicode fix in msw/textctrl.cpp
3. more parameters support in grid editors/handlers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-01 18:55:29 +00:00
Vadim Zeitlin
831243b127 asserts in wxGridStringTable corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-01 17:21:00 +00:00
Michael Bedward
294d195c3c Minor compilation fix for Borland
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-01 04:10:21 +00:00
Vadim Zeitlin
e72b421324 setting parameters for wxGridCellFloatRenderer seems to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-29 19:30:26 +00:00
Vadim Zeitlin
0b190b0f6a 1. more corrections for ref counted editors/renderers (doesn't crash any more,
might leak memory though)
2. attempt to add parameters to renderers - failed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-29 18:36:04 +00:00
Vadim Zeitlin
39bcce60fe wxGridCellRenderer/Editor made ref counted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-29 17:42:28 +00:00
Vadim Zeitlin
af547d51b7 1. added range checks in wxGridStringTable
2. added AutoSizeRow(), setting minimal size for the rows is supported as
   well now
3. replaced ugly wxHashTables with (just created) wxHashTableLong


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-29 17:21:20 +00:00
Michael Bedward
ebd773c6f8 Added wxWANTS_CHARS style to all windows so that the grid reacts to
cursor keys when it is on a panel.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-29 01:37:37 +00:00
Vadim Zeitlin
a68c1246db wxGridCellAttr::Clone() added to allow the demo of custom grid cell attr provider to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-28 19:08:01 +00:00
Vadim Zeitlin
266e83674a grid autosize fixes/changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-28 16:40:14 +00:00
Vadim Zeitlin
57c086ef99 wxGrid::AutoSize() added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-26 21:00:07 +00:00
Michael Bedward
3c79cf49ec Added call to CalcDimensions() at end of wxGrid::Init so that you can,
for example, put a grid in a dialog, size it and then call CreateGrid
at some later stage.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-25 06:56:41 +00:00
Vadim Zeitlin
c239a4bb76 F2 enables edit in place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-25 02:29:38 +00:00
Robert Roebling
b0e282b34d Minor optical things.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-24 18:09:48 +00:00
Vadim Zeitlin
122603f10f typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-23 23:42:18 +00:00
Vadim Zeitlin
b94ae1ea10 1. wxGCBoolRenderer looks better under MSW
2. wxGCBoolEditor too
3. only alnum keys start editing in-place
4. some memory leaks in wxGrid plugged


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-23 23:38:00 +00:00
Robin Dunn
a5777624e2 fallback to string changes for number and float editors
Fixes for DrawGridSpace (it needed moved over/up by one pixel, at
least for MSW)

Editor left active when resizing rows/cols


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-23 19:27:08 +00:00
Stefan Neis
cb105ad434 Improved wxMotif's look.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-23 18:26:47 +00:00
Stefan Neis
69d8f6124d Improved checkmark on wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-23 17:53:42 +00:00
Julian Smart
e06b95691f Misc small changes, some for VC++ 1.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-23 16:54:18 +00:00