diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-09-28 19:50:49 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-09-28 19:50:49 +0800 |
commit | 8cd2c62b9616a56e7a3b4b4f06d1f07a459555a9 (patch) | |
tree | 6a91b2495817dafffcf3590b7e8c6394e01725cd /x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp | |
parent | ee490f9c1d681ae11bc3f01bf0f40186b20a9824 (diff) | |
download | marcuscom-ports-8cd2c62b9616a56e7a3b4b4f06d1f07a459555a9.tar marcuscom-ports-8cd2c62b9616a56e7a3b4b4f06d1f07a459555a9.tar.gz marcuscom-ports-8cd2c62b9616a56e7a3b4b4f06d1f07a459555a9.tar.bz2 marcuscom-ports-8cd2c62b9616a56e7a3b4b4f06d1f07a459555a9.tar.lz marcuscom-ports-8cd2c62b9616a56e7a3b4b4f06d1f07a459555a9.tar.xz marcuscom-ports-8cd2c62b9616a56e7a3b4b4f06d1f07a459555a9.tar.zst marcuscom-ports-8cd2c62b9616a56e7a3b4b4f06d1f07a459555a9.zip |
Fix build with new glib
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13065 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp')
-rw-r--r-- | x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp b/x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp new file mode 100644 index 000000000..88d677891 --- /dev/null +++ b/x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp @@ -0,0 +1,33 @@ +--- contrib/src/gizmos/multicell.cpp.orig Wed Nov 5 00:04:44 2003 ++++ contrib/src/gizmos/multicell.cpp Wed Nov 5 00:06:11 2003 +@@ -633,17 +633,12 @@ + m_minCellSize = wxSize(5, 5); + } + //--------------------------------------------------------------------------- +-wxString itoa(int x) +-{ +- char bfr[255]; +- sprintf(bfr, "%d", x); +- return bfr; +-} +-//--------------------------------------------------------------------------- + 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(row >= 0 && row < m_maxRows, ++ wxString::Format(_T("Row %d out of bounds (0..%d)"), row, m_maxRows) ); ++ wxASSERT_MSG(col >= 0 && col < m_maxCols, ++ wxString::Format(_T("Column %d out of bounds (0..%d)"), col, m_maxCols) ); + wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied")); + + wxCell *newCell = new wxCell(win); +@@ -660,7 +655,7 @@ + if (!m_cells[CELL_LOC(row, col)]) + { + // Create an empty static text field as a placeholder +- m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, -1, "")); ++ m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, -1, wxT(""))); + } + wxFlexGridSizer::Add(m_cells[CELL_LOC(row, col)]->m_window); + } |