From 8dd8f87530ad8268f6fefe4f4f09cad5503f6b6e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 6 Sep 2002 14:42:47 +0000 Subject: [PATCH] Applied patch [ 605592 ] Unicode patch for dirctrlg.cpp Markus Greither just compiled the wxWindows CVS trunk using BCC5.5.1 and UNICODE. I noticed a small bug in girctrlg.cpp, that prevented compilation. There are more such glitches in the wxGrid, but as I was running out of time, I disabled this for now. Otherwise, compilation worked fine and I was able to run the minimal sample (using UNICOWS on my WIN98SE). (I also corrected some wxGrid Unicode string typos -- JACS) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/dirctrlg.cpp | 2 +- src/generic/grid.cpp | 10 +++++----- src/generic/gridctrl.cpp | 4 ++-- src/generic/gridg.cpp | 22 +++++++++++----------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 0572945ee1..c7ed4450aa 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -1001,7 +1001,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path) { wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); - if (data && data->m_path != "" && !data->m_isDir) + if (data && data->m_path != wxT("") && !data->m_isDir) { m_treeCtrl->SelectItem(childId); m_treeCtrl->EnsureVisible(childId); diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 298b57b5a2..9c4fea03b6 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -722,7 +722,7 @@ void wxGridCellTextEditor::HandleReturn( wxKeyEvent& // wxMotif needs a little extra help... size_t pos = (size_t)( Text()->GetInsertionPoint() ); wxString s( Text()->GetValue() ); - s = s.Left(pos) + "\n" + s.Mid(pos); + s = s.Left(pos) + wxT("\n") + s.Mid(pos); Text()->SetValue(s); Text()->SetInsertionPoint( pos ); #else @@ -1125,7 +1125,7 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event) default: // additionally accept 'e' as in '1e+6' if ( (keycode < 128) && - (isdigit(keycode) || tolower(keycode) == 'e') ) + (isdigit(keycode) || tolower(keycode) == wxT('e')) ) return TRUE; } } @@ -1217,7 +1217,7 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid) else { wxString cellval( grid->GetTable()->GetValue(row, col) ); - m_startValue = !( !cellval || (cellval == "0") ); + m_startValue = !( !cellval || (cellval == wxT("0")) ); } CBox()->SetValue(m_startValue); CBox()->SetFocus(); @@ -1863,7 +1863,7 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, else { wxString cellval( grid.GetTable()->GetValue(row, col) ); - value = !( !cellval || (cellval == "0") ); + value = !( !cellval || (cellval == wxT("0")) ); } if ( value ) @@ -3491,7 +3491,7 @@ wxGridWindow::wxGridWindow( wxGrid *parent, wxGridRowLabelWindow *rowLblWin, wxGridColLabelWindow *colLblWin, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size, wxWANTS_CHARS, "grid window" ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS, wxT("grid window") ) { m_owner = parent; m_rowLabelWin = rowLblWin; diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp index a0c35be0fc..9d502277e6 100644 --- a/src/generic/gridctrl.cpp +++ b/src/generic/gridctrl.cpp @@ -340,7 +340,7 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid, dc.SetFont(attr.GetFont()); wxStringTokenizer tk(data , _T(" \n\t\r")); - wxString thisline(""); + wxString thisline(wxT("")); while ( tk.HasMoreTokens() ) { @@ -381,7 +381,7 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid, wxRect rect(0,0,width,10); // M is a nice large character 'y' gives descender!. - dc.GetTextExtent("My", &x, &y); + dc.GetTextExtent(wxT("My"), &x, &y); do { diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp index 9611d4f61f..a4d53fc435 100644 --- a/src/generic/gridg.cpp +++ b/src/generic/gridg.cpp @@ -216,7 +216,7 @@ bool wxGenericGrid::Create(wxWindow *parent, m_dragRowOrCol = 0; m_dragStartPosition = 0; m_dragLastPosition = 0; - m_divisionPen = * wxThePenList->FindOrCreatePen("LIGHT GREY", 1, wxSOLID); + m_divisionPen = * wxThePenList->FindOrCreatePen(wxT("LIGHT GREY"), 1, wxSOLID); m_highlightPen = * wxBLACK_PEN; m_doubleBufferingBitmap = (wxBitmap *) NULL; @@ -267,7 +267,7 @@ bool wxGenericGrid::Create(wxWindow *parent, m_editingPanel = new wxPanel(this); - m_textItem = new wxTextCtrl(m_editingPanel, wxGRID_TEXT_CTRL, "", + m_textItem = new wxTextCtrl(m_editingPanel, wxGRID_TEXT_CTRL, wxT(""), wxPoint(m_editControlPosition.x, m_editControlPosition.y), wxSize(m_editControlPosition.width, -1), wxTE_PROCESS_ENTER); @@ -287,7 +287,7 @@ bool wxGenericGrid::Create(wxWindow *parent, // SetSize(pos.x, pos.y, size.x, size.y); - m_inPlaceTextItem = new wxTextCtrl( (wxPanel*)this, wxGRID_EDIT_IN_PLACE_TEXT_CTRL, "", + m_inPlaceTextItem = new wxTextCtrl( (wxPanel*)this, wxGRID_EDIT_IN_PLACE_TEXT_CTRL, wxT(""), wxPoint( m_currentRect.x-wxIPE_ADJUST, m_currentRect.y-wxIPE_ADJUST ), wxSize( m_currentRect.width+wxIPE_ADJUST*2, m_currentRect.height+wxIPE_ADJUST*2 ), wxNO_BORDER | wxTE_PROCESS_ENTER ); @@ -1477,7 +1477,7 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col) if (cell) { if ( cell->GetTextValue().IsNull() ) - m_textItem->SetValue(""); + m_textItem->SetValue(wxT("")); else m_textItem->SetValue(cell->GetTextValue()); } @@ -1518,7 +1518,7 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col) m_inPlaceTextItem->SetForegroundColour(cell->GetTextColour()); if ( cell->GetTextValue().IsNull() ) { - m_inPlaceTextItem->SetValue( "" ); + m_inPlaceTextItem->SetValue( wxT("") ); } else { m_inPlaceTextItem->SetValue( cell->GetTextValue() ); @@ -1572,7 +1572,7 @@ void wxGenericGrid::OnChangeLabels() int i; for (i = 0; i < m_totalRows; i++) { - sprintf(buf, "%d", i+1); + sprintf(buf, wxT("%d"), i+1); SetLabelValue(wxVERTICAL, buf, i); } // A...Z,AA...ZZ,AAA...ZZZ, etc. @@ -1585,7 +1585,7 @@ void wxGenericGrid::OnChangeLabels() for (j = 0; j < noTimes; j++) { char buf2[20]; - sprintf(buf2, "%c", (char)ch); + sprintf(buf2, wxT("%c"), (char)ch); strcat(buf, buf2); } SetLabelValue(wxHORIZONTAL, buf, i); @@ -1666,7 +1666,7 @@ void wxGenericGrid::DrawCellText() rect.height -= 4; // FIXME: what's this string of spaces supposed to represent? - DrawTextRect(& dc, " ", &rect, wxLEFT); + DrawTextRect(& dc, wxT(" "), &rect, wxLEFT); DrawTextRect(& dc, editValue, &rect, cell->GetAlignment()); dc.DestroyClippingRegion(); @@ -1962,7 +1962,7 @@ void wxGenericGrid::RefreshCell(int row, int col, bool setText) wxString& wxGenericGrid::GetCellValue(int row, int col) const { - static wxString emptyString(""); + static wxString emptyString(wxT("")); wxGridCell *cell = GetCell(row, col); if (cell) @@ -2044,7 +2044,7 @@ void wxGenericGrid::SetLabelValue(int orientation, const wxString& val, int pos) wxString& wxGenericGrid::GetLabelValue(int orientation, int pos) const { - static wxString emptyString = ""; + static wxString emptyString = wxT(""); wxGridCell *cell = GetLabelCell(orientation, pos); if (cell) return cell->GetTextValue(); @@ -2161,7 +2161,7 @@ void wxGenericGrid::SetEditInPlace(bool edit) m_inPlaceTextItem->SetForegroundColour(cell->GetTextColour()); if ( cell->GetTextValue().IsNull() ) { - m_inPlaceTextItem->SetValue( "" ); + m_inPlaceTextItem->SetValue( wxT("") ); } else { m_inPlaceTextItem->SetValue( cell->GetTextValue() ); -- 2.47.2