From ae361aca862a733d9c7b134eae08ed7197f1e831 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 20 Nov 2002 17:45:14 +0000 Subject: [PATCH] GTK2 fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/slider.cpp | 9 +++++---- src/gtk1/slider.cpp | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index 9f59575679..799f21d2b1 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -255,14 +255,15 @@ int wxSlider::GetLineSize() const bool wxSlider::IsOwnGtkWindow( GdkWindow *window ) { GtkRange *range = GTK_RANGE(m_widget); +#ifdef __WXGTK20__ + return (range->event_window == window); +#else return ( (window == GTK_WIDGET(range)->window) -#ifndef __WXGTK20__ || (window == range->trough) || (window == range->slider) || (window == range->step_forw) - || (window == range->step_back) -#endif // GTK+ 1.x - ); + || (window == range->step_back) ); +#endif } void wxSlider::ApplyWidgetStyle() diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp index 9f59575679..799f21d2b1 100644 --- a/src/gtk1/slider.cpp +++ b/src/gtk1/slider.cpp @@ -255,14 +255,15 @@ int wxSlider::GetLineSize() const bool wxSlider::IsOwnGtkWindow( GdkWindow *window ) { GtkRange *range = GTK_RANGE(m_widget); +#ifdef __WXGTK20__ + return (range->event_window == window); +#else return ( (window == GTK_WIDGET(range)->window) -#ifndef __WXGTK20__ || (window == range->trough) || (window == range->slider) || (window == range->step_forw) - || (window == range->step_back) -#endif // GTK+ 1.x - ); + || (window == range->step_back) ); +#endif } void wxSlider::ApplyWidgetStyle()