Warning fixes for VC5 (Igor Korot)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -868,7 +868,7 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
|
||||
if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
|
||||
((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
|
||||
|
||||
int w, h;
|
||||
int w = 0, h = 0;
|
||||
GetTargetSize(&w, &h);
|
||||
|
||||
if ((x_pos != -1) && (m_xScrollPixelsPerLine))
|
||||
@@ -957,7 +957,7 @@ bool wxScrollHelper::ScrollLayout()
|
||||
// If we're the scroll target, take into account the
|
||||
// virtual size and scrolled position of the window.
|
||||
|
||||
int x, y, w, h;
|
||||
int x = 0, y = 0, w = 0, h = 0;
|
||||
CalcScrolledPosition(0,0, &x,&y);
|
||||
m_win->GetVirtualSize(&w, &h);
|
||||
m_win->GetSizer()->SetDimension(x, y, w, h);
|
||||
@@ -1048,9 +1048,9 @@ void wxScrollHelper::HandleOnPaint(wxPaintEvent& WXUNUSED(event))
|
||||
// this they always have the priority
|
||||
void wxScrollHelper::HandleOnChar(wxKeyEvent& event)
|
||||
{
|
||||
int stx, sty, // view origin
|
||||
szx, szy, // view size (total)
|
||||
clix, cliy; // view size (on screen)
|
||||
int stx = 0, sty = 0, // view origin
|
||||
szx = 0, szy = 0, // view size (total)
|
||||
clix = 0, cliy = 0; // view size (on screen)
|
||||
|
||||
GetViewStart(&stx, &sty);
|
||||
GetTargetSize(&clix, &cliy);
|
||||
|
Reference in New Issue
Block a user