--- /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/mmedia/cdunix.cpp.old 2005-05-08 18:38:22.000000000 +0200 +++ /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/mmedia/cdunix.cpp 2005-05-08 18:38:38.000000000 +0200 @@ -55,7 +55,7 @@ wxCDAudioLinux::wxCDAudioLinux() : wxCDAudio(), m_fd(-1) { - OpenDevice("/dev/cdrom"); + OpenDevice(wxT("/dev/cdrom")); } wxCDAudioLinux::wxCDAudioLinux(const wxString& dev_name) --- /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/include/wx/fl/frmview.h.old 2005-05-08 18:21:24.000000000 +0200 +++ /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/include/wx/fl/frmview.h 2005-05-08 18:21:44.000000000 +0200 @@ -114,7 +114,7 @@ // if file name is empty, views are are not saved/loaded - virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = "" ); + virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = wxEmptyString ); // synonyms wxFrame* GetParentFrame(); --- /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/gizmos/multicell.cpp.old 2005-05-08 18:29:36.000000000 +0200 +++ /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/gizmos/multicell.cpp 2005-05-08 18:36:00.000000000 +0200 @@ -633,17 +633,23 @@ m_minCellSize = wxSize(5, 5); } //--------------------------------------------------------------------------- -wxString itoa(int x) -{ - char bfr[255]; - sprintf(bfr, "%d", x); - return bfr; -} +//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) + ")"); + // thanks to unsigned data row and col are always >= 0 + // wxASSERT_MSG(row >= 0 && row < m_maxRows, wxString("Row ") + itoa(row) + " out of bounds (" + itoa(m_maxRows) + ")"); + 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("Column ") + itoa(col) + " out of bounds (" + itoa(m_maxCols) + ")"); + 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 +666,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, wxEmptyString)); } wxFlexGridSizer::Add(m_cells[CELL_LOC(row, col)]->m_window); } --- /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/plot/plot.cpp.old 2005-05-08 18:46:52.000000000 +0200 +++ /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/plot/plot.cpp 2005-05-08 18:50:35.000000000 +0200 @@ -204,7 +204,7 @@ END_EVENT_TABLE() wxPlotArea::wxPlotArea( wxPlotWindow *parent ) - : wxWindow( parent, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, "plotarea" ) + : wxWindow( parent, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, _T("plotarea") ) { m_owner = parent; @@ -462,7 +462,7 @@ END_EVENT_TABLE() wxPlotXAxisArea::wxPlotXAxisArea( wxPlotWindow *parent ) - : wxWindow( parent, -1, wxDefaultPosition, wxSize(-1,40), 0, "plotxaxisarea" ) + : wxWindow( parent, -1, wxDefaultPosition, wxSize(-1,40), 0, _T("plotxaxisarea") ) { m_owner = parent; @@ -589,7 +589,7 @@ END_EVENT_TABLE() wxPlotYAxisArea::wxPlotYAxisArea( wxPlotWindow *parent ) - : wxWindow( parent, -1, wxDefaultPosition, wxSize(60,-1), 0, "plotyaxisarea" ) + : wxWindow( parent, -1, wxDefaultPosition, wxSize(60,-1), 0, _T("plotyaxisarea") ) { m_owner = parent; @@ -713,7 +713,7 @@ END_EVENT_TABLE() wxPlotWindow::wxPlotWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag ) - : wxScrolledWindow( parent, id, pos, size, flag, "plotcanvas" ) + : wxScrolledWindow( parent, id, pos, size, flag, _T("plotcanvas") ) { m_xUnitsPerValue = 1.0; m_xZoom = 1.0; --- /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/mmedia/sndaiff.cpp.old 2005-05-08 18:40:37.000000000 +0200 +++ /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/mmedia/sndaiff.cpp 2005-05-08 18:40:51.000000000 +0200 @@ -55,7 +55,7 @@ wxString wxSoundAiff::GetCodecName() const { - return "wxSoundAiff codec"; + return wxT("wxSoundAiff codec"); } bool wxSoundAiff::CanRead() --- /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/mmedia/sndmsad.cpp.old 2005-05-08 20:10:47.000000000 +0200 +++ /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/mmedia/sndmsad.cpp 2005-05-08 20:38:56.000000000 +0200 @@ -368,7 +368,7 @@ adpcm->GetCoefs(m_coefs, ncoefs, coefs_len); if (!ncoefs) { - wxLogError(__FILE__ ":%d: Number of ADPCM coefficients" + wxLogError((const wxChar *)__FILE__ ":%d: Number of ADPCM coefficients" " must be non null", __LINE__); return FALSE; } --- /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/mmedia/vidbase.cpp.old 2005-05-08 20:40:14.000000000 +0200 +++ /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/mmedia/vidbase.cpp 2005-05-08 20:41:32.000000000 +0200 @@ -61,7 +61,7 @@ wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv) { - wxFrame *frame = new wxFrame(NULL, -1, "Video Output", wxDefaultPosition, wxSize(100, 100)); + wxFrame *frame = new wxFrame(NULL, -1, wxT("Video Output"), wxDefaultPosition, wxSize(100, 100)); wxWindow *vid_out = new wxWindow(frame, -1, wxPoint(0, 0), wxSize(300, 300)); frame->Layout(); --- /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/mmedia/vidxanm.cpp.old 2005-05-08 20:42:01.000000000 +0200 +++ /var/tmp/portage/wxGTK-2.4.2-r3/work/wxGTK-2.4.2/contrib/src/mmedia/vidxanm.cpp 2005-05-08 20:48:56.000000000 +0200 @@ -108,7 +108,7 @@ m_xanim_detector = new wxVideoXANIMProcess(this); m_xanim_started = FALSE; m_paused = FALSE; - m_filename = ""; + m_filename = wxT(""); m_remove_file = FALSE; } @@ -122,7 +122,7 @@ m_size[0] = 0; m_size[1] = 0; - m_filename = wxGetTempFileName("vidxa"); + m_filename = wxGetTempFileName(wxT("vidxa")); m_remove_file = TRUE; wxFileOutputStream fout(m_filename); @@ -381,7 +381,7 @@ line[infoStream->LastRead()] = 0; - totalOutput += line; + totalOutput += (wxChar*)line; } // This is good for everything ... :-) @@ -393,7 +393,7 @@ m_movieCodec = totalOutput(0, position); totalOutput.Remove(0, position); - tokenizer.SetString(totalOutput, "\n\r"); + tokenizer.SetString(totalOutput, wxT("\n\r")); // the rest of the line wxString token = tokenizer.GetNextToken(); @@ -468,8 +468,7 @@ GtkPizza *pizza = GTK_PIZZA( m_video_output->m_wxwindow ); GdkWindow *window = pizza->bin_window; - m_internal->xanim_window = - ((GdkWindowPrivate *)window)->xwindow; + m_internal->xanim_window = GDK_WINDOW_XWINDOW(window); #endif // Get the XANIM atom m_internal->xanim_atom = XInternAtom(m_internal->xanim_dpy,