X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb7acf9cc78c309026bed1038631f2663cd90bda..93692400d0a9f89cf013e1e101701eae0a541a59:/contrib/src/gizmos/multicell.cpp diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp index c09a203a73..3483d896d2 100644 --- a/contrib/src/gizmos/multicell.cpp +++ b/contrib/src/gizmos/multicell.cpp @@ -38,7 +38,7 @@ //--------------------------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxMultiCellSizer, wxSizer); -IMPLEMENT_ABSTRACT_CLASS(wxMultiCellItemHandle, wxRect); +IMPLEMENT_ABSTRACT_CLASS(wxMultiCellItemHandle, wxObject); //--------------------------------------------------------------------------- // wxMultiCellItemHandle @@ -644,7 +644,7 @@ void wxMultiCellCanvas :: Add(wxWindow *win, unsigned int row, unsigned int col) { wxASSERT_MSG(row >= 0 && row < m_maxRows, wxString("Row ") + itoa(row) + " out of bounds (" + itoa(m_maxRows) + ")"); wxASSERT_MSG(col >= 0 && col < m_maxCols, wxString("Column ") + itoa(col) + " out of bounds (" + itoa(m_maxCols) + ")"); - wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, _("Cell already occupied")); + wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied")); wxCell *newCell = new wxCell(win); m_cells[CELL_LOC(row,col)] = newCell;