always skip OnSize

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

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index f36296fe9409fb002bc45073ffda54f3cd013abf..dcdc24f8afdabad908652e38a655567f0ec00ae5 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -10,14 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -26,11 +18,8 @@
 #endif
 
 #include "wx/scrolwin.h"
-#include "wx/gtk/private.h"
 
-// ============================================================================
-// implementation
-// ============================================================================
+#include <gtk/gtk.h>
 
 // ----------------------------------------------------------------------------
 // wxScrollHelper implementation
@@ -41,47 +30,12 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
                                    int xPos, int yPos,
                                    bool noRefresh)
 {
-    int old_x = m_xScrollPosition * m_xScrollPixelsPerLine;
-    int old_y = m_yScrollPosition * m_yScrollPixelsPerLine;
-
-    m_xScrollPixelsPerLine = pixelsPerUnitX;
-    m_yScrollPixelsPerLine = pixelsPerUnitY;
-
-    m_win->m_scrollBar[wxWindow::ScrollDir_Horz]->adjustment->value =
-    m_xScrollPosition = xPos;
-    m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value =
-    m_yScrollPosition = yPos;
-
-    // To get everything right, have to call ScrollWindow()
-    // both before and after calling SetVirtualSize()
-    int new_x = m_xScrollPosition * m_xScrollPixelsPerLine;
-    int new_y = m_yScrollPosition * m_yScrollPixelsPerLine;
-    if (!noRefresh)
-    {
-        m_targetWindow->ScrollWindow(old_x - new_x, old_y - new_y);
-        old_x = new_x;
-        old_y = new_y;
-    }
-
-    int w = noUnitsX * pixelsPerUnitX;
-    int h = noUnitsY * pixelsPerUnitY;
-    m_targetWindow->SetVirtualSize( w ? w : wxDefaultCoord,
-                                    h ? h : wxDefaultCoord);
-
-    if (!noRefresh)
-    {
-        new_x = m_xScrollPosition * m_xScrollPixelsPerLine;
-        new_y = m_yScrollPosition * m_yScrollPixelsPerLine;
-        m_targetWindow->ScrollWindow(old_x - new_x, old_y - new_y);
-    }
-
-    // If the target is not the same as the window with the scrollbars,
-    // then we need to update the scrollbars here, since they won't have
-    // been updated by SetVirtualSize().
-    if (m_targetWindow != m_win)
-    {
-        AdjustScrollbars();
-    }
+    m_win->m_scrollPos[wxWindow::ScrollDir_Horz] =
+    m_win->m_scrollBar[wxWindow::ScrollDir_Horz]->adjustment->value = xPos;
+    m_win->m_scrollPos[wxWindow::ScrollDir_Vert] =
+    m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value = yPos;
+    base_type::SetScrollbars(
+        pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh);
 }
 
 void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,
@@ -92,6 +46,9 @@ void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,
                                        int *lines,
                                        int *linesPerPage)
 {
+    if (!range)
+        return;
+
     int upper;
     int page_size;
     if (pixelsPerLine > 0 && winSize > 0 && winSize < virtSize)
@@ -113,7 +70,7 @@ void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,
 
     GtkAdjustment* adj = range->adjustment;
     adj->step_increment = 1;
-    adj->page_increment = 
+    adj->page_increment =
     adj->page_size = page_size;
     gtk_range_set_range(range, 0, upper);
 
@@ -186,7 +143,7 @@ void wxScrollHelper::DoScrollOneDir(int orient,
 
 void wxScrollHelper::DoScroll( int x_pos, int y_pos )
 {
-    wxCHECK_RET( m_targetWindow != 0, _T("No target window") );
+    wxCHECK_RET( m_targetWindow != 0, wxT("No target window") );
 
     DoScrollOneDir(wxHORIZONTAL, x_pos, m_xScrollPixelsPerLine, &m_xScrollPosition);
     DoScrollOneDir(wxVERTICAL, y_pos, m_yScrollPixelsPerLine, &m_yScrollPosition);
@@ -212,6 +169,10 @@ GtkPolicyType GtkPolicyFromWX(wxScrollbarVisibility visibility)
             policy = GTK_POLICY_AUTOMATIC;
             break;
 
+        default:
+            wxFAIL_MSG( wxS("unknown scrollbar visibility") );
+            // fall through
+
         case wxSHOW_SB_ALWAYS:
             policy = GTK_POLICY_ALWAYS;
             break;
@@ -232,4 +193,3 @@ void wxScrollHelper::DoShowScrollbars(wxScrollbarVisibility horz,
                                    GtkPolicyFromWX(horz),
                                    GtkPolicyFromWX(vert));
 }
-