GTK2 fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -255,14 +255,15 @@ int wxSlider::GetLineSize() const
|
|||||||
bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
|
bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
|
||||||
{
|
{
|
||||||
GtkRange *range = GTK_RANGE(m_widget);
|
GtkRange *range = GTK_RANGE(m_widget);
|
||||||
|
#ifdef __WXGTK20__
|
||||||
|
return (range->event_window == window);
|
||||||
|
#else
|
||||||
return ( (window == GTK_WIDGET(range)->window)
|
return ( (window == GTK_WIDGET(range)->window)
|
||||||
#ifndef __WXGTK20__
|
|
||||||
|| (window == range->trough)
|
|| (window == range->trough)
|
||||||
|| (window == range->slider)
|
|| (window == range->slider)
|
||||||
|| (window == range->step_forw)
|
|| (window == range->step_forw)
|
||||||
|| (window == range->step_back)
|
|| (window == range->step_back) );
|
||||||
#endif // GTK+ 1.x
|
#endif
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxSlider::ApplyWidgetStyle()
|
void wxSlider::ApplyWidgetStyle()
|
||||||
|
@@ -255,14 +255,15 @@ int wxSlider::GetLineSize() const
|
|||||||
bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
|
bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
|
||||||
{
|
{
|
||||||
GtkRange *range = GTK_RANGE(m_widget);
|
GtkRange *range = GTK_RANGE(m_widget);
|
||||||
|
#ifdef __WXGTK20__
|
||||||
|
return (range->event_window == window);
|
||||||
|
#else
|
||||||
return ( (window == GTK_WIDGET(range)->window)
|
return ( (window == GTK_WIDGET(range)->window)
|
||||||
#ifndef __WXGTK20__
|
|
||||||
|| (window == range->trough)
|
|| (window == range->trough)
|
||||||
|| (window == range->slider)
|
|| (window == range->slider)
|
||||||
|| (window == range->step_forw)
|
|| (window == range->step_forw)
|
||||||
|| (window == range->step_back)
|
|| (window == range->step_back) );
|
||||||
#endif // GTK+ 1.x
|
#endif
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxSlider::ApplyWidgetStyle()
|
void wxSlider::ApplyWidgetStyle()
|
||||||
|
Reference in New Issue
Block a user