Commit Graph

167 Commits

Author SHA1 Message Date
Robin Dunn
2c9a89e002 wxGridCellEditor plugged in and operational for strings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-14 11:05:35 +00:00
Robin Dunn
07296f0b12 1. Fixed slow-click timer.
2. Fix for full cell background to be painted.  (One line on the edges
was showing through to the background.)

3. Added current cell highlight.  Currently it just draws a thick
border using the gridLineColour just inside the cell borders.

4. Make dragging a little less sensitive by ensuring that the mouse
drags at least 3 pixels before anything is done to the grid.

5. CaptureMouse while drag-selecting cells and fixed to make cells
visible if dragging outside window boundaries.  Still a problem here
though, it moves way to fast to see what's happening (at least on MSW.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-14 08:53:06 +00:00
Stefan Neis
025562fee3 Shift edit control (since we shifted cells in last version!)
Only draw valid help lines in resizing.
First try to enable EditCtrl on slow clicking: Doesn't work yet.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-13 19:43:54 +00:00
Stefan Neis
dcfe4c3d71 Added enabling/disabling of cell edit control.
Moved grid lines and cells by one pixel.
Call SelectBlock in SetCurrentCell (possibly not, what we want?)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-13 16:58:43 +00:00
Robin Dunn
2796cce3f1 1. Grid cell defaults are now handled by an internal wxGridCellAttr
object.

2. wxGridCellRenderer::Draw updated to expect an attr object and use
it instead of going back to the grid for everything

3. The selection colours are now initialized from wxSystemSettings,
and are configurable.

4. Now either CreateGrid() or SetTable() can be called to initialize
the grid.  Added a test for using a non-default table.

5. Reduced flicker even more byt using empty EVT_ERASE_BACKGROUND
handlers.

