#include "wx/grid.h"
#include "wx/generic/gridsel.h"
+#if defined(__WXMOTIF__)
+ #define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier)
+#else
+ #define WXUNUSED_MOTIF(identifier) identifier
+#endif
+
+#if defined(__WXGTK__)
+ #define WXUNUSED_GTK(identifier) WXUNUSED(identifier)
+#else
+ #define WXUNUSED_GTK(identifier) identifier
+#endif
+
+// Required for wxIs... functions
+#include <ctype.h>
+
// ----------------------------------------------------------------------------
// array classes
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridTypeRegistry
{
public:
+ wxGridTypeRegistry() {}
~wxGridTypeRegistry();
void RegisterDataType(const wxString& typeName,
if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() )
{
// insert the key in the control
- long keycode = event.KeyCode();
+ int keycode = (int)event.KeyCode();
if ( isprint(keycode) )
{
// FIXME this is not going to work for non letters...
event.Skip();
}
-void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
+void wxGridCellTextEditor::HandleReturn( wxKeyEvent&
+ WXUNUSED_GTK(WXUNUSED_MOTIF(event)) )
{
#if defined(__WXMOTIF__) || defined(__WXGTK__)
// wxMotif needs a little extra help...
- int pos = Text()->GetInsertionPoint();
+ long pos = Text()->GetInsertionPoint();
wxString s( Text()->GetValue() );
s = s.Left(pos) + "\n" + s.Mid(pos);
Text()->SetValue(s);
if ( HasRange() )
{
- Spin()->SetValue(m_valueOld);
+ Spin()->SetValue((int)m_valueOld);
}
else
{
{
if ( HasRange() )
{
- Spin()->SetValue(m_valueOld);
+ Spin()->SetValue((int)m_valueOld);
}
else
{
{
if ( !HasRange() )
{
- long keycode = event.KeyCode();
+ int keycode = (int) event.KeyCode();
if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
{
wxGridCellTextEditor::StartingKey(event);
void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
{
- long keycode = event.KeyCode();
+ int keycode = (int)event.KeyCode();
if ( isdigit(keycode) ||
keycode == '+' || keycode == '-' || keycode == '.' )
{
wxGridCellAttr& attr,
wxDC& dc,
const wxRect& rect,
- int row, int col,
+ int WXUNUSED(row), int WXUNUSED(col),
bool isSelected)
{
dc.SetBackgroundMode( wxSOLID );
}
}
-bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
+bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
+ size_t WXUNUSED(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 )
+bool wxGridTableBase::AppendRows( size_t WXUNUSED(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 )
+bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
+ size_t WXUNUSED(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 )
+bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
+ size_t WXUNUSED(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 )
+bool wxGridTableBase::AppendCols( size_t WXUNUSED(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 )
+bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
+ size_t WXUNUSED(numCols) )
{
wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
"but your derived table class does not override this function"));
{
}
-long wxGridStringTable::GetNumberRows()
+int wxGridStringTable::GetNumberRows()
{
return m_data.GetCount();
}
-long wxGridStringTable::GetNumberCols()
+int wxGridStringTable::GetNumberCols()
{
if ( m_data.GetCount() > 0 )
return m_data[0].GetCount();
m_owner = parent;
}
-void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
m_owner = parent;
}
-void wxGridColLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
}
-void wxGridWindow::OnEraseBackground(wxEraseEvent& event)
+void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
{
}
void wxGrid::Create()
{
m_created = FALSE; // set to TRUE by CreateGrid
- m_displayed = TRUE; // FALSE; // set to TRUE by OnPaint
m_table = (wxGridTableBase *) NULL;
m_ownTable = FALSE;
// View at runtime. Is there anything in the implmentation that would
// prevent this?
- // At least, you now have to copy with m_selection
+ // At least, you now have to cope with m_selection
wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
return FALSE;
}
break;
case WXGRID_CURSOR_SELECT_ROW:
- if ( (row = YToRow( y )) >= 0 &&
- !IsInSelection( row, 0 ) )
+ if ( (row = YToRow( y )) >= 0 )
{
- SelectRow( row, TRUE );
+ m_selection->SelectRow( row,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
// default label to suppress warnings about "enumeration value
if ( row >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
{
- SelectRow( row, event.ShiftDown() );
+ if ( !event.ShiftDown() && !event.ControlDown() )
+ ClearSelection();
+ if ( event.ShiftDown() )
+ m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+ 0,
+ row,
+ GetNumberCols() - 1,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ else
+ m_selection->SelectRow( row,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
}
}
break;
case WXGRID_CURSOR_SELECT_COL:
- if ( (col = XToCol( x )) >= 0 &&
- !IsInSelection( 0, col ) )
+ if ( (col = XToCol( x )) >= 0 )
{
- SelectCol( col, TRUE );
+ m_selection->SelectCol( col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
// default label to suppress warnings about "enumeration value
if ( col >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
{
- SelectCol( col, event.ShiftDown() );
+ if ( !event.ShiftDown() && !event.ControlDown() )
+ ClearSelection();
+ if ( event.ShiftDown() )
+ m_selection->SelectBlock( 0,
+ m_currentCellCoords.GetCol(),
+ GetNumberRows() - 1, col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ else
+ m_selection->SelectCol( col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
}
}
if ( coords != wxGridNoCellCoords )
{
- if ( !IsSelection() )
+ if ( event.ControlDown() )
{
- SelectBlock( coords, coords );
+ if ( m_selectingKeyboard == wxGridNoCellCoords)
+ m_selectingKeyboard = coords;
+ SelectBlock ( m_selectingKeyboard, coords );
}
else
{
- SelectBlock( m_currentCellCoords, coords );
+ if ( !IsSelection() )
+ {
+ SelectBlock( coords, coords );
+ }
+ else
+ {
+ SelectBlock( m_currentCellCoords, coords );
+ }
}
if (! IsVisible(coords))
{
MakeCellVisible(coords);
// TODO: need to introduce a delay or something here. The
- // scrolling is way to fast, at least on MSW.
+ // scrolling is way to fast, at least on MSW - also on GTK.
}
}
}
m_selection->SelectBlock( m_currentCellCoords.GetRow(),
m_currentCellCoords.GetCol(),
coords.GetRow(),
- coords.GetCol() );
+ coords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
else if ( XToEdgeOfCol(x) < 0 &&
YToEdgeOfRow(y) < 0 )
}
else
{
- m_selection->ToggleCellSelection( coords.GetRow(),
- coords.GetCol() );
- m_selectingTopLeft = wxGridNoCellCoords;
- m_selectingBottomRight = wxGridNoCellCoords;
- SetCurrentCell( coords );
+ if ( event.ControlDown() )
+ {
+ m_selection->ToggleCellSelection( coords.GetRow(),
+ coords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ m_selectingTopLeft = wxGridNoCellCoords;
+ m_selectingBottomRight = wxGridNoCellCoords;
+ m_selectingKeyboard = coords;
+ }
+ else
+ SetCurrentCell( coords );
m_waitForSlowClick = TRUE;
}
}
m_selectingTopLeft.GetCol(),
m_selectingBottomRight.GetRow(),
m_selectingBottomRight.GetCol(),
- & event );
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
m_selectingTopLeft = wxGridNoCellCoords;
m_selectingBottomRight = wxGridNoCellCoords;
}
type,
this,
row, col,
- false,
mouseEv.GetX(), mouseEv.GetY(),
+ FALSE,
mouseEv.ControlDown(),
mouseEv.ShiftDown(),
mouseEv.AltDown(),
void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc( this );
-
- if ( m_currentCellCoords == wxGridNoCellCoords &&
- m_numRows && m_numCols )
- {
- m_currentCellCoords.Set(0, 0);
- ShowCellEditControl();
- }
-
- m_displayed = TRUE;
}
// the grid view is resized... then the size event is skipped to allow
// the box sizers to handle everything
//
-void wxGrid::OnSize( wxSizeEvent& event )
+void wxGrid::OnSize( wxSizeEvent& WXUNUSED(event) )
{
CalcWindowSizes();
CalcDimensions();
// try local handlers
//
+ if ( !event.ShiftDown() &&
+ m_selectingKeyboard != wxGridNoCellCoords )
+ {
+ if ( m_selectingTopLeft != wxGridNoCellCoords &&
+ m_selectingBottomRight != wxGridNoCellCoords )
+ m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+ m_selectingTopLeft.GetCol(),
+ m_selectingBottomRight.GetRow(),
+ m_selectingBottomRight.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ m_selectingTopLeft = wxGridNoCellCoords;
+ m_selectingBottomRight = wxGridNoCellCoords;
+ m_selectingKeyboard = wxGridNoCellCoords;
+ }
+
switch ( event.KeyCode() )
{
case WXK_UP:
break;
case WXK_ESCAPE:
- m_selection->ClearSelection();
+ ClearSelection();
break;
case WXK_TAB:
MovePageDown();
break;
-#if 0
case WXK_SPACE:
+ if ( event.ControlDown() )
+ {
+ m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ break;
+ }
if ( !IsEditable() )
{
MoveCursorRight( FALSE );
break;
}
// Otherwise fall through to default
-#else
- case WXK_SPACE:
- m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
- break;
-#endif
default:
// alphanumeric keys or F2 (special key just for this) enable
if ( !(event.AltDown() ||
event.MetaDown() ||
event.ControlDown()) &&
- ((isalnum(event.KeyCode()) &&
+ ((isalnum((int)event.KeyCode()) &&
(event.KeyCode() < 256 && event.KeyCode() >= 0)) ||
event.KeyCode() == WXK_F2) &&
!IsCellEditControlEnabled() &&
m_inOnKeyDown = FALSE;
}
-
void wxGrid::OnEraseBackground(wxEraseEvent&)
{
}
void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
{
- if ( m_displayed &&
- m_currentCellCoords != wxGridNoCellCoords )
+ if ( m_currentCellCoords != wxGridNoCellCoords )
{
HideCellEditControl();
DisableCellEditControl();
m_currentCellCoords = coords;
- if ( m_displayed )
- {
- wxClientDC dc(m_gridWin);
- PrepareDC(dc);
+ wxClientDC dc(m_gridWin);
+ PrepareDC(dc);
+
+ wxGridCellAttr* attr = GetCellAttr(coords);
+ DrawCellHighlight(dc, attr);
+ attr->DecRef();
- wxGridCellAttr* attr = GetCellAttr(coords);
- DrawCellHighlight(dc, attr);
- attr->DecRef();
#if 0
// SN: For my extended selection code, automatic
// deselection is definitely not a good idea.
if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
}
#endif
- }
}
void wxGrid::DrawHighlight(wxDC& dc)
{
+ // This if block was previously in wxGrid::OnPaint but that doesn't
+ // seem to get called under wxGTK - MB
+ //
+ if ( m_currentCellCoords == wxGridNoCellCoords &&
+ m_numRows && m_numCols )
+ {
+ m_currentCellCoords.Set(0, 0);
+ }
+
if ( IsCellEditControlEnabled() )
{
// don't show highlight when the edit control is shown
// This is used to redraw all grid lines e.g. when the grid line colour
// has been changed
//
-void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
+void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED_GTK(reg) )
{
if ( !m_gridLinesEnabled ||
!m_numRows ||
for ( size_t i = 0; i < lines.GetCount(); i++ )
{
- dc.DrawText( lines[i], (long)x, (long)y );
+ dc.DrawText( lines[i], (int)x, (int)y );
y += lineHeight;
}
}
if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetRow() > 0 )
{
- MakeCellVisible( m_currentCellCoords.GetRow() - 1,
- m_currentCellCoords.GetCol() );
-
- SetCurrentCell( m_currentCellCoords.GetRow() - 1,
- m_currentCellCoords.GetCol() );
-
if ( expandSelection )
- m_selection->SelectCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
+ {
+ if ( m_selectingKeyboard == wxGridNoCellCoords )
+ m_selectingKeyboard = m_currentCellCoords;
+ m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
+ MakeCellVisible( m_selectingKeyboard.GetRow(),
+ m_selectingKeyboard.GetCol() );
+ SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ MakeCellVisible( m_currentCellCoords.GetRow() - 1,
+ m_currentCellCoords.GetCol() );
+ SetCurrentCell( m_currentCellCoords.GetRow() - 1,
+ m_currentCellCoords.GetCol() );
+ }
return TRUE;
}
bool wxGrid::MoveCursorDown( bool expandSelection )
{
- // TODO: allow for scrolling
- //
if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetRow() < m_numRows-1 )
{
- MakeCellVisible( m_currentCellCoords.GetRow() + 1,
- m_currentCellCoords.GetCol() );
-
- SetCurrentCell( m_currentCellCoords.GetRow() + 1,
- m_currentCellCoords.GetCol() );
-
if ( expandSelection )
- m_selection->SelectCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
+ {
+ if ( m_selectingKeyboard == wxGridNoCellCoords )
+ m_selectingKeyboard = m_currentCellCoords;
+ m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
+ MakeCellVisible( m_selectingKeyboard.GetRow(),
+ m_selectingKeyboard.GetCol() );
+ SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ MakeCellVisible( m_currentCellCoords.GetRow() + 1,
+ m_currentCellCoords.GetCol() );
+ SetCurrentCell( m_currentCellCoords.GetRow() + 1,
+ m_currentCellCoords.GetCol() );
+ }
return TRUE;
}
if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetCol() > 0 )
{
- MakeCellVisible( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() - 1 );
-
- SetCurrentCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() - 1 );
-
if ( expandSelection )
- m_selection->SelectCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
+ {
+ if ( m_selectingKeyboard == wxGridNoCellCoords )
+ m_selectingKeyboard = m_currentCellCoords;
+ m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
+ MakeCellVisible( m_selectingKeyboard.GetRow(),
+ m_selectingKeyboard.GetCol() );
+ SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ MakeCellVisible( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol() - 1 );
+ SetCurrentCell( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol() - 1 );
+ }
return TRUE;
}
if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetCol() < m_numCols - 1 )
{
- MakeCellVisible( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() + 1 );
-
- SetCurrentCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() + 1 );
-
if ( expandSelection )
- m_selection->SelectCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
+ {
+ if ( m_selectingKeyboard == wxGridNoCellCoords )
+ m_selectingKeyboard = m_currentCellCoords;
+ m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
+ MakeCellVisible( m_selectingKeyboard.GetRow(),
+ m_selectingKeyboard.GetCol() );
+ SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ MakeCellVisible( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol() + 1 );
+ SetCurrentCell( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol() + 1 );
+ }
return TRUE;
}
MakeCellVisible( row, col );
if ( expandSelection )
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- row, col );
- SetCurrentCell( row, col );
-
+ {
+ m_selectingKeyboard = wxGridCellCoords( row, col );
+ SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ SetCurrentCell( row, col );
+ }
return TRUE;
}
MakeCellVisible( row, col );
if ( expandSelection )
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- row, col );
- SetCurrentCell( row, col );
+ {
+ m_selectingKeyboard = wxGridCellCoords( row, col );
+ SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ SetCurrentCell( row, col );
+ }
return TRUE;
}
MakeCellVisible( row, col );
if ( expandSelection )
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- row, col );
- SetCurrentCell( row, col );
+ {
+ m_selectingKeyboard = wxGridCellCoords( row, col );
+ SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ SetCurrentCell( row, col );
+ }
return TRUE;
}
MakeCellVisible( row, col );
if ( expandSelection )
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- row, col );
- SetCurrentCell( row, col );
+ {
+ m_selectingKeyboard = wxGridCellCoords( row, col );
+ SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ SetCurrentCell( row, col );
+ }
return TRUE;
}
void wxGrid::SelectRow( int row, bool addToSelected )
{
if ( IsSelection() && !addToSelected )
- m_selection->ClearSelection();
+ ClearSelection();
m_selection->SelectRow( row );
}
void wxGrid::SelectCol( int col, bool addToSelected )
{
if ( IsSelection() && !addToSelected )
- m_selection->ClearSelection();
+ ClearSelection();
m_selection->SelectCol( col );
}
projects / wxWidgets.git / blobdiff