fix warning about unused TRACE_MASK variable in release builds

[wxWidgets.git] / src / gtk / slider.cpp

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 5e8098e47c84ee77c901b60749e153ceb3c6c49d..dc964e0153b127d13d5f943684910f94ba5c38f4 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -126,13 +126,14 @@ gtk_value_changed(GtkRange* range, wxSlider* win)
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     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;
     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;
     if (win->m_blockScrollEvent)
     {
         win->m_scrollEventType = GTK_SCROLL_NONE;


@@ -401,10 +402,9 @@ int wxSlider::GetLineSize() const
     return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->step_increment);
 }
 
     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
 }
 
 // static