Regenerated makefiles

[wxWidgets.git] / src / gtk / scrolwin.cpp

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 4d82bb3209d4ed1b486b1732e71eca2713f252a4..ba87c7596c6cadf590fd8fddb51ed6d97e827a26 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -28,10 +28,9 @@
     #pragma hdrstop
 #endif
 
+#include "wx/scrolwin.h"
 #include "wx/utils.h"
 #include "wx/dcclient.h"
-
-#include "wx/scrolwin.h"
 #include "wx/panel.h"
 #include "wx/sizer.h"
 
@@ -326,10 +325,8 @@ void wxScrolledWindow::DoSetVirtualSize( int x, int y )
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();
 
-#if wxUSE_CONSTRAINTS
     if (GetAutoLayout())
         Layout();
-#endif
 }
 
 /*
@@ -384,7 +381,7 @@ void wxScrolledWindow::AdjustScrollbars()
     else
     {
         m_hAdjust->upper = vw / m_xScrollPixelsPerLine;
-        m_hAdjust->page_increment = (w / m_xScrollPixelsPerLine);
+        m_hAdjust->page_increment = w / m_xScrollPixelsPerLine;
         m_hAdjust->page_size = m_hAdjust->page_increment;
 
         // If the scrollbar hits the right side, move the window
@@ -412,7 +409,7 @@ void wxScrolledWindow::AdjustScrollbars()
     else
     {
         m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
-        m_vAdjust->page_increment = (h / m_yScrollPixelsPerLine);
+        m_vAdjust->page_increment = h / m_yScrollPixelsPerLine;
         m_vAdjust->page_size = m_vAdjust->page_increment;
 
         if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper))