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

remove m_blockScrollEvent from wxWindowGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-09-14 04:26:33 +00:00
parent 301f696372
commit 1d59165194
4 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gtk/slider.cpp
View File

@@ -231,9 +231,9 @@ gtk_event_after(GtkRange* range, GdkEvent* event, wxSlider* win)
ProcessScrollEvent(win, wxEVT_SCROLL_THUMBRELEASE);
}
// Keep slider at an integral position
win->BlockScrollEvent();
win->m_blockScrollEvent = true;
gtk_range_set_value(GTK_RANGE (win->m_widget), win->GetValue());
win->UnblockScrollEvent();
win->m_blockScrollEvent = false;
}
}
}
@@ -279,6 +279,7 @@ wxSlider::wxSlider()
m_pos = 0;
m_scrollEventType = 0;
m_needThumbRelease = false;
m_blockScrollEvent = false;
}
bool wxSlider::Create(wxWindow *parent,
@@ -299,10 +300,6 @@ bool wxSlider::Create(wxWindow *parent,
return false;
}
m_pos = 0;
m_scrollEventType = 0;
m_needThumbRelease = false;
if (style & wxSL_VERTICAL)
m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
else
@@ -344,18 +341,18 @@ void wxSlider::SetValue( int value )
{
if (GetValue() != value)
{
BlockScrollEvent();
m_blockScrollEvent = true;
gtk_range_set_value(GTK_RANGE (m_widget), value);
UnblockScrollEvent();
m_blockScrollEvent = false;
}
}
void wxSlider::SetRange( int minValue, int maxValue )
{
BlockScrollEvent();
m_blockScrollEvent = true;
gtk_range_set_range(GTK_RANGE (m_widget), minValue, maxValue);
gtk_range_set_increments(GTK_RANGE (m_widget), 1, (maxValue - minValue + 9) / 10);
UnblockScrollEvent();
m_blockScrollEvent = false;
}
int wxSlider::GetMin() const
@@ -370,9 +367,9 @@ int wxSlider::GetMax() const
void wxSlider::SetPageSize( int pageSize )
{
BlockScrollEvent();
m_blockScrollEvent = true;
gtk_range_set_increments(GTK_RANGE (m_widget), GetLineSize(), pageSize);
UnblockScrollEvent();
m_blockScrollEvent = false;
}
int wxSlider::GetPageSize() const
@@ -392,9 +389,9 @@ int wxSlider::GetThumbLength() const
void wxSlider::SetLineSize( int lineSize )
{
BlockScrollEvent();
m_blockScrollEvent = true;
gtk_range_set_increments(GTK_RANGE (m_widget), lineSize, GetPageSize());
UnblockScrollEvent();
m_blockScrollEvent = false;
}
int wxSlider::GetLineSize() const