fixed VC++ warning

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

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 257c6f9f223e22019f75bb26b1a5f462635d6bf0..a18ec663f74b831519f6a812720582802fdce575 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -313,7 +313,7 @@ bool wxScrolledWindow::Create(wxWindow *parent,
     PostCreation();
 
     Show( TRUE );
     PostCreation();
 
     Show( TRUE );

-
+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -325,6 +325,11 @@ void wxScrolledWindow::DoSetVirtualSize( int x, int y )
 {
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();
 {
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();

+
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout())
+        Layout();
+#endif

 }
 
 /*
 }
 
 /*


@@ -344,8 +349,12 @@ void wxScrolledWindow::SetScrollbars( int pixelsPerUnitX, int pixelsPerUnitY,
     m_hAdjust->value = m_xScrollPosition = xPos;
     m_vAdjust->value = m_yScrollPosition = yPos;
 
     m_hAdjust->value = m_xScrollPosition = xPos;
     m_vAdjust->value = m_yScrollPosition = yPos;
 

+    // Setting hints here should arguably be deprecated, but without it
+    // a sizer might override this manual scrollbar setting in old code.

     m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
 
     m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
 

+    m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
+

     if (!noRefresh)
     {
         int new_x = m_xScrollPixelsPerLine * m_xScrollPosition;
     if (!noRefresh)
     {
         int new_x = m_xScrollPixelsPerLine * m_xScrollPosition;


@@ -376,11 +385,16 @@ void wxScrolledWindow::AdjustScrollbars()
         // If the scrollbar hits the right side, move the window
         // right to keep it from over extending.
 
         // If the scrollbar hits the right side, move the window
         // right to keep it from over extending.
 

-        if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
+        if ((m_hAdjust->value != 0.0) && (m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper))

         {
             m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
         {
             m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;

-            m_targetWindow->ScrollWindow( (int) (m_xScrollPosition - m_hAdjust->value) * m_xScrollPixelsPerLine, 0 );
-            m_xScrollPosition = (int)m_hAdjust->value;
+            if (m_hAdjust->value < 0.0)
+                m_hAdjust->value = 0.0;
+                
+            if (GetChildren().GetCount() == 0)
+                m_xScrollPosition = (int)m_hAdjust->value; // This is enough without child windows
+            else
+                gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); // Actually scroll window

         }
     }
 
         }
     }
 


@@ -394,11 +408,16 @@ void wxScrolledWindow::AdjustScrollbars()
         m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
         m_vAdjust->page_size = (h / m_yScrollPixelsPerLine);
 
         m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
         m_vAdjust->page_size = (h / m_yScrollPixelsPerLine);
 

-        if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
+        if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper))

         {
             m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
         {
             m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;

-            m_targetWindow->ScrollWindow( 0, (int) (m_yScrollPosition - m_vAdjust->value) * m_yScrollPixelsPerLine );
-            m_yScrollPosition = (int)m_vAdjust->value;
+            if (m_vAdjust->value < 0.0)
+                m_vAdjust->value = 0.0;
+                
+            if (GetChildren().GetCount() == 0)
+                m_yScrollPosition = (int)m_vAdjust->value;  
+            else
+                gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );

         }
     }
 
         }
     }
 


@@ -814,15 +833,17 @@ bool wxScrolledWindow::Layout()
 // Default OnSize resets scrollbars, if any
 void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
 {
 // Default OnSize resets scrollbars, if any
 void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
 {

-    if( m_targetWindow != this )
-        m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
-
-    SetVirtualSize( GetClientSize() );
+    if( GetAutoLayout() )
+    {
+        if( m_targetWindow != this )
+            m_targetWindow->FitInside();

 
 

-#if wxUSE_CONSTRAINTS
-    if (GetAutoLayout())
-        Layout();
-#endif
+        FitInside();
+    }
+    else
+    {
+        AdjustScrollbars();
+    }

 }
 
 // This calls OnDraw, having adjusted the origin according to the current
 }
 
 // This calls OnDraw, having adjusted the origin according to the current


@@ -845,7 +866,7 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
         szx, szy,       // view size (total)
         clix, cliy;     // view size (on screen)
 
         szx, szy,       // view size (total)
         clix, cliy;     // view size (on screen)
 

-    ViewStart(&stx, &sty);
+    GetViewStart(&stx, &sty);

     GetClientSize(&clix, &cliy);
     GetVirtualSize(&szx, &szy);
 
     GetClientSize(&clix, &cliy);
     GetVirtualSize(&szx, &szy);