#define wxGRID_DRAG_UP_DOWN 2
IMPLEMENT_DYNAMIC_CLASS(wxGenericGrid, wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxGridEvent, wxEvent)
BEGIN_EVENT_TABLE(wxGenericGrid, wxPanel)
EVT_SIZE(wxGenericGrid::OnSize)
EVT_TEXT(wxGRID_TEXT_CTRL, wxGenericGrid::OnText)
EVT_COMMAND_SCROLL(wxGRID_HSCROLL, wxGenericGrid::OnGridScroll)
EVT_COMMAND_SCROLL(wxGRID_VSCROLL, wxGenericGrid::OnGridScroll)
+
+ // default wxGridEvent handlers
+ EVT_GRID_SELECT_CELL(wxGenericGrid::_OnSelectCell)
+ EVT_GRID_CREATE_CELL(wxGenericGrid::_OnCreateCell)
+ EVT_GRID_CHANGE_LABELS(wxGenericGrid::_OnChangeLabels)
+ EVT_GRID_CHANGE_SEL_LABEL(wxGenericGrid::_OnChangeSelectionLabel)
+ EVT_GRID_CELL_CHANGE(wxGenericGrid::_OnCellChange)
+ EVT_GRID_CELL_LCLICK(wxGenericGrid::_OnCellLeftClick)
+ EVT_GRID_CELL_RCLICK(wxGenericGrid::_OnCellRightClick)
+ EVT_GRID_LABEL_LCLICK(wxGenericGrid::_OnLabelLeftClick)
+ EVT_GRID_LABEL_RCLICK(wxGenericGrid::_OnLabelRightClick)
+
END_EVENT_TABLE()
+
+
+
wxGenericGrid::wxGenericGrid(void)
{
m_batchCount = 0;
m_horizontalSashCursor = new wxCursor(wxCURSOR_SIZEWE);
m_verticalSashCursor = new wxCursor(wxCURSOR_SIZENS);
}
-
+
SetLabelBackgroundColour(m_labelBackgroundColour);
m_leftOfSheet = wxGRID_DEFAULT_SHEET_LEFT;
m_textItem->Show(TRUE);
m_textItem->SetFocus();
int controlW, controlH;
-
+
m_textItem->GetSize(&controlW, &controlH);
m_editControlPosition.height = controlH;
for (j = 0; j < nCols; j++)
if (cellValues)
{
- m_gridCells[i][j] = OnCreateCell();
+ //m_gridCells[i][j] = OnCreateCell();
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CREATE_CELL, this, i, j);
+ GetEventHandler()->ProcessEvent(g_evt);
+ m_gridCells[i][j] = g_evt.m_cell;
m_gridCells[i][j]->SetTextValue(cellValues[i][j]);
}
else
m_hScrollBar->SetObjectLength(objectSizeX);
m_hScrollBar->SetPageSize(pageSizeX);
*/
- m_hScrollBar->SetScrollbar(m_hScrollBar->GetPosition(), pageSizeX, objectSizeX, viewLengthX);
+ m_hScrollBar->SetScrollbar(m_hScrollBar->GetThumbPosition(), pageSizeX, objectSizeX, viewLengthX);
int objectSizeY = m_totalRows;
int pageSizeY = 1;
m_vScrollBar->SetPageSize(pageSizeY);
*/
- m_vScrollBar->SetScrollbar(m_vScrollBar->GetPosition(), pageSizeY, objectSizeY, viewLengthY);
+ m_vScrollBar->SetScrollbar(m_vScrollBar->GetThumbPosition(), pageSizeY, objectSizeY, viewLengthY);
AdjustScrollbars();
- OnChangeLabels();
- OnChangeSelectionLabel();
-
+ //OnChangeLabels();
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CHANGE_LABELS, this);
+ GetEventHandler()->ProcessEvent(g_evt);
+
+ //OnChangeSelectionLabel();
+ wxGridEvent g_evt2(GetId(), wxEVT_GRID_CHANGE_SEL_LABEL, this);
+ GetEventHandler()->ProcessEvent(g_evt2);
+
return TRUE;
}
{
int canvasWidth, canvasHeight;
GetSize(&canvasWidth, &canvasHeight);
-
+
if (m_editCreated && m_editable)
{
int controlW, controlH;
else
m_bottomOfSheet += m_rowHeights[i];
}
-
+
m_totalGridWidth = m_leftOfSheet + m_verticalLabelWidth;
for (i = 0; i < m_totalCols; i++)
{
if ((row >= m_totalRows) || (col >= m_totalCols))
return (wxGridCell *) NULL;
-
+
wxGridCell *cell = m_gridCells[row][col];
if (!cell)
{
- m_gridCells[row][col] = OnCreateCell();
+ // m_gridCells[row][col] = OnCreateCell();
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CREATE_CELL, this, row, col);
+ GetEventHandler()->ProcessEvent(g_evt);
+ m_gridCells[row][col] = g_evt.m_cell;
return m_gridCells[row][col];
}
else
{
int cw, ch;
GetClientSize(&cw, &ch);
-
+
int i;
if (m_divisionPen)
if (m_horizontalLabelHeight == 0)
return;
-
+
int i;
- wxRectangle rect;
+ wxRect rect;
// Draw letters for columns
rect.y = m_topOfSheet + 1;
dc->SetTextBackground(m_labelBackgroundColour);
dc->SetBackgroundMode(wxTRANSPARENT);
// dc->SetTextForeground(m_labelTextColour);
-
+
int widthCount = m_leftOfSheet + m_verticalLabelWidth;
for (i = m_scrollPosX; i < m_totalCols; i++)
{
}
}
-void wxGenericGrid::DrawColumnLabel(wxDC *dc, wxRectangle *rect, int col)
+void wxGenericGrid::DrawColumnLabel(wxDC *dc, wxRect *rect, int col)
{
wxGridCell *cell = GetLabelCell(wxHORIZONTAL, col);
if (cell)
{
- wxRectangle rect2;
+ wxRect rect2;
rect2 = *rect;
rect2.x += 3;
rect2.y += 2;
return;
int i;
- wxRectangle rect;
-
+ wxRect rect;
+
// Draw numbers for rows
rect.x = m_leftOfSheet;
rect.width = m_verticalLabelWidth;
rect.y = 1 + heightCount;
rect.height = m_rowHeights[i];
DrawRowLabel(dc, &rect, i);
-
+
heightCount += m_rowHeights[i];
}
}
}
-void wxGenericGrid::DrawRowLabel(wxDC *dc, wxRectangle *rect, int row)
+void wxGenericGrid::DrawRowLabel(wxDC *dc, wxRect *rect, int row)
{
wxGridCell *cell = GetLabelCell(wxVERTICAL, row);
if (cell)
{
- wxRectangle rect2;
+ wxRect rect2;
rect2 = *rect;
rect2.x += 3;
rect2.y += 2;
GetClientSize(&cw, &ch);
int i,j;
-
+
// Draw value corresponding to each cell
for (i = m_scrollPosY; i < m_totalRows; i++)
{
dc->SetPen(*wxBLACK_PEN);
}
-void wxGenericGrid::DrawCellBackground(wxDC *dc, wxRectangle *rect, int row, int col)
+void wxGenericGrid::DrawCellBackground(wxDC *dc, wxRect *rect, int row, int col)
{
wxGridCell *cell = GetCell(row, col);
if (cell)
{
dc->SetBrush(*cell->GetBackgroundBrush());
dc->SetPen(*wxTRANSPARENT_PEN);
-
+
#if 0 // In wxWin 2.0 the dc code is exact. RR.
#ifdef __WXMOTIF__
dc->DrawRectangle(rect->x+1, rect->y+1, rect->width-1, rect->height-1);
}
}
-void wxGenericGrid::DrawCellValue(wxDC *dc, wxRectangle *rect, int row, int col)
+void wxGenericGrid::DrawCellValue(wxDC *dc, wxRect *rect, int row, int col)
{
wxGridCell *cell = GetCell(row, col);
if (cell)
{
wxBitmap *bitmap = cell->GetCellBitmap();
- wxRectangle rect2;
+ wxRect rect2;
rect2 = *rect;
rect2.x += 3;
rect2.y += 2;
{
int cw, ch;
GetClientSize(&cw, &ch);
-
+
// We find the view size by seeing how many rows/cols fit on
// the current view.
// BUT... this means that the scrollbar should be adjusted every time
vertScrollBarWidth = 0;
if (m_hScrollBar && !m_hScrollBar->IsShown())
horizScrollBarHeight = 0;
-
+
int noHorizSteps = 0;
int noVertSteps = 0;
-
+
if (m_totalGridWidth + vertScrollBarWidth <= cw)
noHorizSteps = 0;
else
nx ++;
}
-
+
noHorizSteps += nx;
}
if (m_totalGridHeight + horizScrollBarHeight <= ch)
else
ny ++;
}
-
+
noVertSteps += ny;
}
-
+
if (m_totalGridWidth + vertScrollBarWidth <= cw)
{
if ( m_hScrollBar )
if (m_hScrollBar)
{
int nCols = GetCols();
- m_hScrollBar->SetScrollbar(m_hScrollBar->GetPosition(), wxMax(noHorizSteps, 1), (noHorizSteps == 0) ? 1 : nCols, wxMax(noHorizSteps, 1));
+ m_hScrollBar->SetScrollbar(m_hScrollBar->GetThumbPosition(), wxMax(noHorizSteps, 1), (noHorizSteps == 0) ? 1 : nCols, wxMax(noHorizSteps, 1));
m_hScrollBar->SetSize(m_leftOfSheet, ch - m_scrollWidth -2,
cw - vertScrollBarWidth - m_leftOfSheet, m_scrollWidth);
}
-
+
if (m_vScrollBar)
{
int nRows = GetRows();
- m_vScrollBar->SetScrollbar(m_vScrollBar->GetPosition(), wxMax(noVertSteps, 1), (noVertSteps == 0) ? 1 : nRows, wxMax(noVertSteps, 1));
+ m_vScrollBar->SetScrollbar(m_vScrollBar->GetThumbPosition(), wxMax(noVertSteps, 1), (noVertSteps == 0) ? 1 : nRows, wxMax(noVertSteps, 1));
m_vScrollBar->SetSize(cw - m_scrollWidth, m_topOfSheet,
m_scrollWidth, ch - m_topOfSheet - horizScrollBarHeight);
}
return;
AdjustScrollbars();
-
+
int cw, ch;
GetClientSize(&cw, &ch);
y -= (m_topOfSheet + m_horizontalLabelHeight);
int i;
-
+
// Now we need to do a hit test for which row we're on
int currentHeight = 0;
for (i = m_scrollPosY; i < m_totalRows; i++)
}
currentHeight += m_rowHeights[i];
}
-
+
// Now we need to do a hit test for which column we're on
int currentWidth = 0;
for (i = m_scrollPosX; i < m_totalCols; i++)
{
int i;
int tolerance = 3;
-
+
if (x >= (m_leftOfSheet + m_verticalLabelWidth) && y >= m_topOfSheet &&
x <= m_rightOfSheet && y <= (m_topOfSheet + m_horizontalLabelHeight))
{
{
wxClientDC dc(this);
dc.BeginDrawing();
-
+
int row, col;
if (CellHitTest((int)ev.GetX(), (int)ev.GetY(), &row, &col))
{
OnSelectCellImplementation(& dc, row, col);
- OnCellLeftClick(row, col, (int)ev.GetX(), (int)ev.GetY(), ev.ControlDown(), ev.ShiftDown());
+
+ //OnCellLeftClick(row, col, (int)ev.GetX(), (int)ev.GetY(), ev.ControlDown(), ev.ShiftDown());
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CELL_LCLICK, this,
+ row, col, (int)ev.GetX(), (int)ev.GetY(),
+ ev.ControlDown(), ev.ShiftDown());
+ GetEventHandler()->ProcessEvent(g_evt);
+
}
if (LabelHitTest((int)ev.GetX(), (int)ev.GetY(), &row, &col))
{
- OnLabelLeftClick(row, col, (int)ev.GetX(), (int)ev.GetY(), ev.ControlDown(), ev.ShiftDown());
+ //OnLabelLeftClick(row, col, (int)ev.GetX(), (int)ev.GetY(), ev.ControlDown(), ev.ShiftDown());
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_LABEL_LCLICK, this,
+ row, col, (int)ev.GetX(), (int)ev.GetY(),
+ ev.ControlDown(), ev.ShiftDown());
+ GetEventHandler()->ProcessEvent(g_evt);
+
}
dc.EndDrawing();
}
else
dc.DrawLine(m_leftOfSheet, (int)ev.GetY(), m_rightOfSheet, (int)ev.GetY());
dc.EndDrawing();
-
+
CaptureMouse();
}
break;
int row, col;
if (CellHitTest((int)ev.GetX(), (int)ev.GetY(), &row, &col))
{
- OnCellRightClick(row, col, (int)ev.GetX(), (int)ev.GetY(), ev.ControlDown(), ev.ShiftDown());
+ //OnCellRightClick(row, col, (int)ev.GetX(), (int)ev.GetY(), ev.ControlDown(), ev.ShiftDown());
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CELL_RCLICK, this,
+ row, col, (int)ev.GetX(), (int)ev.GetY(),
+ ev.ControlDown(), ev.ShiftDown());
+ GetEventHandler()->ProcessEvent(g_evt);
+
}
if (LabelHitTest((int)ev.GetX(), (int)ev.GetY(), &row, &col))
{
- OnLabelRightClick(row, col, (int)ev.GetX(), (int)ev.GetY(), ev.ControlDown(), ev.ShiftDown());
+ //OnLabelRightClick(row, col, (int)ev.GetX(), (int)ev.GetY(), ev.ControlDown(), ev.ShiftDown());
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_LABEL_RCLICK, this,
+ row, col, (int)ev.GetX(), (int)ev.GetY(),
+ ev.ControlDown(), ev.ShiftDown());
+ GetEventHandler()->ProcessEvent(g_evt);
}
}
}
m_wCursorColumn = col;
m_wCursorRow = row;
- OnChangeSelectionLabel();
+ //OnChangeSelectionLabel();
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CHANGE_SEL_LABEL, this);
+ GetEventHandler()->ProcessEvent(g_evt);
SetGridClippingRegion(dc);
SetGridClippingRegion(dc);
- // Why isn't this needed for Windows??
- // Probably because of the SetValue??
- // Arrrrrgh. This isn't needed anywhere, of course. RR.
+ // 1) Why isn't this needed for Windows??
+ // Probably because of the SetValue?? JS.
+ // 2) Arrrrrgh. This isn't needed anywhere,
+ // of course. One hour of debugging... RR.
#ifndef __WXMSW__
-// HighlightCell(dc);
+// HighlightCell(dc);
#endif
dc->DestroyClippingRegion();
-
- OnSelectCell(row, col);
+
+ //OnSelectCell(row, col);
+ wxGridEvent g_evt2(GetId(), wxEVT_GRID_SELECT_CELL, this, row, col);
+ GetEventHandler()->ProcessEvent(g_evt2);
}
wxGridCell *wxGenericGrid::OnCreateCell(void)
{
if (!GetEditable())
return;
-
+
wxString rowLabel(GetLabelValue(wxVERTICAL, GetCursorRow()));
wxString colLabel(GetLabelValue(wxHORIZONTAL, GetCursorColumn()));
-
+
wxString newLabel = colLabel + rowLabel;
if ((newLabel.Length() > 0) && (newLabel.Length() <= 8) && GetTextItem())
{
void wxGenericGrid::HighlightCell(wxDC *dc)
{
dc->SetLogicalFunction(wxINVERT);
-
+
// Top
- dc->DrawLine( m_currentRect.x + 1,
- m_currentRect.y + 1,
- m_currentRect.x + m_currentRect.width - 1,
+ dc->DrawLine( m_currentRect.x + 1,
+ m_currentRect.y + 1,
+ m_currentRect.x + m_currentRect.width - 1,
m_currentRect.y + 1);
// Right
- dc->DrawLine( m_currentRect.x + m_currentRect.width - 1,
+ dc->DrawLine( m_currentRect.x + m_currentRect.width - 1,
m_currentRect.y + 1,
- m_currentRect.x + m_currentRect.width - 1,
+ m_currentRect.x + m_currentRect.width - 1,
m_currentRect.y +m_currentRect.height - 1 );
// Bottom
- dc->DrawLine( m_currentRect.x + m_currentRect.width - 1,
+ dc->DrawLine( m_currentRect.x + m_currentRect.width - 1,
m_currentRect.y + m_currentRect.height - 1,
- m_currentRect.x + 1,
+ m_currentRect.x + 1,
m_currentRect.y + m_currentRect.height - 1);
// Left
- dc->DrawLine( m_currentRect.x + 1,
- m_currentRect.y + m_currentRect.height - 1,
- m_currentRect.x + 1,
+ dc->DrawLine( m_currentRect.x + 1,
+ m_currentRect.y + m_currentRect.height - 1,
+ m_currentRect.x + 1,
m_currentRect.y + 1);
dc->SetLogicalFunction(wxCOPY);
{
if (!m_currentRectVisible)
return;
-
+
wxGridCell *cell = GetCell(GetCursorRow(), GetCursorColumn());
if (!cell)
return;
-
+
static char szEdit[300];
wxClientDC dc(this);
strcpy(szEdit, m_textItem->GetValue());
- wxRectangle rect;
+ wxRect rect;
rect = m_currentRect;
rect.x += 3;
rect.y += 2;
DrawTextRect(& dc, " ", &rect, wxLEFT);
DrawTextRect(& dc, szEdit, &rect, cell->GetAlignment());
-
+
dc.DestroyClippingRegion();
-
+
dc.SetBackgroundMode(wxSOLID);
dc.EndDrawing();
else m_currentRectVisible = TRUE;
}
-static bool wxRectIntersection(wxRectangle *rect1, wxRectangle *rect2, wxRectangle *rect3)
+static bool wxRectIntersection(wxRect *rect1, wxRect *rect2, wxRect *rect3)
{
int x2_1 = rect1->x + rect1->width;
int y2_1 = rect1->y + rect1->height;
int x2_2 = rect2->x + rect2->width;
int y2_2 = rect2->y + rect2->height;
-
+
int x2_3, y2_3;
-
+
// Check for intersection
if ((rect1->x > x2_2) || (rect2->x > x2_1) ||
(rect1->y > y2_2) || (rect2->y > y2_1))
rect3->y = rect1->y;
else
rect3->y = rect2->y;
-
+
if (x2_1 > x2_2)
x2_3 = x2_2;
else
y2_3 = y2_2;
else
y2_3 = y2_1;
-
+
rect3->width = (int)(x2_3 - rect3->x);
rect3->height = (int)(y2_3 - rect3->y);
return TRUE;
}
-void wxGenericGrid::DrawTextRect(wxDC *dc, const wxString& text, wxRectangle *rect, int flag)
+void wxGenericGrid::DrawTextRect(wxDC *dc, const wxString& text, wxRect *rect, int flag)
{
dc->BeginDrawing();
-
+
// Ultimately, this functionality should be built into wxWindows,
// and optimized for each platform. E.g. on Windows, use DrawText
// passing a clipping rectangle, so that the wxWindows clipping region
// does not have to be used to implement this.
-
+
// If we're already clipping, we need to find the intersection
// between current clipping area and text clipping area.
-
- wxRectangle clipRect;
- wxRectangle clipRect2;
+
+ wxRect clipRect;
+ wxRect clipRect2;
long clipX, clipY, clipW, clipH;
dc->GetClippingBox(&clipX, &clipY, &clipW, &clipH);
clipRect.x = (int)clipX; clipRect.y = (int)clipY;
clipRect.width = (int)clipW; clipRect.height = (int)clipH;
-
+
bool alreadyClipping = TRUE;
if (clipRect.x == 0 && clipRect.y == 0 && clipRect.width == 0 && clipRect.height == 0)
if (alreadyClipping)
dc->DestroyClippingRegion();
-
+
dc->SetClippingRegion(clipRect2.x, clipRect2.y, clipRect2.width, clipRect2.height);
long textWidth, textHeight;
-
+
dc->GetTextExtent(text, &textWidth, &textHeight);
-
+
// Do alignment
float x,y;
switch (flag)
}
}
dc->DrawText(text, (long)x, (long)y );
-
+
dc->DestroyClippingRegion();
// Restore old clipping
dc->EndDrawing();
}
-void wxGenericGrid::DrawBitmapRect(wxDC *dc, wxBitmap *bitmap, wxRectangle *rect, int flag)
+void wxGenericGrid::DrawBitmapRect(wxDC *dc, wxBitmap *bitmap, wxRect *rect, int flag)
{
dc->BeginDrawing();
-
+
// Ultimately, this functionality should be built into wxWindows,
// and optimized for each platform. E.g. on Windows, use DrawText
// passing a clipping rectangle, so that the wxWindows clipping region
// does not have to be used to implement this.
-
+
// If we're already clipping, we need to find the intersection
// between current clipping area and text clipping area.
-
- wxRectangle clipRect;
- wxRectangle clipRect2;
+
+ wxRect clipRect;
+ wxRect clipRect2;
long clipX, clipY, clipW, clipH;
dc->GetClippingBox(&clipX, &clipY, &clipW, &clipH);
clipRect.x = (int)clipX; clipRect.y = (int)clipY;
clipRect.width = (int)clipW; clipRect.height = (int)clipH;
-
+
bool alreadyClipping = TRUE;
if (clipRect.x == 0 && clipRect.y == 0 && clipRect.width == 0 && clipRect.height == 0)
if (alreadyClipping)
dc->DestroyClippingRegion();
-
+
dc->SetClippingRegion(clipRect2.x, clipRect2.y, clipRect2.width, clipRect2.height);
float bitmapWidth, bitmapHeight;
-
+
bitmapWidth = bitmap->GetWidth();
bitmapHeight = bitmap->GetHeight();
-
+
// Do alignment
long x,y;
switch (flag)
}
wxMemoryDC dcTemp;
dcTemp.SelectObject(*bitmap);
-
+
dc->Blit( (long)x, (long)y, (long)bitmapWidth, (long)bitmapHeight, &dcTemp, 0, 0);
dcTemp.SelectObject(wxNullBitmap);
-
+
dc->DestroyClippingRegion();
// Restore old clipping
// Don't refresh within a pair of batch brackets
if (GetBatchCount() > 0)
return;
-
+
int cw, ch;
GetClientSize(&cw, &ch);
wxString& wxGenericGrid::GetCellValue(int row, int col)
{
static wxString emptyString("");
-
+
wxGridCell *cell = GetCell(row, col);
if (cell)
return cell->GetTextValue();
int cw, ch;
int m_scrollWidth = 16;
GetClientSize(&cw, &ch);
-
+
if (m_vScrollBar)
m_vScrollBar->SetSize(cw - m_scrollWidth, m_topOfSheet,
m_scrollWidth, ch - m_topOfSheet - m_scrollWidth);
{
if (pos > m_totalCols)
return FALSE;
-
+
if (!m_gridCells)
return CreateGrid(1, n);
else
newCols[j] = new wxGridCell(this);
for (j = pos + n; j < m_totalCols + n; j++)
newCols[j] = cols[j - n];
-
+
delete[] cols;
m_gridCells[i] = newCols;
}
m_totalCols += n;
- if (updateLabels)
- OnChangeLabels();
+ if (updateLabels) {
+ //OnChangeLabels();
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CHANGE_LABELS, this);
+ GetEventHandler()->ProcessEvent(g_evt);
+ }
+
UpdateDimensions();
AdjustScrollbars();
return TRUE;
{
if (pos > m_totalRows)
return FALSE;
-
+
if (!m_gridCells)
return CreateGrid(n, 1);
else
{
int i, j;
-
+
wxGridCell ***rows = new wxGridCell **[m_totalRows + n];
// Cells
for (j = 0; j < m_totalCols; j++)
rows[i][j] = new wxGridCell(this);
}
-
+
for (i = pos + n; i < m_totalRows + n; i++)
rows[i] = m_gridCells[i - n];
m_totalRows += n;
- if (updateLabels)
- OnChangeLabels();
+ if (updateLabels) {
+ //OnChangeLabels();
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CHANGE_LABELS, this);
+ GetEventHandler()->ProcessEvent(g_evt);
+ }
+
UpdateDimensions();
AdjustScrollbars();
return TRUE;
return FALSE;
int i;
-
+
wxGridCell ***rows = new wxGridCell **[m_totalRows - n];
// Cells
m_totalRows -= n;
- if (updateLabels)
- OnChangeLabels();
+ if (updateLabels){
+ //OnChangeLabels();
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CHANGE_LABELS, this);
+ GetEventHandler()->ProcessEvent(g_evt);
+ }
UpdateDimensions();
AdjustScrollbars();
return TRUE;
delete cols[j];
for (j = pos + n; j < m_totalCols; j++)
newCols[j-n] = cols[j];
-
+
delete[] cols;
m_gridCells[i] = newCols;
}
m_totalCols -= n;
- if (updateLabels)
- OnChangeLabels();
+ if (updateLabels) {
+ //OnChangeLabels();
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CHANGE_LABELS, this);
+ GetEventHandler()->ProcessEvent(g_evt);
+ }
UpdateDimensions();
AdjustScrollbars();
return TRUE;
{
if (row >= m_totalRows || col >= m_totalCols)
return;
-
+
if (row == GetCursorRow() && col == GetCursorColumn())
return;
-
+
wxClientDC dc(this);
dc.BeginDrawing();
-
+
SetGridClippingRegion(& dc);
if (m_currentRectVisible)
HighlightCell(& dc);
-
+
m_wCursorRow = row;
m_wCursorColumn = col;
/*
* Grid cell
*/
-
+
wxGridCell::wxGridCell(wxGenericGrid *window)
{
cellBitmap = (wxBitmap *) NULL;
backgroundColour = window->GetCellBackgroundColour();
else
backgroundColour.Set(255,255,255);
-
+
if (window)
font = window->GetCellTextFont();
else
font = wxTheFontList->FindOrCreateFont(12, wxSWISS, wxNORMAL, wxNORMAL);
-
+
SetBackgroundColour(backgroundColour);
-
+
if (window)
alignment = window->GetCellAlignment();
else
grid->HighlightCell(& dc);
dc.DestroyClippingRegion();
dc.EndDrawing();
-
- grid->OnCellChange(grid->GetCursorRow(), grid->GetCursorColumn());
-
+
+ //grid->OnCellChange(grid->GetCursorRow(), grid->GetCursorColumn());
+ wxGridEvent g_evt(GetId(), wxEVT_GRID_CELL_CHANGE, grid,
+ grid->GetCursorRow(), grid->GetCursorColumn());
+ GetEventHandler()->ProcessEvent(g_evt);
+
// grid->DrawCellText();
}
}
wxGenericGrid *win = this;
bool change = FALSE;
-
+
if (ev.GetEventObject() == win->GetHorizScrollBar())
{
change = (ev.GetPosition() != m_scrollPosX);
if (change) win->Refresh(FALSE);
inScroll = FALSE;
-
+
}
+
+
+//----------------------------------------------------------------------
+// Default wxGridEvent handlers
+// (just redirect to the pre-existing virtual methods)
+
+void wxGenericGrid::_OnSelectCell(wxGridEvent& ev)
+{
+ OnSelectCell(ev.m_row, ev.m_col);
+}
+
+void wxGenericGrid::_OnCreateCell(wxGridEvent& ev)
+{
+ ev.m_cell = OnCreateCell();
+}
+
+void wxGenericGrid::_OnChangeLabels(wxGridEvent& WXUNUSED(ev))
+{
+ OnChangeLabels();
+}
+
+void wxGenericGrid::_OnChangeSelectionLabel(wxGridEvent& WXUNUSED(ev))
+{
+ OnChangeSelectionLabel();
+}
+
+void wxGenericGrid::_OnCellChange(wxGridEvent& ev)
+{
+ OnCellChange(ev.m_row, ev.m_col);
+}
+
+void wxGenericGrid::_OnCellLeftClick(wxGridEvent& ev)
+{
+ OnCellLeftClick(ev.m_row, ev.m_col, ev.m_x, ev.m_y, ev.m_control, ev.m_shift);
+}
+
+void wxGenericGrid::_OnCellRightClick(wxGridEvent& ev)
+{
+ OnCellRightClick(ev.m_row, ev.m_col, ev.m_x, ev.m_y, ev.m_control, ev.m_shift);
+}
+
+void wxGenericGrid::_OnLabelLeftClick(wxGridEvent& ev)
+{
+ OnLabelLeftClick(ev.m_row, ev.m_col, ev.m_x, ev.m_y, ev.m_control, ev.m_shift);
+}
+
+void wxGenericGrid::_OnLabelRightClick(wxGridEvent& ev)
+{
+ OnLabelRightClick(ev.m_row, ev.m_col, ev.m_x, ev.m_y, ev.m_control, ev.m_shift);
+}
+
+
projects / wxWidgets.git / blobdiff