summaryrefslogtreecommitdiff
path: root/x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp
diff options
context:
space:
mode:
authorMax Khon <fjoe@FreeBSD.org>2003-11-04 20:51:32 +0000
committerMax Khon <fjoe@FreeBSD.org>2003-11-04 20:51:32 +0000
commit204da5ae4cbf51af640f1720ba76ae505ff80847 (patch)
treeaabe163b4c50735674cd2153bf94a335df44cc9d /x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp
parentUpgrade to Ganglia Web Frontend 2.5.4. PR ports/58658 (maintainer-update). (diff)
Add ports for wxgtk2 and wxgtk2-unicode (+contrib ports for both).
Add ports for wxgtk and wxgtk-contrib common files (includes, other data files). Allow different flavors of wxWindows library (gtk, gtk2, gtk2+unicode) to coexist. Patches to fix compiling -contrib in Unicode mode are taken from wxWindows CVS. wxgtk-devel is master port for all wxgtk ports (will be moved to wxgtk soon). wxgtk-common and wxgtk-contrib-common ports respectively. Assign maintainership of all wxgtk ports to myself for a while to catch errors on bento.
Notes
Notes: svn path=/head/; revision=93108
Diffstat (limited to 'x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp')
-rw-r--r--x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp33
1 files changed, 33 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp
new file mode 100644
index 000000000000..88d6778914ba
--- /dev/null
+++ b/x11-toolkits/wxgtk-devel/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);
+ }