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

Fixed remaining int vs. long warnings.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2000-03-11 13:27:39 +00:00
parent f3d05fe417
commit 4a64bee465
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/generic/grid.cpp
View File

@@ -587,7 +587,7 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() ) if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() )
{ {
// insert the key in the control // insert the key in the control
long keycode = event.KeyCode(); int keycode = (int)event.KeyCode();
if ( isprint(keycode) ) if ( isprint(keycode) )
{ {
// FIXME this is not going to work for non letters... // FIXME this is not going to work for non letters...
@@ -610,7 +610,7 @@ void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
{ {
#if defined(__WXMOTIF__) || defined(__WXGTK__) #if defined(__WXMOTIF__) || defined(__WXGTK__)
// wxMotif needs a little extra help... // wxMotif needs a little extra help...
int pos = Text()->GetInsertionPoint(); long pos = Text()->GetInsertionPoint();
wxString s( Text()->GetValue() ); wxString s( Text()->GetValue() );
s = s.Left(pos) + "\n" + s.Mid(pos); s = s.Left(pos) + "\n" + s.Mid(pos);
Text()->SetValue(s); Text()->SetValue(s);
@@ -699,7 +699,7 @@ void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid)
if ( HasRange() ) if ( HasRange() )
{ {
Spin()->SetValue(m_valueOld); Spin()->SetValue((int)m_valueOld);
} }
else else
{ {
@@ -738,7 +738,7 @@ void wxGridCellNumberEditor::Reset()
{ {
if ( HasRange() ) if ( HasRange() )
{ {
Spin()->SetValue(m_valueOld); Spin()->SetValue((int)m_valueOld);
} }
else else
{ {
@@ -750,7 +750,7 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
{ {
if ( !HasRange() ) if ( !HasRange() )
{ {
long keycode = event.KeyCode(); int keycode = (int) event.KeyCode();
if ( isdigit(keycode) || keycode == '+' || keycode == '-' ) if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
{ {
wxGridCellTextEditor::StartingKey(event); wxGridCellTextEditor::StartingKey(event);
@@ -854,7 +854,7 @@ void wxGridCellFloatEditor::Reset()
void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event) void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
{ {
long keycode = event.KeyCode(); int keycode = (int)event.KeyCode();
if ( isdigit(keycode) || if ( isdigit(keycode) ||
keycode == '+' || keycode == '-' || keycode == '.' ) keycode == '+' || keycode == '-' || keycode == '.' )
{ {
@@ -5211,7 +5211,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
if ( !(event.AltDown() || if ( !(event.AltDown() ||
event.MetaDown() || event.MetaDown() ||
event.ControlDown()) && event.ControlDown()) &&
((isalnum(event.KeyCode()) && ((isalnum((int)event.KeyCode()) &&
(event.KeyCode() < 256 && event.KeyCode() >= 0)) || (event.KeyCode() < 256 && event.KeyCode() >= 0)) ||
event.KeyCode() == WXK_F2) && event.KeyCode() == WXK_F2) &&
!IsCellEditControlEnabled() && !IsCellEditControlEnabled() &&
@@ -5745,7 +5745,7 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
for ( size_t i = 0; i < lines.GetCount(); i++ ) for ( size_t i = 0; i < lines.GetCount(); i++ )
{ {
dc.DrawText( lines[i], (long)x, (long)y ); dc.DrawText( lines[i], (int)x, (int)y );
y += lineHeight; y += lineHeight;
} }
} }