Eliminated a couple of warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 0a5ec3f800557ae395d8a7416b14c4da8eda6e7c..257c6f9f223e22019f75bb26b1a5f462635d6bf0 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -379,7 +379,7 @@ void wxScrolledWindow::AdjustScrollbars()
         if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
         {
             m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
         if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
         {
             m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;

-            m_targetWindow->ScrollWindow( (m_xScrollPosition - m_hAdjust->value) * m_xScrollPixelsPerLine, 0 );
+            m_targetWindow->ScrollWindow( (int) (m_xScrollPosition - m_hAdjust->value) * m_xScrollPixelsPerLine, 0 );

             m_xScrollPosition = (int)m_hAdjust->value;
         }
     }
             m_xScrollPosition = (int)m_hAdjust->value;
         }
     }


@@ -397,7 +397,7 @@ void wxScrolledWindow::AdjustScrollbars()
         if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
         {
             m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
         if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
         {
             m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;

-            m_targetWindow->ScrollWindow( 0, (m_yScrollPosition - m_vAdjust->value) * m_yScrollPixelsPerLine );
+            m_targetWindow->ScrollWindow( 0, (int) (m_yScrollPosition - m_vAdjust->value) * m_yScrollPixelsPerLine );

             m_yScrollPosition = (int)m_vAdjust->value;
         }
     }
             m_yScrollPosition = (int)m_vAdjust->value;
         }
     }

diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp
index 0a5ec3f800557ae395d8a7416b14c4da8eda6e7c..257c6f9f223e22019f75bb26b1a5f462635d6bf0 100644 (file)
--- a/src/gtk1/scrolwin.cpp
+++ b/src/gtk1/scrolwin.cpp
@@ -379,7 +379,7 @@ void wxScrolledWindow::AdjustScrollbars()
         if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
         {
             m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
         if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
         {
             m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;

-            m_targetWindow->ScrollWindow( (m_xScrollPosition - m_hAdjust->value) * m_xScrollPixelsPerLine, 0 );
+            m_targetWindow->ScrollWindow( (int) (m_xScrollPosition - m_hAdjust->value) * m_xScrollPixelsPerLine, 0 );

             m_xScrollPosition = (int)m_hAdjust->value;
         }
     }
             m_xScrollPosition = (int)m_hAdjust->value;
         }
     }


@@ -397,7 +397,7 @@ void wxScrolledWindow::AdjustScrollbars()
         if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
         {
             m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
         if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
         {
             m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;

-            m_targetWindow->ScrollWindow( 0, (m_yScrollPosition - m_vAdjust->value) * m_yScrollPixelsPerLine );
+            m_targetWindow->ScrollWindow( 0, (int) (m_yScrollPosition - m_vAdjust->value) * m_yScrollPixelsPerLine );

             m_yScrollPosition = (int)m_vAdjust->value;
         }
     }
             m_yScrollPosition = (int)m_vAdjust->value;
         }
     }