Commit Graph

161 Commits

Author SHA1 Message Date
Stefan Neis
9d9d970d70 Moved most of the code from Insert/Append/DeleteRows/Columns to
Redimension.
Put call to CalcDimension inside 'if (!GetBatchCount)' and
    added a call to CalcDimension to wxGrid's Refresh.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-04-11 13:52:58 +00:00
Stefan Neis
29dc4ad27d Fixed several keyboard handling problems:
- KeyUp event handlers added to label windows
      - pass a "TRUE"for ShiftDown upon selection events triggered by
        release of Shift Key (so one can see from the generated event,
        that we are _adding_ to the current selection).
      - Shrinking the selection by keyboard should now be possible, even
        if the selection starts at the border of the grid.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-04-10 14:09:22 +00:00
Stefan Neis
f9823427eb Corrected handling of row/column attributes/selections if all columns/rows
are removed.
Emit EVT_GRID_CELL_LEFT_CLICK before doing any processing of the left click
        mouse event (instead of emitting it somewhere in the middle).
Moved calls to UpdateAttrRows/Cols to wxGrid's Insert/DeleteRow/Column
        (thereby eliminating the need for two now removed functions).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-04-08 15:30:20 +00:00
Robin Dunn
d1a4ef79ad Changed wxGridCellChoiceEditor's constructor to take an array of
wxStrings instead of wxChar*'s.  This saved a lot of work for
wxPython.

Fixed my GetBestSize fix from yesterday

Changed wxGrid::Redimension to do a refresh (if not GetBatchCount) so
newly appended rows, etc. would show up right away.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-04-08 08:18:39 +00:00
Robin Dunn
9d0c056be4 added autoscroll flag for the text editor
enabled SPACE to activate the editor


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-04-06 22:25:49 +00:00
Robin Dunn
94ff3feeee Fixed wxGridCellStringRenderer::DoGetBestSize to take multiple lines
into account and wxGrid::AutoSizeColOrRow to give a few pixels of
padding for rows like it does for columns.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-04-06 21:15:45 +00:00
Robin Dunn
316917bffc Added "wxPaintDC dc(this);" to wxGrid::OnPaint prevent too many
paintevents that don't actually do anything.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-04-02 21:58:46 +00:00
Robin Dunn
4d350ff2ca Exported a few more things for DLL builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-04-02 03:27:55 +00:00
Stefan Neis
1904bfd1e9 Repaired semantics of EVT_GRID_SELECT_CELL.
Added OnKeyUp handler for selection with Shift+arrow keys.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-31 17:04:54 +00:00
Vadim Zeitlin
597acb605c 1. fixed apparent bug in wxGrid code
2. fixed WM_CHAR handling in combobox
3. fixed controls positioning in the toolbar with older comctl32.dll/mingw32


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-30 22:26:34 +00:00
Stefan Neis
428f582c20 Selecting by Shift+arrow key wouldn't notice, if it was moving beyond the
grid bounds; now it does.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-30 15:44:59 +00:00
Stefan Neis
053ad70036 Modified version of DrawGridSpace.
Added minor improvement suggested by GRG.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-30 15:24:48 +00:00
Stefan Neis
6989e08f3a Changed wxGrid::OnPaint to call Refresh on subwindows.
Added Refresh to wxGrid::EndBatch().
Use batch mode in sample.
Changed CalcDimension to better handle cases with zero columns or rows.
No more automatic insertion of column when adding rows to a grid without
        columns.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-26 12:36:59 +00:00
Stefan Neis
857a175053 Added support for grids with m_numRows=0. SelectRow(i,TRUE) now sets
ControlDown to TRUE in the generated event.
Fixed stupid bug in row/column deletion in griddemo.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-25 14:02:54 +00:00
Julian Smart
846b6d921a Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-24 12:12:21 +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