From 3203621a926c6cdf393fb6ba0afbd21817dde017 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 16 Apr 2005 09:52:25 +0000 Subject: [PATCH 1/1] Applied patch [ 1183153 ] [wxGTK] DrawComboBoxDropButton pressed state Jaakko Salli git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/renderer.cpp | 12 ++++++++---- src/gtk1/renderer.cpp | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index 8b545e1c39..67768b216c 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -430,10 +430,12 @@ wxRendererGTK::DrawDropArrow(wxWindow *win, GtkStateType state; - if ( flags & wxCONTROL_CURRENT ) - state = GTK_STATE_PRELIGHT; + if ( flags & wxCONTROL_PRESSED ) + state = GTK_STATE_ACTIVE; else if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; + else if ( flags & wxCONTROL_CURRENT ) + state = GTK_STATE_PRELIGHT; else state = GTK_STATE_NORMAL; @@ -471,10 +473,12 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, // draw button GtkStateType state; - if ( flags & wxCONTROL_CURRENT ) - state = GTK_STATE_PRELIGHT; + if ( flags & wxCONTROL_PRESSED ) + state = GTK_STATE_ACTIVE; else if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; + else if ( flags & wxCONTROL_CURRENT ) + state = GTK_STATE_PRELIGHT; else state = GTK_STATE_NORMAL; diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp index 8b545e1c39..67768b216c 100644 --- a/src/gtk1/renderer.cpp +++ b/src/gtk1/renderer.cpp @@ -430,10 +430,12 @@ wxRendererGTK::DrawDropArrow(wxWindow *win, GtkStateType state; - if ( flags & wxCONTROL_CURRENT ) - state = GTK_STATE_PRELIGHT; + if ( flags & wxCONTROL_PRESSED ) + state = GTK_STATE_ACTIVE; else if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; + else if ( flags & wxCONTROL_CURRENT ) + state = GTK_STATE_PRELIGHT; else state = GTK_STATE_NORMAL; @@ -471,10 +473,12 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, // draw button GtkStateType state; - if ( flags & wxCONTROL_CURRENT ) - state = GTK_STATE_PRELIGHT; + if ( flags & wxCONTROL_PRESSED ) + state = GTK_STATE_ACTIVE; else if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; + else if ( flags & wxCONTROL_CURRENT ) + state = GTK_STATE_PRELIGHT; else state = GTK_STATE_NORMAL; -- 2.45.2