return immediately from WalkFrom() if dbghelp dll initialization fails (part of patch...

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 8b545e1c39d399d20fa743919a96d437d490cb42..67768b216c95d47f1a3137e6cf819657b0164610 100644 (file)
--- 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;