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

don't compare initial slider position with uninitialized m_pos (modified patch 1818759)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-23 18:16:06 +00:00
parent 9cd808434c
commit 3824e0db33
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk/slider.h
View File

@@ -58,7 +58,7 @@ public:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// implementation
double m_pos;
int m_scrollEventType;
@@ -68,6 +68,9 @@ public:
protected:
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
// set the slider value unconditionally
void GTKSetValue(int value);
DECLARE_DYNAMIC_CLASS(wxSlider)
};

27
src/gtk/slider.cpp
View File

@@ -277,7 +277,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
wxSlider::wxSlider()
{
m_pos = 0;
m_scrollEventType = 0;
m_scrollEventType = GTK_SCROLL_NONE;
m_needThumbRelease = false;
m_blockScrollEvent = false;
}
@@ -293,6 +293,9 @@ bool wxSlider::Create(wxWindow *parent,
const wxValidator& validator,
const wxString& name)
{
m_pos = value;
m_scrollEventType = GTK_SCROLL_NONE;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
@@ -317,13 +320,14 @@ bool wxSlider::Create(wxWindow *parent,
g_signal_connect(m_widget, "move_slider", G_CALLBACK(gtk_move_slider), this);
g_signal_connect(m_widget, "format_value", G_CALLBACK(gtk_format_value), NULL);
g_signal_connect(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);
gulong handler_id;
handler_id = g_signal_connect(
m_widget, "event_after", G_CALLBACK(gtk_event_after), this);
gulong handler_id = g_signal_connect(m_widget, "event_after", G_CALLBACK(gtk_event_after), this);
g_signal_handler_block(m_widget, handler_id);
SetRange( minValue, maxValue );
SetValue( value );
// don't call the public SetValue() as it won't do anything unless the
// value really changed
GTKSetValue( value );
m_parent->DoAddChild( this );
@@ -340,11 +344,14 @@ int wxSlider::GetValue() const
void wxSlider::SetValue( int value )
{
if (GetValue() != value)
{
m_blockScrollEvent = true;
gtk_range_set_value(GTK_RANGE (m_widget), value);
m_blockScrollEvent = false;
}
GTKSetValue(value);
}
void wxSlider::GTKSetValue(int value)
{
m_blockScrollEvent = true;
gtk_range_set_value(GTK_RANGE (m_widget), value);
m_blockScrollEvent = false;
}
void wxSlider::SetRange( int minValue, int maxValue )