[gtk+] combobox: Unconditionally draw background and border

[Benjamin Otte <otte src gnome org>]

commit 3402363684de5577b267c743029b2f4a8ef6a9da
Author: Benjamin Otte <otte redhat com>
Date:   Sun Jul 19 18:35:33 2015 +0200

    combobox: Unconditionally draw background and border

 gtk/gtkcombobox.c |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index a81b341..b2e409b 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2781,20 +2781,16 @@ gtk_combo_box_draw (GtkWidget *widget,
 {
   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
   GtkComboBoxPrivate *priv = combo_box->priv;
+  GtkStyleContext *context;
 
-  if (priv->shadow_type != GTK_SHADOW_NONE)
-    {
-      GtkStyleContext *context;
-
-      context = gtk_widget_get_style_context (widget);
+  context = gtk_widget_get_style_context (widget);
 
-      gtk_render_background (context, cr, 0, 0,
-                             gtk_widget_get_allocated_width (widget),
-                             gtk_widget_get_allocated_height (widget));
-      gtk_render_frame (context, cr, 0, 0,
-                        gtk_widget_get_allocated_width (widget),
-                        gtk_widget_get_allocated_height (widget));
-    }
+  gtk_render_background (context, cr, 0, 0,
+                         gtk_widget_get_allocated_width (widget),
+                         gtk_widget_get_allocated_height (widget));
+  gtk_render_frame (context, cr, 0, 0,
+                    gtk_widget_get_allocated_width (widget),
+                    gtk_widget_get_allocated_height (widget));
 
   gtk_container_propagate_draw (GTK_CONTAINER (widget),
                                 priv->button, cr);