X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23f826bdf98d9f1570248cb926e7b7f233ed44dd..b29b9485f64d1e50fd0f756b935da36cea56bbf8:/src/gtk/slider.cpp diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index 0eeb6b696e..c0e286da94 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 = range->adjustment; + 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; } @@ -225,7 +223,7 @@ gtk_event_after(GtkRange* range, GdkEvent* event, wxSlider* win) { if (event->type == GDK_BUTTON_RELEASE) { - g_signal_handlers_block_by_func(range, (void*)gtk_event_after, win); + g_signal_handlers_block_by_func(range, (gpointer) gtk_event_after, win); if (win->m_needThumbRelease) { @@ -233,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(); - gtk_range_set_value((GtkRange*)win->m_widget, win->GetValue()); - win->UnblockScrollEvent(); + win->m_blockScrollEvent = true; + gtk_range_set_value(GTK_RANGE (win->m_widget), win->GetValue()); + win->m_blockScrollEvent = false; } } } @@ -252,7 +250,7 @@ gtk_button_release_event(GtkRange* range, GdkEventButton*, wxSlider* win) if (win->m_isScrolling) { win->m_isScrolling = false; - g_signal_handlers_unblock_by_func(range, (void*)gtk_event_after, win); + g_signal_handlers_unblock_by_func(range, (gpointer) gtk_event_after, win); } return false; } @@ -281,16 +279,20 @@ wxSlider::wxSlider() m_pos = 0; m_scrollEventType = 0; m_needThumbRelease = false; + m_blockScrollEvent = 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 )) { @@ -298,18 +300,14 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, return false; } - m_pos = 0; - m_scrollEventType = 0; - m_needThumbRelease = false; - if (style & wxSL_VERTICAL) m_widget = gtk_vscale_new( (GtkAdjustment *) NULL ); else m_widget = gtk_hscale_new( (GtkAdjustment *) NULL ); - gtk_scale_set_draw_value((GtkScale*)m_widget, (style & wxSL_LABELS) != 0); + gtk_scale_set_draw_value(GTK_SCALE (m_widget), (style & wxSL_LABELS) != 0); // Keep full precision in position value - gtk_scale_set_digits((GtkScale*)m_widget, -1); + gtk_scale_set_digits(GTK_SCALE (m_widget), -1); if (style & wxSL_INVERSE) gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE ); @@ -343,40 +341,40 @@ void wxSlider::SetValue( int value ) { if (GetValue() != value) { - BlockScrollEvent(); - gtk_range_set_value((GtkRange*)m_widget, value); - UnblockScrollEvent(); + m_blockScrollEvent = true; + gtk_range_set_value(GTK_RANGE (m_widget), value); + m_blockScrollEvent = false; } } void wxSlider::SetRange( int minValue, int maxValue ) { - BlockScrollEvent(); - gtk_range_set_range((GtkRange*)m_widget, minValue, maxValue); - gtk_range_set_increments((GtkRange*)m_widget, 1, (maxValue - minValue + 9) / 10); - UnblockScrollEvent(); + 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); + m_blockScrollEvent = false; } int wxSlider::GetMin() const { - return int(((GtkRange*)m_widget)->adjustment->lower); + return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->lower); } int wxSlider::GetMax() const { - return int(((GtkRange*)m_widget)->adjustment->upper); + return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->upper); } void wxSlider::SetPageSize( int pageSize ) { - BlockScrollEvent(); - gtk_range_set_increments((GtkRange*)m_widget, 1, pageSize); - UnblockScrollEvent(); + m_blockScrollEvent = true; + gtk_range_set_increments(GTK_RANGE (m_widget), GetLineSize(), pageSize); + m_blockScrollEvent = false; } int wxSlider::GetPageSize() const { - return int(((GtkRange*)m_widget)->adjustment->page_increment); + return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->page_increment); } // GTK does not support changing the size of the slider @@ -389,19 +387,21 @@ int wxSlider::GetThumbLength() const return 0; } -void wxSlider::SetLineSize( int WXUNUSED(lineSize) ) +void wxSlider::SetLineSize( int lineSize ) { + m_blockScrollEvent = true; + gtk_range_set_increments(GTK_RANGE (m_widget), lineSize, GetPageSize()); + m_blockScrollEvent = false; } int wxSlider::GetLineSize() const { - return 0; + return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->step_increment); } -bool wxSlider::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxSlider::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - GtkRange *range = GTK_RANGE(m_widget); - return (range->event_window == window); + return GTK_RANGE(m_widget)->event_window; } // static