6. The beginings of wxGridCellEditor are in there but not activated
yet. (This is the next step.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-13 05:37:37 +00:00
Vadim Zeitlin
758cbedf84 added attr assignment for rows/columns
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-11 21:14:58 +00:00
Vadim Zeitlin
0a97676587 added an extremely simple cell attr cache (yet it catches 80% of acccesses)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-11 20:38:04 +00:00
Vadim Zeitlin
ab79958a7f added wxGridCellRenderer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-11 19:40:56 +00:00
Vadim Zeitlin
2e9a678817 fixed setting more than one attr for a cell
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-11 18:18:18 +00:00
Vadim Zeitlin
181bfffdc8 removed debugging messages I just added by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-11 17:47:18 +00:00
Vadim Zeitlin
e2b42eebeb added ChangeCursorMode() method, rewrote the col/row resizing code to capture/release mouse properly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-11 17:43:42 +00:00
Michael Bedward
6d004f675d Added facility to resize rows and cols by dragging grid lines.
Fixed bug where row col resize events were sent twice.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-11 04:09:20 +00:00
Bart A.M. Jourquin
cb5df486e8 #include textfile.h out of the WX_PRECOMP section (bcc)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-10 08:36:51 +00:00
Michael Bedward
2433bb2ed1 Added wxTextFile functions to make multi-line text formatting portable.
Fixed cell background colour problem.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-10 03:50:51 +00:00
Michael Bedward
bd3c6758b5 Reverted changes to grid line positioning that caused many problems
with refreshing and edit control placement.

Added calls to wxFAIL_MSG.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-10 02:39:05 +00:00
Vadim Zeitlin
b99be8fb78 cell attributes added (doesn't quite work, work in progress, beware, don't use, &c &c)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-09 20:30:27 +00:00
Stefan Neis
c1b2e2b6a8 Fix refreshs for wxGTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-09 14:29:25 +00:00
Michael Bedward
27fa32469f Changed grid line positioning slightly to line up the cells with the labels.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-09 08:18:52 +00:00
Michael Bedward
18f9565d19 Fixed problem where corner label was displayed when either row or col label size had been set to zero prior to first display.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-09 08:09:19 +00:00
Michael Bedward
7807d81c73 Simplified sizing code. Sub-windows are now sized explicitly in wxGrid::CalcWindowSizes().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-09 07:17:12 +00:00
Michael Bedward
c3e4873f84 Partially reverted last changes because of problems under wxMotif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-09 05:12:01 +00:00
Michael Bedward
4634a5d6d7 Initializing more variables in wxGrid::Create()
Minor fixes for crashes under wxMotif when setting attributes before
the grid has been first painted.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-09 05:04:21 +00:00
Michael Bedward
b0d6ff2f7f Added more 3d rendering to row and col labels and removed sunken border style from the grid cell window so that labels and cells line up better.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-09 03:49:52 +00:00
Michael Bedward
c6a51dcd05 A few optimizations to Refresh() calls for the grid cell area window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-09 03:03:52 +00:00
Michael Bedward
2e8cd9776a Implemented row and col label size functions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-09 02:15:05 +00:00
Michael Bedward
b93a2fe65a Fixed problem with label resize cursor not resetting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-08 04:33:03 +00:00
Stefan Neis
be46e4a680 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-07 11:15:53 +00:00
Michael Bedward
790cc4177a Fixes for problem where selection fails to start on dragging mouse in
grid cell window.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-07 05:39:28 +00:00
Michael Bedward
9496deb586 Fixed bug in wxGrid::DrawAllGridLines that was causing crashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-07 03:36:01 +00:00
Stefan Neis
cb309039b6 Minor fix in screen update code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-06 19:51:59 +00:00
Julian Smart
790ad94f70 Some BC++ 4.5 and other compile fixes; changed FAR definition to WXFAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-06 11:48:14 +00:00
Stefan Neis
70c7a608b4 Optimized Refresh Area in various functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-06 01:58:45 +00:00
Stefan Neis
796df70a76 Added different strategy for updating grid lines.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-05 18:04:13 +00:00
Robert Roebling
8febdd3905 Fixed status bar probs,
Compilation fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-05 17:56:26 +00:00
Julian Smart
658fb8e6c5 VC++ changes + makeproj additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-05 16:09:10 +00:00
Stefan Neis
8a9a9d58d9 Fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-05 14:27:37 +00:00
Michael Bedward
f603012fbb Space now move active cell right if grid is not editable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-05 01:06:47 +00:00
Michael Bedward
238c4e1798 Removed erroneous EVT_SCROLLWIN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-05 00:26:11 +00:00
Robert Roebling
d2fdd8d2af Minor GTK fixes for wxGrid.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-04 17:01:47 +00:00
Vadim Zeitlin
815a62d283 fixed resize line drawing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-04 15:17:15 +00:00
Vadim Zeitlin
f0102d2a6d fixed refresh problem due to rounding errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-04 14:57:09 +00:00
Michael Bedward
58dd5b3b3e Many bug fixes for display code:
- clicking outside cell area no longer causes crashes
- clicking beyond labels is now ignored
- better cell selection code
- old grid sample now works with this grid
- newlines can be entered in to cell edit control


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-04 11:17:01 +00:00
Stefan Neis
da6af900f1 Added drag-shrinking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-04 08:41:34 +00:00
Vadim Zeitlin
60ff3b9976 re-checking in files in Unix mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-03 13:30:28 +00:00
Michael Bedward
1f1ce28841 Removed cell highlighting temporarily. Now wxGrid::EnableEditing(bool)
sets the cell edit control to be editable or read-only.

Fixed row sizing problem where text was clipped in the cell edit control.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-03 06:03:03 +00:00
Michael Bedward
2d66e025ef Major redesign of grid classes:
- wxGrid now derives from wxScrolledWindow
- Row labels, col labels, corner labels and grid cell area
  implemented as separate classes

The new design fixes the display problems (bad flicker when
scrolling) and simplifies the internal handling of grid cell
coordinates, the edit control etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-03 04:43:45 +00:00
Vadim Zeitlin
8f177c8e73 Win16 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-16 21:29:54 +00:00
Vadim Zeitlin
3096bd2fa7 include <wx/...> => include "wx/..."
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-02 15:50:22 +00:00
Julian Smart
6474416b2e Fixes for VC++ 4 compilation; fixed wxCommandEvent arg in grid.h;
added $(RM) variable to Mingw32 makefile


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-31 12:03:20 +00:00
Michael Bedward
5612a51858 Changes to fix problem where spurious scrollbar(s) were displayed when
the window size had changed and was able to display all rows and/or
all cols.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-29 07:43:04 +00:00