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

minimize code duplication

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-09-13 16:31:36 +00:00
parent 4c0f681c9a
commit f6814d017b
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gtk/scrolwin.cpp
View File

@@ -88,36 +88,29 @@ void wxScrollHelperNative::DoAdjustScrollbar(GtkRange* range,
int *lines, int *lines,
int *linesPerPage) int *linesPerPage)
{ {
int upper;
int page_size;
if (pixelsPerLine > 0 && winSize > 0 && winSize < virtSize) if (pixelsPerLine > 0 && winSize > 0 && winSize < virtSize)
{ {
int upper = (virtSize + pixelsPerLine - 1) / pixelsPerLine; upper = (virtSize + pixelsPerLine - 1) / pixelsPerLine;
int page_size = winSize / pixelsPerLine; page_size = winSize / pixelsPerLine;
*lines = upper; *lines = upper;
*linesPerPage = page_size; *linesPerPage = page_size;
GtkAdjustment* adj = range->adjustment;
adj->step_increment = 1;
adj->page_increment =
adj->page_size = page_size;
gtk_range_set_range(range, 0, upper);
} }
else else
{ {
// GtkRange won't allow upper == lower, so for disabled state use [0,1] // GtkRange won't allow upper == lower, so for disabled state use [0,1]
// with a page size of 1. This will also clamp position to 0. // with a page size of 1. This will also clamp position to 0.
int upper = 1; upper = 1;
int page_size = 1; page_size = 1;
*lines = 0; *lines = 0;
*linesPerPage = 0; *linesPerPage = 0;
GtkAdjustment* adj = range->adjustment;
adj->step_increment = 1;
adj->page_increment =
adj->page_size = page_size;
gtk_range_set_range(range, 0, upper);
} }
GtkAdjustment* adj = range->adjustment;
adj->step_increment = 1;
adj->page_increment =
adj->page_size = page_size;
gtk_range_set_range(range, 0, upper);
} }
void wxScrollHelperNative::AdjustScrollbars() void wxScrollHelperNative::AdjustScrollbars()