fixed loop deleting the old filters in SetWildcard() after last commit

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

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 638e29194acb190804f429a71824402ab9215683..afd8aa4951273ea35f36d1d648620850e423add9 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -28,10 +28,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/scrolwin.h"

 #include "wx/utils.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"
 #include "wx/dcclient.h"

-
-#include "wx/scrolwin.h"

 #include "wx/panel.h"
 #include "wx/sizer.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();
 
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();
 

-#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
         Layout();
     if (GetAutoLayout())
         Layout();

-#endif

 }
 
 /*
 }
 
 /*


@@ -354,7 +351,7 @@ void wxScrolledWindow::SetScrollbars( int pixelsPerUnitX, int pixelsPerUnitY,
 
     // Setting hints here should arguably be deprecated, but without it
     // a sizer might override this manual scrollbar setting in old code.
 
     // 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 );
 
 
     m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
 


@@ -374,7 +371,7 @@ void wxScrolledWindow::AdjustScrollbars()
 
     m_targetWindow->GetClientSize( &w, &h );
     m_targetWindow->GetVirtualSize( &vw, &vh );
 
     m_targetWindow->GetClientSize( &w, &h );
     m_targetWindow->GetVirtualSize( &vw, &vh );

-
+    

     if (m_xScrollPixelsPerLine == 0)
     {
         m_hAdjust->upper = 1.0;
     if (m_xScrollPixelsPerLine == 0)
     {
         m_hAdjust->upper = 1.0;


@@ -383,10 +380,16 @@ void wxScrolledWindow::AdjustScrollbars()
     }
     else
     {
     }
     else
     {

-        m_hAdjust->upper = vw / m_xScrollPixelsPerLine;
-        m_hAdjust->page_increment = (w / m_xScrollPixelsPerLine);
-        m_hAdjust->page_size = m_hAdjust->page_increment;
+        m_hAdjust->upper = (vw+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine;
+        m_hAdjust->page_size = w / m_xScrollPixelsPerLine;
+        m_hAdjust->page_increment = w / m_xScrollPixelsPerLine;

 
 

+        // Special case. When client and virtual size are very close but
+        // the client is big enough, kill scrollbar.
+        
+        if ((m_hAdjust->page_size < m_hAdjust->upper) && (w >= vw)) 
+            m_hAdjust->page_size += 1.0;
+        

         // 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.
 


@@ -411,9 +414,12 @@ void wxScrolledWindow::AdjustScrollbars()
     }
     else
     {
     }
     else
     {

-        m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
-        m_vAdjust->page_increment = (h / m_yScrollPixelsPerLine);
-        m_vAdjust->page_size = m_vAdjust->page_increment;
+        m_vAdjust->upper = (vh+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine;
+        m_vAdjust->page_size = h / m_yScrollPixelsPerLine;
+        m_vAdjust->page_increment = h / m_yScrollPixelsPerLine;
+        
+        if ((m_vAdjust->page_size < m_vAdjust->upper) && (h >= vh)) 
+            m_vAdjust->page_size += 1.0;

 
         if ((m_vAdjust->value != 0.0) && (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))
         {


@@ -453,7 +459,7 @@ wxWindow *wxScrolledWindow::GetTargetWindow() const
 
 // Override this function if you don't want to have wxScrolledWindow
 // automatically change the origin according to the scroll position.
 
 // Override this function if you don't want to have wxScrolledWindow
 // automatically change the origin according to the scroll position.

-void wxScrolledWindow::PrepareDC(wxDC& dc)
+void wxScrolledWindow::DoPrepareDC(wxDC& dc)

 {
     dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine,
                         -m_yScrollPosition * m_yScrollPixelsPerLine );
 {
     dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine,
                         -m_yScrollPosition * m_yScrollPixelsPerLine );