#include "wx/dcclient.h"
#include "wx/settings.h"
#include "wx/log.h"
- #include "wx/sizer.h"
- #include "wx/layout.h"
#endif
+// this include needs to be outside precomp for BCC
+#include "wx/textfile.h"
+
#include "wx/generic/grid.h"
// ----------------------------------------------------------------------------
}
}
-// FIXME VZ: these should be wxFAIL_MSG(), not wxLogWarning, they're for the
-// programmer, not the user!
-
bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
{
- wxLogWarning( wxT("Called grid table class function InsertRows(pos=%d, N=%d)\n"
- "but your derived table class does not override this function"),
- pos, numRows );
+ wxFAIL_MSG( wxT("Called grid table class function InsertRows\n"
+ "but your derived table class does not override this function") );
return FALSE;
}
bool wxGridTableBase::AppendRows( size_t numRows )
{
- wxLogWarning( wxT("Called grid table class function AppendRows(N=%d)\n"
- "but your derived table class does not override this function"),
- numRows );
+ wxFAIL_MSG( wxT("Called grid table class function AppendRows\n"
+ "but your derived table class does not override this function"));
return FALSE;
}
bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
{
- wxLogWarning( wxT("Called grid table class function DeleteRows(pos=%d, N=%d)\n"
- "but your derived table class does not override this function"),
- pos, numRows );
+ wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n"
+ "but your derived table class does not override this function"));
return FALSE;
}
bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
{
- wxLogWarning( wxT("Called grid table class function InsertCols(pos=%d, N=%d)\n"
- "but your derived table class does not override this function"),
- pos, numCols );
+ wxFAIL_MSG( wxT("Called grid table class function InsertCols\n"
+ "but your derived table class does not override this function"));
return FALSE;
}
bool wxGridTableBase::AppendCols( size_t numCols )
{
- wxLogWarning( wxT("Called grid table class function AppendCols(N=%d)\n"
- "but your derived table class does not override this function"),
- numCols );
+ wxFAIL_MSG(wxT("Called grid table class function AppendCols\n"
+ "but your derived table class does not override this function"));
return FALSE;
}
bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
{
- wxLogWarning( wxT("Called grid table class function DeleteCols(pos=%d, N=%d)\n"
- "but your derived table class does not override this function"),
- pos, numCols );
+ wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
+ "but your derived table class does not override this function"));
return FALSE;
}
if ( pos >= curNumRows )
{
- wxLogError( wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)...\n"
- "Pos value is invalid for present table with %d rows"),
- pos, numRows, curNumRows );
+ wxString errmsg;
+ errmsg.Printf("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\n"
+ "Pos value is invalid for present table with %d rows",
+ pos, numRows, curNumRows );
+ wxFAIL_MSG( wxT(errmsg) );
return FALSE;
}
{
// TODO: something better than this ?
//
- wxLogError( wxT("Unable to append cols to a grid table with no rows.\n"
- "Call AppendRows() first") );
+ wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\n"
+ "Call AppendRows() first") );
return FALSE;
}
if ( pos >= curNumCols )
{
- wxLogError( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
- "Pos value is invalid for present table with %d cols"),
- pos, numCols, curNumCols );
+ wxString errmsg;
+ errmsg.Printf( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
+ "Pos value is invalid for present table with %d cols",
+ pos, numCols, curNumCols );
+ wxFAIL_MSG( wxT( errmsg ) );
return FALSE;
}
{
if ( m_created )
{
- wxLogError( wxT("wxGrid::CreateGrid(numRows, numCols) called more than once") );
+ wxFAIL_MSG( wxT("wxGrid::CreateGrid called more than once") );
return FALSE;
}
else
CalcUnscrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
CalcUnscrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
- left++; top++;
// find the cells within these bounds
//
int row, col;
m_isDragging = FALSE;
+ // ------------ Entering or leaving the window
+ //
+ if ( event.Entering() || event.Leaving() )
+ {
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR );
+ }
+
+
// ------------ Left button pressed
//
- if ( event.LeftDown() )
+ else if ( event.LeftDown() )
{
// don't send a label click event for a hit on the
// edge of the row label - this is probably the user
if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
{
m_rowLabelWin->ReleaseMouse();
+ DoEndDragResizeRow();
- if ( m_dragLastPos >= 0 )
- {
- // erase the last line and resize the row
- //
- int cw, ch, left, dummy;
- m_gridWin->GetClientSize( &cw, &ch );
- CalcUnscrolledPosition( 0, 0, &left, &dummy );
-
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
- dc.SetLogicalFunction( wxINVERT );
- dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
- HideCellEditControl();
-
- int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol];
- SetRowSize( m_dragRowOrCol, wxMax( y - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
- if ( !GetBatchCount() )
- {
- // Only needed to get the correct rect.y:
- wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) );
- rect.x = 0;
- CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
- rect.width = m_rowLabelWidth;
- rect.height = ch - rect.y;
- m_rowLabelWin->Refresh( TRUE, &rect );
- rect.width = cw;
- m_gridWin->Refresh( FALSE, &rect );
- }
-
- ShowCellEditControl();
-
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
- }
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
}
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_rowLabelWin->SetCursor( m_rowResizeCursor );
}
}
- else
+ else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
{
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
- if ( m_rowLabelWin->GetCursor() == m_rowResizeCursor )
- m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR );
+ m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR );
}
}
}
m_isDragging = FALSE;
+ // ------------ Entering or leaving the window
+ //
+ if ( event.Entering() || event.Leaving() )
+ {
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR );
+ }
+
+
// ------------ Left button pressed
//
- if ( event.LeftDown() )
+ else if ( event.LeftDown() )
{
// don't send a label click event for a hit on the
// edge of the col label - this is probably the user
if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
{
m_colLabelWin->ReleaseMouse();
-
- if ( m_dragLastPos >= 0 )
- {
- // erase the last line and resize the col
- //
- int cw, ch, dummy, top;
- m_gridWin->GetClientSize( &cw, &ch );
- CalcUnscrolledPosition( 0, 0, &dummy, &top );
-
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
- dc.SetLogicalFunction( wxINVERT );
- dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
- HideCellEditControl();
-
- int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol];
- SetColSize( m_dragRowOrCol, wxMax( x - colLeft, WXGRID_MIN_COL_WIDTH ) );
-
- if ( !GetBatchCount() )
- {
- // Only needed to get the correct rect.x:
- wxRect rect ( CellToRect( 0, m_dragRowOrCol ) );
- rect.y = 0;
- CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
- rect.width = cw - rect.x;
- rect.height = m_colLabelHeight;
- m_colLabelWin->Refresh( TRUE, &rect );
- rect.height = ch;
- m_gridWin->Refresh( FALSE, &rect );
- }
-
- ShowCellEditControl();
-
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
- }
+ DoEndDragResizeCol();
+
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
}
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_colLabelWin->SetCursor( m_colResizeCursor );
}
}
- else
+ else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
{
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
- if ( m_colLabelWin->GetCursor() == m_colResizeCursor )
- m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR );
+ m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR );
}
}
}
}
}
}
+ else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+ {
+ int cw, ch, left, dummy;
+ m_gridWin->GetClientSize( &cw, &ch );
+ CalcUnscrolledPosition( 0, 0, &left, &dummy );
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+ dc.SetLogicalFunction(wxINVERT);
+ if ( m_dragLastPos >= 0 )
+ {
+ dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
+ }
+ dc.DrawLine( left, y, left+cw, y );
+ m_dragLastPos = y;
+ }
+ else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+ {
+ int cw, ch, dummy, top;
+ m_gridWin->GetClientSize( &cw, &ch );
+ CalcUnscrolledPosition( 0, 0, &dummy, &top );
+
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+ dc.SetLogicalFunction(wxINVERT);
+ if ( m_dragLastPos >= 0 )
+ {
+ dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+ }
+ dc.DrawLine( x, top, x, top+ch );
+ m_dragLastPos = x;
+ }
+
return;
}
if ( coords != wxGridNoCellCoords )
{
- if ( event.LeftDown() )
+ if ( event.Entering() || event.Leaving() )
+ {
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+ }
+
+ // ------------ Left button pressed
+ //
+ else if ( event.LeftDown() )
{
if ( event.ShiftDown() )
{
SelectBlock( m_currentCellCoords, coords );
}
- else
+ else if ( XToEdgeOfCol(x) < 0 &&
+ YToEdgeOfRow(y) < 0 )
{
if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK,
coords.GetRow(),
//
else if ( event.LeftDClick() )
{
- SendEvent( EVT_GRID_CELL_LEFT_DCLICK,
- coords.GetRow(),
- coords.GetCol(),
- event );
+ if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
+ {
+ SendEvent( EVT_GRID_CELL_LEFT_DCLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event );
+ }
}
{
SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event );
}
- }
- // Show the edit control, if it has
- // been hidden for drag-shrinking.
- if ( IsCellEditControlEnabled() )
- ShowCellEditControl();
+ // Show the edit control, if it has
+ // been hidden for drag-shrinking.
+ if ( IsCellEditControlEnabled() )
+ ShowCellEditControl();
+ }
+ else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+ {
+ m_gridWin->ReleaseMouse();
+ DoEndDragResizeRow();
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+ }
+ else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+ {
+ m_gridWin->ReleaseMouse();
+ DoEndDragResizeCol();
+
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+ }
+
m_dragLastPos = -1;
}
//
else if ( event.Moving() && !event.IsButton() )
{
- m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ int dragRow = YToEdgeOfRow( y );
+ int dragCol = XToEdgeOfCol( x );
+
+ // Dragging on the corner of a cell to resize in both
+ // directions is not implemented yet...
+ //
+ if ( dragRow >= 0 && dragCol >= 0 )
+ {
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+ return;
+ }
+
+ if ( dragRow >= 0 )
+ {
+ m_dragRowOrCol = dragRow;
+
+ if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+ {
+ m_cursorMode = WXGRID_CURSOR_RESIZE_ROW;
+ m_gridWin->SetCursor( m_rowResizeCursor );
+ }
+
+ return;
+ }
+
+ if ( dragCol >= 0 )
+ {
+ m_dragRowOrCol = dragCol;
+
+ if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+ {
+ m_cursorMode = WXGRID_CURSOR_RESIZE_COL;
+ m_gridWin->SetCursor( m_colResizeCursor );
+ }
+
+ return;
+ }
+
+ // Neither on a row or col edge
+ //
+ if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+ {
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+ }
}
}
}
+void wxGrid::DoEndDragResizeRow()
+{
+ if ( m_dragLastPos >= 0 )
+ {
+ // erase the last line and resize the row
+ //
+ int cw, ch, left, dummy;
+ m_gridWin->GetClientSize( &cw, &ch );
+ CalcUnscrolledPosition( 0, 0, &left, &dummy );
+
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+ dc.SetLogicalFunction( wxINVERT );
+ dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
+ HideCellEditControl();
+
+ int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol];
+ SetRowSize( m_dragRowOrCol,
+ wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
+
+ if ( !GetBatchCount() )
+ {
+ // Only needed to get the correct rect.y:
+ wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) );
+ rect.x = 0;
+ CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+ rect.width = m_rowLabelWidth;
+ rect.height = ch - rect.y;
+ m_rowLabelWin->Refresh( TRUE, &rect );
+ rect.width = cw;
+ m_gridWin->Refresh( FALSE, &rect );
+ }
+
+ ShowCellEditControl();
+ }
+}
+
+
+void wxGrid::DoEndDragResizeCol()
+{
+ if ( m_dragLastPos >= 0 )
+ {
+ // erase the last line and resize the col
+ //
+ int cw, ch, dummy, top;
+ m_gridWin->GetClientSize( &cw, &ch );
+ CalcUnscrolledPosition( 0, 0, &dummy, &top );
+
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+ dc.SetLogicalFunction( wxINVERT );
+ dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+ HideCellEditControl();
+
+ int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol];
+ SetColSize( m_dragRowOrCol,
+ wxMax( m_dragLastPos - colLeft, WXGRID_MIN_COL_WIDTH ) );
+
+ if ( !GetBatchCount() )
+ {
+ // Only needed to get the correct rect.x:
+ wxRect rect ( CellToRect( 0, m_dragRowOrCol ) );
+ rect.y = 0;
+ CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+ rect.width = cw - rect.x;
+ rect.height = m_colLabelHeight;
+ m_colLabelWin->Refresh( TRUE, &rect );
+ rect.height = ch;
+ m_gridWin->Refresh( FALSE, &rect );
+ }
+
+ ShowCellEditControl();
+ }
+}
+
+
+
//
// ------ interaction with data model
//
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
return FALSE;
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
return FALSE;
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
return FALSE;
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
return FALSE;
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
return FALSE;
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
return FALSE;
}
{
// shouldn't be here - we are going round in circles...
//
- wxLogFatalError( wxT("wxGrid::OnKeyDown called while alread active") );
+ wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while alread active") );
}
m_inOnKeyDown = TRUE;
// right hand border
//
- dc.DrawLine( m_colRights[col]-1, m_rowBottoms[row] - m_rowHeights[row],
- m_colRights[col]-1, m_rowBottoms[row]-1 );
+ dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row],
+ m_colRights[col], m_rowBottoms[row] );
// bottom border
//
- dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row]-1,
- m_colRights[col]-1, m_rowBottoms[row]-1 );
+ dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row],
+ m_colRights[col], m_rowBottoms[row] );
}
int i;
for ( i = 0; i < m_numRows; i++ )
{
- if ( m_rowBottoms[i]-1 > bottom )
+ if ( m_rowBottoms[i] > bottom )
{
break;
}
- else if ( m_rowBottoms[i]-1 >= top )
+ else if ( m_rowBottoms[i] >= top )
{
- dc.DrawLine( left, m_rowBottoms[i]-1, right, m_rowBottoms[i]-1 );
+ dc.DrawLine( left, m_rowBottoms[i], right, m_rowBottoms[i] );
}
}
//
for ( i = 0; i < m_numCols; i++ )
{
- if ( m_colRights[i]-1 > right )
+ if ( m_colRights[i] > right )
{
break;
}
- else if ( m_colRights[i]-1 >= left )
+ else if ( m_colRights[i] >= left )
{
- dc.DrawLine( m_colRights[i]-1, top, m_colRights[i]-1, bottom );
+ dc.DrawLine( m_colRights[i], top, m_colRights[i], bottom );
}
}
}
//
void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
{
- // TODO: this won't work for WXMAC ? (lines end with '\r')
- // => use wxTextFile functions then (VZ)
int startPos = 0;
int pos;
- while ( startPos < (int)value.Length() )
+ wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
+ wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
+
+ while ( startPos < (int)tVal.Length() )
{
- pos = value.Mid(startPos).Find( '\n' );
+ pos = tVal.Mid(startPos).Find( eol );
if ( pos < 0 )
{
break;
}
else
{
- if ( value[startPos+pos-1] == '\r' )
- {
- lines.Add( value.Mid(startPos, pos-1) );
- }
- else
- {
- lines.Add( value.Mid(startPos, pos) );
- }
+ lines.Add( value.Mid(startPos, pos) );
}
startPos += pos+1;
}
wxColour wxGrid::GetDefaultCellBackgroundColour()
{
- return GetBackgroundColour();
+ return m_gridWin->GetBackgroundColour();
}
// TODO VZ: this must be optimized to allow only retrieveing attr once!
wxColour wxGrid::GetDefaultCellTextColour()
{
- return GetForegroundColour();
+ return m_gridWin->GetForegroundColour();
}
wxColour wxGrid::GetCellTextColour( int row, int col )
m_rowBottoms[i] += diff;
}
CalcDimensions();
-
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( EVT_GRID_ROW_SIZE,
- row, -1 );
}
void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
m_colRights[i] += diff;
}
CalcDimensions();
-
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( EVT_GRID_COL_SIZE,
- -1, col );
}
void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
{
- SetBackgroundColour(col);
+ m_gridWin->SetBackgroundColour(col);
}
void wxGrid::SetDefaultCellTextColour( const wxColour& col )
{
- SetForegroundColour(col);
+ m_gridWin->SetForegroundColour(col);
}
void wxGrid::SetDefaultCellAlignment( int horiz, int vert )
projects / wxWidgets.git / blobdiff