#pragma hdrstop
#endif
+#if wxUSE_GRID
+
#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
-#include "gridg.cpp"
-#else
+ #include "gridg.cpp"
+#else // wxUSE_NEW_GRID
#ifndef WX_PRECOMP
#include "wx/utils.h"
WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED)
+
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
+ void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
void OnPaint( wxPaintEvent &event );
void OnMouseEvent( wxMouseEvent& event );
+ void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
wxGrid *m_owner;
void OnMouseEvent( wxMouseEvent& event );
+ void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
void OnPaint( wxPaintEvent& event );
wxGridColLabelWindow *m_colLabelWin;
void OnPaint( wxPaintEvent &event );
+ void OnMouseWheel( wxMouseEvent& event );
void OnMouseEvent( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& );
void OnKeyUp( wxKeyEvent& );
wxRect wxGridNoCellRect( -1, -1, -1, -1 );
// scroll line size
-// TODO: fixed so far - make configurable later (and also different for x/y)
-static const size_t GRID_SCROLL_LINE = 10;
+// TODO: this doesn't work at all, grid cells have different sizes and approx
+// calculations don't work as because of the size mismatch scrollbars
+// sometimes fail to be shown when they should be or vice versa
+//
+// The scroll bars may be a little flakey once in a while, but that is
+// surely much less horrible than having scroll lines of only 1!!!
+// -- Robin
+static const size_t GRID_SCROLL_LINE = 15; // 1;
+
// the size of hash tables used a bit everywhere (the max number of elements
// in these hash tables is the number of rows/columns)
bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
{
// accept the simple key presses, not anything with Ctrl/Alt/Meta
- return !event.HasModifiers();
+ return !(event.ControlDown() || event.AltDown());
}
void wxGridCellEditor::StartingKey(wxKeyEvent& event)
{
}
+#if wxUSE_TEXTCTRL
+
// ----------------------------------------------------------------------------
// wxGridCellTextEditor
// ----------------------------------------------------------------------------
m_control = new wxTextCtrl(parent, id, wxEmptyString,
wxDefaultPosition, wxDefaultSize
#if defined(__WXMSW__)
- , wxTE_MULTILINE | wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL
+ , wxTE_PROCESS_TAB | wxTE_MULTILINE |
+ wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL
#endif
);
}
#else // !GTK
int extra_x = ( rect.x > 2 )? 2 : 1;
+
+// MB: treat MSW separately here otherwise the caret doesn't show
+// when the editor is in the first row.
+#if defined(__WXMSW__)
+ int extra_y = 2;
+#else
int extra_y = ( rect.y > 2 )? 2 : 1;
+#endif // MSW
+
#if defined(__WXMOTIF__)
extra_x *= 2;
extra_y *= 2;
return FALSE;
}
+#endif // wxUSE_TEXTCTRL
+
+#if wxUSE_CHECKBOX
+
// ----------------------------------------------------------------------------
// wxGridCellBoolEditor
// ----------------------------------------------------------------------------
if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
m_startValue = grid->GetTable()->GetValueAsBool(row, col);
else
- m_startValue = !!grid->GetTable()->GetValue(row, col);
+ {
+ wxString cellval( grid->GetTable()->GetValue(row, col) );
+ m_startValue = !( !cellval || (cellval == "0") );
+ }
CBox()->SetValue(m_startValue);
CBox()->SetFocus();
}
return FALSE;
}
+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_COMBOBOX
+
// ----------------------------------------------------------------------------
// wxGridCellChoiceEditor
// ----------------------------------------------------------------------------
}
}
+#endif // wxUSE_COMBOBOX
+
// ----------------------------------------------------------------------------
// wxGridCellEditorEvtHandler
// ----------------------------------------------------------------------------
break;
case WXK_TAB:
- event.Skip( m_grid->ProcessEvent( event ) );
+ m_grid->GetEventHandler()->ProcessEvent( event );
break;
case WXK_RETURN:
- if (!m_grid->ProcessEvent(event))
+ case WXK_NUMPAD_ENTER:
+ if (!m_grid->GetEventHandler()->ProcessEvent(event))
m_editor->HandleReturn(event);
break;
case WXK_ESCAPE:
case WXK_TAB:
case WXK_RETURN:
+ case WXK_NUMPAD_ENTER:
break;
default:
{
if ( m_width == -1 )
{
+ if ( m_precision == -1 )
+ {
// default width/precision
m_format = _T("%f");
+ }
+ else
+ {
+ m_format.Printf(_T("%%.%df"), m_precision);
+ }
}
else if ( m_precision == -1 )
{
}
text.Printf(m_format, val);
+
}
//else: text already contains the string
void wxGridCellFloatRenderer::SetParameters(const wxString& params)
{
- bool ok = TRUE;
-
if ( !params )
{
// reset to defaults
if ( !!tmp )
{
long width;
- if ( !tmp.ToLong(&width) )
+ if ( tmp.ToLong(&width) )
{
- ok = FALSE;
+ SetWidth((int)width);
}
else
{
- SetWidth((int)width);
+ wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
+ }
+ }
tmp = params.AfterFirst(_T(','));
if ( !!tmp )
{
long precision;
- if ( !tmp.ToLong(&precision) )
+ if ( tmp.ToLong(&precision) )
{
- ok = FALSE;
+ SetPrecision((int)precision);
}
else
{
- SetPrecision((int)precision);
- }
- }
- }
+ wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());
}
- if ( !ok )
- {
- wxLogDebug(_T("Invalid wxGridCellFloatRenderer parameter string '%s ignored"), params.c_str());
}
}
}
+
// ----------------------------------------------------------------------------
// wxGridCellBoolRenderer
// ----------------------------------------------------------------------------
if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
value = grid.GetTable()->GetValueAsBool(row, col);
else
- value = !!grid.GetTable()->GetValue(row, col);
+ {
+ wxString cellval( grid.GetTable()->GetValue(row, col) );
+ value = !( !cellval || (cellval == "0") );
+ }
if ( value )
{
if ( IsReadOnly() )
attr->SetReadOnly();
+ attr->SetKind( m_attrkind );
+
attr->SetDefAttr(m_defGridAttr);
return attr;
}
+void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
+{
+ if ( !HasTextColour() && mergefrom->HasTextColour() )
+ SetTextColour(mergefrom->GetTextColour());
+ if ( !HasBackgroundColour() && mergefrom->HasBackgroundColour() )
+ SetBackgroundColour(mergefrom->GetBackgroundColour());
+ if ( !HasFont() && mergefrom->HasFont() )
+ SetFont(mergefrom->GetFont());
+ if ( !!HasAlignment() && mergefrom->HasAlignment() ){
+ int hAlign, vAlign;
+ mergefrom->GetAlignment( &hAlign, &vAlign);
+ SetAlignment(hAlign, vAlign);
+ }
+
+ // Directly access member functions as GetRender/Editor don't just return
+ // m_renderer/m_editor
+ //
+ // Maybe add support for merge of Render and Editor?
+ if (!HasRenderer() && mergefrom->HasRenderer() )
+ {
+ m_renderer = mergefrom->m_renderer;
+ m_renderer->IncRef();
+ }
+ if ( !HasEditor() && mergefrom->HasEditor() )
+ {
+ m_editor = mergefrom->m_editor;
+ m_editor->IncRef();
+ }
+ if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() )
+ SetReadOnly(mergefrom->IsReadOnly());
+
+ SetDefAttr(mergefrom->m_defGridAttr);
+}
+
const wxColour& wxGridCellAttr::GetTextColour() const
{
if (HasTextColour())
m_data = new wxGridCellAttrProviderData;
}
-wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const
+wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
+ wxGridCellAttr::wxAttrKind kind ) const
{
wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
if ( m_data )
{
- // first look for the attribute of this specific cell
- attr = m_data->m_cellAttrs.GetAttr(row, col);
-
- if ( !attr )
+ switch(kind)
{
- // then look for the col attr (col attributes are more common than
- // the row ones, hence they have priority)
- attr = m_data->m_colAttrs.GetAttr(col);
- }
-
- if ( !attr )
+ case (wxGridCellAttr::Any):
+ //Get cached merge attributes.
+ // Currenlty not used as no cache implemented as not mutiable
+ // attr = m_data->m_mergeAttr.GetAttr(row, col);
+ if(!attr)
+ {
+ //Basicaly implement old version.
+ //Also check merge cache, so we don't have to re-merge every time..
+ wxGridCellAttr *attrcell = (wxGridCellAttr *)NULL,
+ *attrrow = (wxGridCellAttr *)NULL,
+ *attrcol = (wxGridCellAttr *)NULL;
+
+ attrcell = m_data->m_cellAttrs.GetAttr(row, col);
+ attrcol = m_data->m_colAttrs.GetAttr(col);
+ attrrow = m_data->m_rowAttrs.GetAttr(row);
+
+ if((attrcell != attrrow) && (attrrow !=attrcol) && (attrcell != attrcol)){
+ // Two or move are non NULL
+ attr = new wxGridCellAttr;
+ attr->SetKind(wxGridCellAttr::Merged);
+
+ //Order important..
+ if(attrcell){
+ attr->MergeWith(attrcell);
+ attrcell->DecRef();
+ }
+ if(attrcol){
+ attr->MergeWith(attrcol);
+ attrcol->DecRef();
+ }
+ if(attrrow){
+ attr->MergeWith(attrrow);
+ attrrow->DecRef();
+ }
+ //store merge attr if cache implemented
+ //attr->IncRef();
+ //m_data->m_mergeAttr.SetAttr(attr, row, col);
+ }
+ else
{
- // finally try the row attributes
+ // one or none is non null return it or null.
+ if(attrrow) attr = attrrow;
+ if(attrcol) attr = attrcol;
+ if(attrcell) attr = attrcell;
+ }
+ }
+ break;
+ case (wxGridCellAttr::Cell):
+ attr = m_data->m_cellAttrs.GetAttr(row, col);
+ break;
+ case (wxGridCellAttr::Col):
+ attr = m_data->m_colAttrs.GetAttr(col);
+ break;
+ case (wxGridCellAttr::Row):
attr = m_data->m_rowAttrs.GetAttr(row);
+ break;
+ default:
+ // unused as yet...
+ // (wxGridCellAttr::Default):
+ // (wxGridCellAttr::Merged):
+ break;
}
}
-
return attr;
}
{
// check whether this is one of the standard ones, in which case
// register it "on the fly"
+#if wxUSE_TEXTCTRL
if ( typeName == wxGRID_VALUE_STRING )
{
RegisterDataType(wxGRID_VALUE_STRING,
new wxGridCellStringRenderer,
new wxGridCellTextEditor);
- }
- else if ( typeName == wxGRID_VALUE_BOOL )
+ } else
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_CHECKBOX
+ if ( typeName == wxGRID_VALUE_BOOL )
{
RegisterDataType(wxGRID_VALUE_BOOL,
new wxGridCellBoolRenderer,
new wxGridCellBoolEditor);
- }
- else if ( typeName == wxGRID_VALUE_NUMBER )
+ } else
+#endif // wxUSE_CHECKBOX
+#if wxUSE_TEXTCTRL
+ if ( typeName == wxGRID_VALUE_NUMBER )
{
RegisterDataType(wxGRID_VALUE_NUMBER,
new wxGridCellNumberRenderer,
RegisterDataType(wxGRID_VALUE_FLOAT,
new wxGridCellFloatRenderer,
new wxGridCellFloatEditor);
- }
- else if ( typeName == wxGRID_VALUE_CHOICE )
+ } else
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_COMBOBOX
+ if ( typeName == wxGRID_VALUE_CHOICE )
{
RegisterDataType(wxGRID_VALUE_CHOICE,
new wxGridCellStringRenderer,
new wxGridCellChoiceEditor);
- }
- else
+ } else
+#endif // wxUSE_COMBOBOX
{
return wxNOT_FOUND;
}
wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
{
wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
- renderer->IncRef();
+ if (renderer)
+ renderer->IncRef();
return renderer;
}
wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
{
wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
- editor->IncRef();
+ if (editor)
+ editor->IncRef();
return editor;
}
return TRUE;
}
-wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col)
+wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind)
{
if ( m_attrProvider )
- return m_attrProvider->GetAttr(row, col);
+ return m_attrProvider->GetAttr(row, col, kind);
else
return (wxGridCellAttr *)NULL;
}
{
if ( m_attrProvider )
{
+ attr->SetKind(wxGridCellAttr::Cell);
m_attrProvider->SetAttr(attr, row, col);
}
else
{
if ( m_attrProvider )
{
+ attr->SetKind(wxGridCellAttr::Row);
m_attrProvider->SetRowAttr(attr, row);
}
else
{
if ( m_attrProvider )
{
+ attr->SetKind(wxGridCellAttr::Col);
m_attrProvider->SetColAttr(attr, col);
}
else
{
for ( n = 0; n < numRows; n++ )
{
- m_data.Remove( pos );
+ m_data.RemoveAt( pos );
}
}
if ( GetView() )
BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
EVT_PAINT( wxGridRowLabelWindow::OnPaint )
+ EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel)
EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
dc.SetDeviceOrigin( 0, -y );
- m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
- m_owner->DrawRowLabels( dc );
+ wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
+ m_owner->DrawRowLabels( dc , rows );
}
}
+void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+ m_owner->GetEventHandler()->ProcessEvent(event);
+}
+
+
// This seems to be required for wxMotif otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
EVT_PAINT( wxGridColLabelWindow::OnPaint )
+ EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel)
EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp )
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
dc.SetDeviceOrigin( -x, 0 );
- m_owner->CalcColLabelsExposed( GetUpdateRegion() );
- m_owner->DrawColLabels( dc );
+ wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );
+ m_owner->DrawColLabels( dc , cols );
}
m_owner->ProcessColLabelMouseEvent( event );
}
+void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+ m_owner->GetEventHandler()->ProcessEvent(event);
+}
+
// This seems to be required for wxMotif otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
+ EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel)
EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
}
+void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+ m_owner->GetEventHandler()->ProcessEvent(event);
+}
+
// This seems to be required for wxMotif otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
BEGIN_EVENT_TABLE( wxGridWindow, wxPanel )
EVT_PAINT( wxGridWindow::OnPaint )
+ EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel)
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
EVT_KEY_UP( wxGridWindow::OnKeyUp )
wxPaintDC dc( this );
m_owner->PrepareDC( dc );
wxRegion reg = GetUpdateRegion();
- m_owner->CalcCellsExposed( reg );
- m_owner->DrawGridCellArea( dc );
+ wxGridCellCoordsArray DirtyCells = m_owner->CalcCellsExposed( reg );
+ m_owner->DrawGridCellArea( dc , DirtyCells);
#if WXGRID_DRAW_LINES
m_owner->DrawAllGridLines( dc, reg );
#endif
m_owner->DrawGridSpace( dc );
- m_owner->DrawHighlight( dc );
+ m_owner->DrawHighlight( dc , DirtyCells );
}
m_owner->ProcessGridCellMouseEvent( event );
}
+void wxGridWindow::OnMouseWheel( wxMouseEvent& event )
+{
+ m_owner->GetEventHandler()->ProcessEvent(event);
+}
// This seems to be required for wxMotif/wxGTK otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
void wxGridWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
wxGrid::~wxGrid()
{
+ // Must do this or ~wxScrollHelper will pop the wrong event handler
+ SetTargetWindow(this);
ClearAttrCache();
wxSafeDecRef(m_defaultCellAttr);
m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
// Set default cell attributes
+ m_defaultCellAttr->SetKind(wxGridCellAttr::Default);
m_defaultCellAttr->SetFont(GetFont());
m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP);
m_defaultCellAttr->SetTextColour(
m_gridLineColour = wxColour( 128, 128, 255 );
m_gridLinesEnabled = TRUE;
m_cellHighlightColour = m_gridLineColour;
+ m_cellHighlightPenWidth = 2;
+ m_cellHighlightROPenWidth = 1;
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_winCapture = (wxWindow *)NULL;
int cw, ch;
GetClientSize( &cw, &ch );
- if ( m_numRows > 0 || m_numCols > 0 )
- {
- int right = m_numCols > 0 ? GetColRight( m_numCols-1 ) + m_extraWidth : 0;
- int bottom = m_numRows > 0 ? GetRowBottom( m_numRows-1 ) + m_extraHeight : 0;
+ if ( m_colLabelWin->IsShown() )
+ cw -= m_rowLabelWidth;
+ if ( m_rowLabelWin->IsShown() )
+ ch -= m_colLabelHeight;
- // TODO: restore the scroll position that we had before sizing
- //
- int x, y;
- GetViewStart( &x, &y );
- SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
- right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE,
- x, y );
+ // grid total size
+ int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
+ int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
+
+ // preserve (more or less) the previous position
+ int x, y;
+ GetViewStart( &x, &y );
+ // maybe we don't need scrollbars at all? and if we do, transform w and h
+ // from pixels into logical units
+ if ( w <= cw )
+ {
+ w = 0; x= 0;
}
+ else
+ {
+ w = (w + GRID_SCROLL_LINE - 1)/GRID_SCROLL_LINE;
+ if ( x >= w )
+ x = w - 1;
+ }
+ if ( h <= ch )
+ {
+ h = 0; y = 0;
+ }
+ else
+ {
+ h = (h + GRID_SCROLL_LINE - 1)/GRID_SCROLL_LINE;
+ if ( y >= h )
+ y = h - 1;
+ }
+
+ // do set scrollbar parameters
+ SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
+ w, h, x, y, (GetBatchCount() != 0));
}
attrProvider->UpdateAttrRows( pos, -((int)numRows) );
// ifdef'd out following patch from Paul Gammans
#if 0
+ // No need to touch column attributes, unless we
// removed _all_ rows, in this case, we remove
// all column attributes.
// I hate to do this here, but the
// needed data is not available inside UpdateAttrRows.
if ( !GetNumberRows() )
attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
-#endif
+#endif
}
if ( !GetBatchCount() )
{
wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
if (attrProvider) {
attrProvider->UpdateAttrCols( pos, -((int)numCols) );
-// ifdef'd out following patch from Paul Gammans
+// ifdef'd out following patch from Paul Gammans
#if 0
// No need to touch row attributes, unless we
// removed _all_ columns, in this case, we remove
// needed data is not available inside UpdateAttrCols.
if ( !GetNumberCols() )
attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
-#endif
+#endif
}
if ( !GetBatchCount() )
{
CalcDimensions();
m_colLabelWin->Refresh();
}
- return TRUE;
}
-#if 0
-// There is no path to this code !!!!!!
- result = TRUE;
+ result = TRUE;
break;
-#endif
}
if (result && !GetBatchCount() )
}
-void wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
- m_rowLabelsExposed.Empty();
-
+ wxArrayInt rowlabels;
+
int top, bottom;
while ( iter )
{
if ( GetRowTop(row) > bottom )
break;
- m_rowLabelsExposed.Add( row );
+ rowlabels.Add( row );
}
iter++ ;
}
+
+ return rowlabels;
}
-void wxGrid::CalcColLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
- m_colLabelsExposed.Empty();
+ wxArrayInt colLabels;
int left, right;
while ( iter )
if ( GetColLeft(col) > right )
break;
- m_colLabelsExposed.Add( col );
+ colLabels.Add( col );
}
iter++ ;
}
+ return colLabels;
}
-void wxGrid::CalcCellsExposed( const wxRegion& reg )
+wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
- m_cellsExposed.Empty();
- m_rowsExposed.Empty();
- m_colsExposed.Empty();
+ wxGridCellCoordsArray cellsExposed;
int left, top, right, bottom;
while ( iter )
if ( GetRowTop(row) > bottom )
break;
- m_rowsExposed.Add( row );
for ( col = 0; col < m_numCols; col++ )
{
if ( GetColLeft(col) > right )
break;
- if ( m_colsExposed.Index( col ) == wxNOT_FOUND )
- m_colsExposed.Add( col );
- m_cellsExposed.Add( wxGridCellCoords( row, col ) );
+ cellsExposed.Add( wxGridCellCoords( row, col ) );
}
}
iter++;
}
+
+ return cellsExposed;
}
cursorModes[m_cursorMode], cursorModes[mode]);
#endif // __WXDEBUG__
- if ( mode == m_cursorMode )
+ if ( mode == m_cursorMode &&
+ win == m_winCapture &&
+ captureMouse == (m_winCapture != NULL))
return;
if ( !win )
{
if ( m_selectingKeyboard == wxGridNoCellCoords)
m_selectingKeyboard = coords;
- SelectBlock ( m_selectingKeyboard, coords );
+ HighlightBlock ( m_selectingKeyboard, coords );
}
else
{
if ( !IsSelection() )
{
- SelectBlock( coords, coords );
+ HighlightBlock( coords, coords );
}
else
{
- SelectBlock( m_currentCellCoords, coords );
+ HighlightBlock( m_currentCellCoords, coords );
}
}
SetCurrentCell( coords );
if ( m_selection->GetSelectionMode()
!= wxGrid::wxGridSelectCells)
- SelectBlock( coords, coords );
+ HighlightBlock( coords, coords );
}
m_waitForSlowClick = TRUE;
}
type,
this,
rowOrCol,
- mouseEv.GetX() + GetColLabelSize(),
- mouseEv.GetY() + GetRowLabelSize(),
+ mouseEv.GetX() + GetRowLabelSize(),
+ mouseEv.GetY() + GetColLabelSize(),
mouseEv.ControlDown(),
mouseEv.ShiftDown(),
mouseEv.AltDown(),
mouseEv.MetaDown() );
-
return GetEventHandler()->ProcessEvent(gridEvt);
}
else if ( type == wxEVT_GRID_RANGE_SELECT )
type,
this,
row, col,
- mouseEv.GetX() + GetColLabelSize(),
- mouseEv.GetY() + GetRowLabelSize(),
+ mouseEv.GetX() + GetRowLabelSize(),
+ mouseEv.GetY() + GetColLabelSize(),
FALSE,
mouseEv.ControlDown(),
mouseEv.ShiftDown(),
mouseEv.AltDown(),
mouseEv.MetaDown() );
-
return GetEventHandler()->ProcessEvent(gridEvt);
}
}
break;
case WXK_RETURN:
+ case WXK_NUMPAD_ENTER:
if ( event.ControlDown() )
{
event.Skip(); // to let the edit control have the return
HideCellEditControl();
DisableCellEditControl();
- if ( IsVisible( m_currentCellCoords ) )
+ if ( IsVisible( m_currentCellCoords, FALSE ) )
{
wxRect r;
- r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+ r = BlockToDeviceRect(m_currentCellCoords, coords);
if ( !m_gridLinesEnabled )
{
r.x--;
r.height++;
}
- CalcCellsExposed( r );
-
+ wxGridCellCoordsArray cells = CalcCellsExposed( r );
+
// Otherwise refresh redraws the highlight!
m_currentCellCoords = coords;
-
- DrawGridCellArea(dc);
+
+ DrawGridCellArea(dc,cells);
DrawAllGridLines( dc, r );
}
}
}
+void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+{
+ int temp;
+ wxGridCellCoords updateTopLeft, updateBottomRight;
+
+ if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
+ {
+ leftCol = 0;
+ rightCol = GetNumberCols() - 1;
+ }
+ else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+ {
+ topRow = 0;
+ bottomRow = GetNumberRows() - 1;
+ }
+ if ( topRow > bottomRow )
+ {
+ temp = topRow;
+ topRow = bottomRow;
+ bottomRow = temp;
+ }
+
+ if ( leftCol > rightCol )
+ {
+ temp = leftCol;
+ leftCol = rightCol;
+ rightCol = temp;
+ }
+
+ updateTopLeft = wxGridCellCoords( topRow, leftCol );
+ updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+
+ if ( m_selectingTopLeft != updateTopLeft ||
+ m_selectingBottomRight != updateBottomRight )
+ {
+ // Compute two optimal update rectangles:
+ // Either one rectangle is a real subset of the
+ // other, or they are (almost) disjoint!
+ wxRect rect[4];
+ bool need_refresh[4];
+ need_refresh[0] =
+ need_refresh[1] =
+ need_refresh[2] =
+ need_refresh[3] = FALSE;
+ int i;
+
+ // Store intermediate values
+ wxCoord oldLeft = m_selectingTopLeft.GetCol();
+ wxCoord oldTop = m_selectingTopLeft.GetRow();
+ wxCoord oldRight = m_selectingBottomRight.GetCol();
+ wxCoord oldBottom = m_selectingBottomRight.GetRow();
+
+ // Determine the outer/inner coordinates.
+ if (oldLeft > leftCol)
+ {
+ temp = oldLeft;
+ oldLeft = leftCol;
+ leftCol = temp;
+ }
+ if (oldTop > topRow )
+ {
+ temp = oldTop;
+ oldTop = topRow;
+ topRow = temp;
+ }
+ if (oldRight < rightCol )
+ {
+ temp = oldRight;
+ oldRight = rightCol;
+ rightCol = temp;
+ }
+ if (oldBottom < bottomRow)
+ {
+ temp = oldBottom;
+ oldBottom = bottomRow;
+ bottomRow = temp;
+ }
+
+ // Now, either the stuff marked old is the outer
+ // rectangle or we don't have a situation where one
+ // is contained in the other.
+
+ if ( oldLeft < leftCol )
+ {
+ need_refresh[0] = TRUE;
+ rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ oldLeft ),
+ wxGridCellCoords ( oldBottom,
+ leftCol - 1 ) );
+ }
+
+ if ( oldTop < topRow )
+ {
+ need_refresh[1] = TRUE;
+ rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ leftCol ),
+ wxGridCellCoords ( topRow - 1,
+ rightCol ) );
+ }
+
+ if ( oldRight > rightCol )
+ {
+ need_refresh[2] = TRUE;
+ rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ rightCol + 1 ),
+ wxGridCellCoords ( oldBottom,
+ oldRight ) );
+ }
+
+ if ( oldBottom > bottomRow )
+ {
+ need_refresh[3] = TRUE;
+ rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
+ leftCol ),
+ wxGridCellCoords ( oldBottom,
+ rightCol ) );
+ }
+
+
+ // Change Selection
+ m_selectingTopLeft = updateTopLeft;
+ m_selectingBottomRight = updateBottomRight;
+
+ // various Refresh() calls
+ for (i = 0; i < 4; i++ )
+ if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+ m_gridWin->Refresh( FALSE, &(rect[i]) );
+ }
+
+ // never generate an event as it will be generated from
+ // wxGridSelection::SelectBlock!
+ // (old comment from when this was the body of SelectBlock)
+}
+
//
// ------ functions to get/send data (see also public functions)
//
// exposed cells (usually set from the update region by
// CalcExposedCells)
//
-void wxGrid::DrawGridCellArea( wxDC& dc )
+void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
{
if ( !m_numRows || !m_numCols ) return;
size_t i;
- size_t numCells = m_cellsExposed.GetCount();
+ size_t numCells = cells.GetCount();
for ( i = 0; i < numCells; i++ )
{
- DrawCell( dc, m_cellsExposed[i] );
+ DrawCell( dc, cells[i] );
}
}
// hmmm... what could we do here to show that the cell is disabled?
// for now, I just draw a thinner border than for the other ones, but
// it doesn't look really good
- dc.SetPen(wxPen(m_cellHighlightColour, attr->IsReadOnly() ? 1 : 3, wxSOLID));
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
- dc.DrawRectangle(rect);
+ int penWidth = attr->IsReadOnly() ? m_cellHighlightROPenWidth : m_cellHighlightPenWidth;
+
+ if (penWidth > 0) {
+
+ // The center of th drawn line is where the position/width/height of
+ // the rectangle is actually at, (on wxMSW atr least,) so we will
+ // reduce the size of the rectangle to compensate for the thickness of
+ // the line. If this is too strange on non wxMSW platforms then
+ // please #ifdef this appropriately.
+ rect.x += penWidth/2;
+ rect.y += penWidth/2;
+ rect.width -= penWidth-1;
+ rect.height -= penWidth-1;
+
+
+ // Now draw the rectangle
+ dc.SetPen(wxPen(m_cellHighlightColour, penWidth, wxSOLID));
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ dc.DrawRectangle(rect);
+ }
#if 0
// VZ: my experiments with 3d borders...
GetColRight(col), GetRowBottom(row) );
}
-void wxGrid::DrawHighlight(wxDC& dc)
+void wxGrid::DrawHighlight(wxDC& dc,const wxGridCellCoordsArray& cells)
{
// This if block was previously in wxGrid::OnPaint but that doesn't
// seem to get called under wxGTK - MB
// if the active cell was repainted, repaint its highlight too because it
// might have been damaged by the grid lines
- size_t count = m_cellsExposed.GetCount();
+ size_t count = cells.GetCount();
for ( size_t n = 0; n < count; n++ )
{
- if ( m_cellsExposed[n] == m_currentCellCoords )
+ if ( cells[n] == m_currentCellCoords )
{
wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
DrawCellHighlight(dc, attr);
// 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 & WXUNUSED_GTK(reg) )
+void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
{
if ( !m_gridLinesEnabled ||
!m_numRows ||
}
-void wxGrid::DrawRowLabels( wxDC& dc )
+void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows)
{
if ( !m_numRows ) return;
size_t i;
- size_t numLabels = m_rowLabelsExposed.GetCount();
+ size_t numLabels = rows.GetCount();
for ( i = 0; i < numLabels; i++ )
{
- DrawRowLabel( dc, m_rowLabelsExposed[i] );
+ DrawRowLabel( dc, rows[i] );
}
}
}
-void wxGrid::DrawColLabels( wxDC& dc )
+void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
{
if ( !m_numCols ) return;
size_t i;
- size_t numLabels = m_colLabelsExposed.GetCount();
+ size_t numLabels = cols.GetCount();
for ( i = 0; i < numLabels; i++ )
{
- DrawColLabel( dc, m_colLabelsExposed[i] );
+ DrawColLabel( dc, cols[i] );
}
}
DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
}
-
void wxGrid::DrawTextRectangle( wxDC& dc,
const wxString& value,
const wxRect& rect,
int horizAlign,
int vertAlign )
{
- long textWidth, textHeight;
- long lineWidth, lineHeight;
wxArrayString lines;
dc.SetClippingRegion( rect );
StringToLines( value, lines );
+
+
+ //Forward to new API.
+ DrawTextRectangle( dc,
+ lines,
+ rect,
+ horizAlign,
+ vertAlign );
+
+}
+
+void wxGrid::DrawTextRectangle( wxDC& dc,
+ const wxArrayString& lines,
+ const wxRect& rect,
+ int horizAlign,
+ int vertAlign )
+{
+ long textWidth, textHeight;
+ long lineWidth, lineHeight;
+
if ( lines.GetCount() )
{
GetTextBoxSize( dc, lines, &textWidth, &textHeight );
void wxGrid::GetTextBoxSize( wxDC& dc,
- wxArrayString& lines,
+ const wxArrayString& lines,
long *width, long *height )
{
long w = 0;
{
if ( !IsVisible( m_currentCellCoords ) )
{
- m_cellEditCtrlEnabled = false;
+ m_cellEditCtrlEnabled = FALSE;
return;
}
else
{
editor->Create(m_gridWin, -1,
new wxGridCellEditorEvtHandler(this, editor));
+
+ wxGridEditorCreatedEvent evt(GetId(),
+ wxEVT_GRID_EDITOR_CREATED,
+ this,
+ row,
+ col,
+ editor->GetControl());
+ GetEventHandler()->ProcessEvent(evt);
}
editor->Show( TRUE, attr );
m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
}
else if ( m_currentCellCoords.GetRow() > 0 )
m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
}
else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
}
else if ( m_currentCellCoords.GetCol() > 0 )
m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
}
else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
if ( expandSelection )
{
m_selectingKeyboard = wxGridCellCoords( row, col );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
else
{
if ( expandSelection )
{
m_selectingKeyboard = wxGridCellCoords( row, col );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
else
{
if ( expandSelection )
{
m_selectingKeyboard = wxGridCellCoords( row, col );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
else
{
if ( expandSelection )
{
m_selectingKeyboard = wxGridCellCoords( row, col );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
else
{
case wxRIGHT: horiz = wxALIGN_RIGHT; break;
case wxCENTRE: horiz = wxALIGN_CENTRE; break;
}
-
+
switch ( vert )
{
case wxTOP: vert = wxALIGN_TOP; break;
case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
case wxCENTRE: vert = wxALIGN_CENTRE; break;
}
-
+
if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
{
m_rowLabelHorizAlign = horiz;
case wxRIGHT: horiz = wxALIGN_RIGHT; break;
case wxCENTRE: horiz = wxALIGN_CENTRE; break;
}
-
+
switch ( vert )
{
case wxTOP: vert = wxALIGN_TOP; break;
case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
case wxCENTRE: vert = wxALIGN_CENTRE; break;
}
-
+
if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
{
m_colLabelHorizAlign = horiz;
if ( rect.height > 0 )
{
CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
- rect.x = m_left;
+ rect.x = 0;
rect.width = m_rowLabelWidth;
m_rowLabelWin->Refresh( TRUE, &rect );
}
if ( rect.width > 0 )
{
CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
- rect.y = m_top;
+ rect.y = 0;
rect.height = m_colLabelHeight;
m_colLabelWin->Refresh( TRUE, &rect );
}
}
}
+void wxGrid::SetCellHighlightPenWidth(int width)
+{
+ if (m_cellHighlightPenWidth != width) {
+ m_cellHighlightPenWidth = width;
+
+ // Just redrawing the cell highlight is not enough since that won't
+ // make any visible change if the the thickness is getting smaller.
+ int row = m_currentCellCoords.GetRow();
+ int col = m_currentCellCoords.GetCol();
+ if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+ return;
+ wxRect rect = CellToRect(row, col);
+ m_gridWin->Refresh(TRUE, &rect);
+ }
+}
+
+void wxGrid::SetCellHighlightROPenWidth(int width)
+{
+ if (m_cellHighlightROPenWidth != width) {
+ m_cellHighlightROPenWidth = width;
+
+ // Just redrawing the cell highlight is not enough since that won't
+ // make any visible change if the the thickness is getting smaller.
+ int row = m_currentCellCoords.GetRow();
+ int col = m_currentCellCoords.GetCol();
+ if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+ return;
+ wxRect rect = CellToRect(row, col);
+ m_gridWin->Refresh(TRUE, &rect);
+ }
+}
+
void wxGrid::EnableGridLines( bool enable )
{
if ( enable != m_gridLinesEnabled )
if ( m_attrCache.row != -1 )
{
wxSafeDecRef(m_attrCache.attr);
+ m_attrCache.attr = NULL;
m_attrCache.row = -1;
}
}
wxGridCellAttr *attr;
if ( !LookupAttr(row, col, &attr) )
{
- attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL;
+ attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any) : (wxGridCellAttr *)NULL;
CacheAttr(row, col, attr);
}
if (attr)
wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
{
- wxGridCellAttr *attr;
- if ( !LookupAttr(row, col, &attr) || !attr )
- {
+ wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
wxASSERT_MSG( m_table,
_T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") );
- attr = m_table->GetAttr(row, col);
+ attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell );
if ( !attr )
{
attr = new wxGridCellAttr;
// artificially inc the ref count to match DecRef() in caller
attr->IncRef();
-
m_table->SetAttr(attr, row, col);
}
-
- CacheAttr(row, col, attr);
- }
attr->SetDefAttr(m_defaultCellAttr);
return attr;
}
void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
{
- wxGridCellAttr *attr = new wxGridCellAttr;
+ wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+
+ attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col );
+ if(!attr)
+ attr = new wxGridCellAttr;
wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
attr->SetRenderer(renderer);
SetColAttr(col, attr);
+
}
// ----------------------------------------------------------------------------
if ( CanHaveAttributes() )
{
m_table->SetRowAttr(attr, row);
+ ClearAttrCache();
}
else
{
if ( CanHaveAttributes() )
{
m_table->SetColAttr(attr, col);
+ ClearAttrCache();
}
else
{
if ( resizeExistingRows )
{
InitRowHeights();
-
- CalcDimensions();
+ if ( !GetBatchCount() )
+ CalcDimensions();
}
}
{
m_rowBottoms[i] += diff;
}
- CalcDimensions();
+ if ( !GetBatchCount() )
+ CalcDimensions();
}
void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
if ( resizeExistingCols )
{
InitColWidths();
-
- CalcDimensions();
+ if ( !GetBatchCount() )
+ CalcDimensions();
}
}
{
m_colRights[i] += diff;
}
- CalcDimensions();
+ if ( !GetBatchCount() )
+ CalcDimensions();
}
if ( column )
dc.GetTextExtent( GetColLabelValue(col), &w, &h );
else
- dc.GetTextExtent( GetRowLabelValue(col), &w, &h );
+ dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
extent = column ? w : h;
if ( extent > extentMax )
}
}
- if ( column )
+ if ( column ){
SetColSize(col, extentMax);
- else
+ if ( !GetBatchCount() )
+ {
+ int cw, ch, dummy;
+ m_gridWin->GetClientSize( &cw, &ch );
+ wxRect rect ( CellToRect( 0, col ) );
+ rect.y = 0;
+ CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+ rect.width = cw - rect.x;
+ rect.height = m_colLabelHeight;
+ m_colLabelWin->Refresh( TRUE, &rect );
+ }
+ }
+ else{
SetRowSize(row, extentMax);
-
+ if ( !GetBatchCount() )
+ {
+ int cw, ch, dummy;
+ m_gridWin->GetClientSize( &cw, &ch );
+ wxRect rect ( CellToRect( row, 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 );
+ }
+ }
if ( setAsMin )
{
if ( column )
{
int width = m_rowLabelWidth;
+ if ( !calcOnly )
+ BeginBatch();
for ( int col = 0; col < m_numCols; col++ )
{
if ( !calcOnly )
width += GetColWidth(col);
}
-
+ if ( !calcOnly )
+ EndBatch();
return width;
}
{
int height = m_colLabelHeight;
+ if ( !calcOnly )
+ BeginBatch();
for ( int row = 0; row < m_numRows; row++ )
{
if ( !calcOnly )
height += GetRowHeight(row);
}
-
+ if ( !calcOnly )
+ EndBatch();
return height;
}
void wxGrid::AutoSize()
{
// set the size too
- SetSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
+ SetClientSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
}
wxSize wxGrid::DoGetBestSize() const
}
-void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
+ bool addToSelected )
{
- int temp;
- wxGridCellCoords updateTopLeft, updateBottomRight;
+ if ( IsSelection() && !addToSelected )
+ ClearSelection();
+ m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
+ FALSE, addToSelected );
+}
+
+
+void wxGrid::SelectAll()
+{
+ if ( m_numRows > 0 && m_numCols > 0 )
+ m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+}
+
+//
+// ------ Cell, row and col deselection
+//
+
+void wxGrid::DeselectRow( int row )
+{
if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
{
- leftCol = 0;
- rightCol = GetNumberCols() - 1;
- }
- else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
- {
- topRow = 0;
- bottomRow = GetNumberRows() - 1;
+ if ( m_selection->IsInSelection(row, 0 ) )
+ m_selection->ToggleCellSelection( row, 0);
}
- if ( topRow > bottomRow )
+ else
{
- temp = topRow;
- topRow = bottomRow;
- bottomRow = temp;
+ int nCols = GetNumberCols();
+ for ( int i = 0; i < nCols ; i++ )
+ {
+ if ( m_selection->IsInSelection(row, i ) )
+ m_selection->ToggleCellSelection( row, i);
+ }
}
+}
- if ( leftCol > rightCol )
+void wxGrid::DeselectCol( int col )
+{
+ if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
{
- temp = leftCol;
- leftCol = rightCol;
- rightCol = temp;
+ if ( m_selection->IsInSelection(0, col ) )
+ m_selection->ToggleCellSelection( 0, col);
}
-
- updateTopLeft = wxGridCellCoords( topRow, leftCol );
- updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
-
- if ( m_selectingTopLeft != updateTopLeft ||
- m_selectingBottomRight != updateBottomRight )
+ else
{
- // Compute two optimal update rectangles:
- // Either one rectangle is a real subset of the
- // other, or they are (almost) disjoint!
- wxRect rect[4];
- bool need_refresh[4];
- need_refresh[0] =
- need_refresh[1] =
- need_refresh[2] =
- need_refresh[3] = FALSE;
- int i;
-
- // Store intermediate values
- wxCoord oldLeft = m_selectingTopLeft.GetCol();
- wxCoord oldTop = m_selectingTopLeft.GetRow();
- wxCoord oldRight = m_selectingBottomRight.GetCol();
- wxCoord oldBottom = m_selectingBottomRight.GetRow();
-
- // Determine the outer/inner coordinates.
- if (oldLeft > leftCol)
+ int nRows = GetNumberRows();
+ for ( int i = 0; i < nRows ; i++ )
{
- temp = oldLeft;
- oldLeft = leftCol;
- leftCol = temp;
+ if ( m_selection->IsInSelection(i, col ) )
+ m_selection->ToggleCellSelection(i, col);
}
- if (oldTop > topRow )
- {
- temp = oldTop;
- oldTop = topRow;
- topRow = temp;
- }
- if (oldRight < rightCol )
- {
- temp = oldRight;
- oldRight = rightCol;
- rightCol = temp;
- }
- if (oldBottom < bottomRow)
- {
- temp = oldBottom;
- oldBottom = bottomRow;
- bottomRow = temp;
- }
-
- // Now, either the stuff marked old is the outer
- // rectangle or we don't have a situation where one
- // is contained in the other.
-
- if ( oldLeft < leftCol )
- {
- need_refresh[0] = TRUE;
- rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- oldLeft ),
- wxGridCellCoords ( oldBottom,
- leftCol - 1 ) );
- }
-
- if ( oldTop < topRow )
- {
- need_refresh[1] = TRUE;
- rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- leftCol ),
- wxGridCellCoords ( topRow - 1,
- rightCol ) );
- }
-
- if ( oldRight > rightCol )
- {
- need_refresh[2] = TRUE;
- rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- rightCol + 1 ),
- wxGridCellCoords ( oldBottom,
- oldRight ) );
- }
-
- if ( oldBottom > bottomRow )
- {
- need_refresh[3] = TRUE;
- rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
- leftCol ),
- wxGridCellCoords ( oldBottom,
- rightCol ) );
- }
-
-
- // Change Selection
- m_selectingTopLeft = updateTopLeft;
- m_selectingBottomRight = updateBottomRight;
-
- // various Refresh() calls
- for (i = 0; i < 4; i++ )
- if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
- m_gridWin->Refresh( FALSE, &(rect[i]) );
}
-
- // never generate an event as it will be generated from
- // wxGridSelection::SelectBlock!
}
-void wxGrid::SelectAll()
+void wxGrid::DeselectCell( int row, int col )
{
- m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+ if ( m_selection->IsInSelection(row, col) )
+ m_selection->ToggleCellSelection(row, col);
}
bool wxGrid::IsSelection()
// ------ Grid event classes
//
-IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent )
wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
int row, int col, int x, int y, bool sel,
}
-IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxNotifyEvent )
wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
int rowOrCol, int x, int y,
}
-IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxNotifyEvent )
wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
const wxGridCellCoords& topLeft,
}
-#endif // ifndef wxUSE_NEW_GRID
+IMPLEMENT_DYNAMIC_CLASS(wxGridEditorCreatedEvent, wxCommandEvent)
+
+wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
+ wxObject* obj, int row,
+ int col, wxControl* ctrl)
+ : wxCommandEvent(type, id)
+{
+ SetEventObject(obj);
+ m_row = row;
+ m_col = col;
+ m_ctrl = ctrl;
+}
+
+
+#endif // !wxUSE_NEW_GRID/wxUSE_NEW_GRID
+
+#endif // wxUSE_GRID
+
projects / wxWidgets.git / blobdiff