Rebake all project files to reflect MSVC deprecation warnings defines.

[wxWidgets.git] / src / generic / splitter.cpp

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index f4a4107e30a5beed6fa3a76d05691a3df278c182..dee38940afa59a628e0a1f3a121fc6f23b55e712 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -451,20 +451,23 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
         // Don't do anything if the size didn't really change.
         if ( size != old_size )
         {
         // Don't do anything if the size didn't really change.
         if ( size != old_size )
         {

+            int newPosition = -1;
+

             // Apply gravity if we use it.
             int delta = (int) ( (size - old_size)*m_sashGravity );
             if ( delta != 0 )
             {
             // Apply gravity if we use it.
             int delta = (int) ( (size - old_size)*m_sashGravity );
             if ( delta != 0 )
             {

-                int newPosition = m_sashPosition + delta;
+                newPosition = m_sashPosition + delta;

                 if( newPosition < m_minimumPaneSize )
                     newPosition = m_minimumPaneSize;
                 if( newPosition < m_minimumPaneSize )
                     newPosition = m_minimumPaneSize;

-                SetSashPositionAndNotify(newPosition);

             }
 
             // Also check if the second window became too small.
             }
 
             // Also check if the second window became too small.

-            int adjustedPosition = AdjustSashPosition(m_sashPosition);
-            if ( adjustedPosition != m_sashPosition )
-                SetSashPositionAndNotify(adjustedPosition);
+            newPosition = AdjustSashPosition(newPosition == -1
+                                                 ? m_sashPosition
+                                                 : newPosition);
+            if ( newPosition != m_sashPosition )
+                SetSashPositionAndNotify(newPosition);

         }
     }
 
         }
     }