Font work.

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

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 8c40ecb8534b809a13c995cbb50188f6f91a62a3..f516a8552dcb6536b470c19d139aef5987bb8554 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -82,6 +82,8 @@ private:
     wxScrollHelper *m_scrollHelper;
 
     bool m_hasDrawnWindow;
     wxScrollHelper *m_scrollHelper;
 
     bool m_hasDrawnWindow;

+
+    DECLARE_NO_COPY_CLASS(wxScrollHelperEvtHandler)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -104,6 +106,8 @@ private:
     wxEventType m_eventType;
     int m_pos,
         m_orient;
     wxEventType m_eventType;
     int m_pos,
         m_orient;

+
+    DECLARE_NO_COPY_CLASS(wxAutoScrollTimer)

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -344,11 +348,19 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
     // here not just the size.  It makes SetScrollbars 'sticky'
     // emulating the old non-autoscroll behaviour.
 
     // here not just the size.  It makes SetScrollbars 'sticky'
     // emulating the old non-autoscroll behaviour.
 

-    m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
+    wxSize sz = m_targetWindow->GetClientSize();
+#if 1
+    int x = wxMax(noUnitsX * pixelsPerUnitX, sz.x);
+    int y = wxMax(noUnitsY * pixelsPerUnitY, sz.y);
+#else
+    int x = noUnitsX * pixelsPerUnitX;
+    int y = noUnitsY * pixelsPerUnitY;
+#endif    
+    m_targetWindow->SetVirtualSizeHints( x, y );

 
     // The above should arguably be deprecated, this however we still need.
 
 
     // The above should arguably be deprecated, this however we still need.
 

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

 
     if (do_refresh && !noRefresh)
         m_targetWindow->Refresh(TRUE, GetRect());
 
     if (do_refresh && !noRefresh)
         m_targetWindow->Refresh(TRUE, GetRect());


@@ -944,7 +956,7 @@ void wxScrollHelper::HandleOnChar(wxKeyEvent& event)
         yScrollOld = m_yScrollPosition;
 
     int dsty;
         yScrollOld = m_yScrollPosition;
 
     int dsty;

-    switch ( event.KeyCode() )
+    switch ( event.GetKeyCode() )

     {
         case WXK_PAGEUP:
         case WXK_PRIOR:
     {
         case WXK_PAGEUP:
         case WXK_PRIOR: