X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef5c70f96f5e06e1c8f8119f51b99dd019583d2b..8ca1a013e4e699724040ff1f514dab3b4a11d3c9:/src/gtk/slider.cpp?ds=inline diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index 5cde6b19f6..13e84b7974 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -19,7 +19,7 @@ #include "wx/math.h" #endif -#include "wx/gtk/private.h" +#include //----------------------------------------------------------------------------- // data @@ -124,15 +124,14 @@ extern "C" { static void gtk_value_changed(GtkRange* range, wxSlider* win) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (!win->m_hasVMT) return; - if (g_blockEventsOnDrag) return; - GtkAdjustment* adj = gtk_range_get_adjustment (range); const int pos = wxRound(adj->value); const double oldPos = win->m_pos; win->m_pos = adj->value; + + if (!win->m_hasVMT || g_blockEventsOnDrag) + return; + if (win->m_blockScrollEvent) { win->m_scrollEventType = GTK_SCROLL_NONE; @@ -181,7 +180,6 @@ gtk_value_changed(GtkRange* range, wxSlider* win) // If integral position has changed if (wxRound(oldPos) != pos) { - wxCHECK_RET(eventType != wxEVT_NULL, _T("Unknown slider scroll event type")); ProcessScrollEvent(win, eventType); win->m_needThumbRelease = eventType == wxEVT_SCROLL_THUMBTRACK; } @@ -283,14 +281,17 @@ wxSlider::wxSlider() m_needThumbRelease = false; } -bool wxSlider::Create(wxWindow *parent, wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator, const wxString& name ) +bool wxSlider::Create(wxWindow *parent, + wxWindowID id, + int value, + int minValue, + int maxValue, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { - m_acceptsFocus = true; - m_needParent = true; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) {