Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scrolling pages works not under GTK2.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-02-20 22:27:50 +00:00
parent f45f5d2726
commit 47a3ff38a3
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/scrolwin.cpp
View File

@@ -1,11 +1,11 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/scrolwin.cpp
// Purpose: wxScrolledWindow implementation
// Author: Julian Smart
// Author: Robert Roebling
// Modified by: Ron Lee
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Copyright: (c) Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -83,7 +83,7 @@ static void gtk_scrolled_window_vscroll_callback( GtkAdjustment *adjust,
if (g_blockEventsOnDrag) return;
if (!win->m_hasVMT) return;
win->GtkVScroll( adjust->value,
GET_SCROLL_TYPE(GTK_SCROLLED_WINDOW(win->m_widget)->vscrollbar) );
}
@@ -378,12 +378,14 @@ void wxScrolledWindow::AdjustScrollbars()
if (m_xScrollPixelsPerLine == 0)
{
m_hAdjust->upper = 1.0;
m_hAdjust->page_increment = 1.0;
m_hAdjust->page_size = 1.0;
}
else
{
m_hAdjust->upper = vw / m_xScrollPixelsPerLine;
m_hAdjust->page_size = (w / m_xScrollPixelsPerLine);
m_hAdjust->page_increment = (w / m_xScrollPixelsPerLine);
m_hAdjust->page_size = m_hAdjust->page_increment;
// If the scrollbar hits the right side, move the window
// right to keep it from over extending.
@@ -404,12 +406,14 @@ void wxScrolledWindow::AdjustScrollbars()
if (m_yScrollPixelsPerLine == 0)
{
m_vAdjust->upper = 1.0;
m_vAdjust->page_increment = 1.0;
m_vAdjust->page_size = 1.0;
}
else
{
m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
m_vAdjust->page_size = (h / m_yScrollPixelsPerLine);
m_vAdjust->page_increment = (h / m_yScrollPixelsPerLine);
m_vAdjust->page_size = m_vAdjust->page_increment;
if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper))
{
@@ -424,8 +428,8 @@ void wxScrolledWindow::AdjustScrollbars()
}
}
m_xScrollLinesPerPage = (int)(m_hAdjust->page_size + 0.5);
m_yScrollLinesPerPage = (int)(m_vAdjust->page_size + 0.5);
m_xScrollLinesPerPage = (int)(m_hAdjust->page_increment + 0.5);
m_yScrollLinesPerPage = (int)(m_vAdjust->page_increment + 0.5);
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );

18
src/gtk1/scrolwin.cpp
View File

@@ -1,11 +1,11 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/scrolwin.cpp
// Purpose: wxScrolledWindow implementation
// Author: Julian Smart
// Author: Robert Roebling
// Modified by: Ron Lee
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Copyright: (c) Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -83,7 +83,7 @@ static void gtk_scrolled_window_vscroll_callback( GtkAdjustment *adjust,
if (g_blockEventsOnDrag) return;
if (!win->m_hasVMT) return;
win->GtkVScroll( adjust->value,
GET_SCROLL_TYPE(GTK_SCROLLED_WINDOW(win->m_widget)->vscrollbar) );
}
@@ -378,12 +378,14 @@ void wxScrolledWindow::AdjustScrollbars()
if (m_xScrollPixelsPerLine == 0)
{
m_hAdjust->upper = 1.0;
m_hAdjust->page_increment = 1.0;
m_hAdjust->page_size = 1.0;
}
else
{
m_hAdjust->upper = vw / m_xScrollPixelsPerLine;
m_hAdjust->page_size = (w / m_xScrollPixelsPerLine);
m_hAdjust->page_increment = (w / m_xScrollPixelsPerLine);
m_hAdjust->page_size = m_hAdjust->page_increment;
// If the scrollbar hits the right side, move the window
// right to keep it from over extending.
@@ -404,12 +406,14 @@ void wxScrolledWindow::AdjustScrollbars()
if (m_yScrollPixelsPerLine == 0)
{
m_vAdjust->upper = 1.0;
m_vAdjust->page_increment = 1.0;
m_vAdjust->page_size = 1.0;
}
else
{
m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
m_vAdjust->page_size = (h / m_yScrollPixelsPerLine);
m_vAdjust->page_increment = (h / m_yScrollPixelsPerLine);
m_vAdjust->page_size = m_vAdjust->page_increment;
if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper))
{
@@ -424,8 +428,8 @@ void wxScrolledWindow::AdjustScrollbars()
}
}
m_xScrollLinesPerPage = (int)(m_hAdjust->page_size + 0.5);
m_yScrollLinesPerPage = (int)(m_vAdjust->page_size + 0.5);
m_xScrollLinesPerPage = (int)(m_hAdjust->page_increment + 0.5);
m_yScrollLinesPerPage = (int)(m_vAdjust->page_increment + 0.5);
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );