]> Pileus Git - ~andy/gtk/commitdiff
themingengine: Remove an optimization
authorBenjamin Otte <otte@redhat.com>
Fri, 6 Jan 2012 19:33:00 +0000 (20:33 +0100)
committerBenjamin Otte <otte@redhat.com>
Mon, 9 Jan 2012 17:37:58 +0000 (18:37 +0100)
We optimize the case later on, so no need to do it here.

gtk/gtkthemingengine.c

index 754fe8c432e4149a03e0cba470d649c797997055..f448d45445c11366abd11977d735705e83e5c5cb 100644 (file)
@@ -1543,7 +1543,6 @@ gtk_theming_engine_render_frame (GtkThemingEngine *engine,
                                  gdouble           height)
 {
   GtkStateFlags flags;
-  GtkBorderStyle border_style;
   GtkJunctionSides junction;
   GtkBorderImage border_image;
   GtkBorder border;
@@ -1552,14 +1551,10 @@ gtk_theming_engine_render_frame (GtkThemingEngine *engine,
   junction = gtk_theming_engine_get_junction_sides (engine);
   gtk_theming_engine_get_border (engine, flags, &border);
 
-  gtk_theming_engine_get (engine, flags,
-                         "border-style", &border_style,
-                         NULL);
-
   if (_gtk_border_image_init (&border_image, engine))
     _gtk_border_image_render (&border_image, &border,
                               cr, x, y, width, height);
-  else if (border_style != GTK_BORDER_STYLE_NONE)
+  else
     render_frame_internal (engine, cr,
                            x, y, width, height,
                            0, junction);