Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 605592 ] Unicode patch for dirctrlg.cpp

Browse Source 
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
This commit is contained in:
Julian Smart
2002-09-06 14:42:47 +00:00
parent 9832266054
commit 8dd8f87530
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/grid.cpp
View File

@@ -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;