--- msw_style.c.orig	2011-11-29 17:47:35 +0200
+++ msw_style.c	2011-11-29 17:51:46 +0200
@@ -781,6 +781,14 @@ setup_msw_rc_style (void)
 	      "widget_class \"*TreeView*Button*\" style \"msw-header-button\"\n");
   gtk_rc_parse_string (buf);
 
+  g_snprintf (buf, sizeof (buf),
+	      "style \"msw-notebook\" = \"msw-default\"\n"
+	      "{\n"
+	      "GtkWidget::focus-line-width = 0\n"
+	      "}\n"
+	      "widget_class \"*Notebook*\" style \"msw-notebook\"\n");
+  gtk_rc_parse_string (buf);
+   
   /* FIXME: This should be enabled once gtk+ support GtkNotebok::prelight-tab */
   /* enable prelight tab of GtkNotebook */
   /*
@@ -3346,6 +3354,10 @@ draw_focus (GtkStyle *style,
     {
       return;
     }
+  if (widget && GTK_IS_NOTEBOOK (widget) && detail && !strcmp (detail, "tab"))	/* notebook label */
+    {
+      return;
+    }
 
   dc = get_window_dc (style, window, state_type, &dc_info, x, y, width, height, &rect);
   DrawFocusRect (dc, &rect);
@@ -3373,6 +3385,9 @@ draw_layout (GtkStyle *style,
   /* In the XP theme, labels don't appear correctly centered inside
    * notebook tabs, so we give them a gentle nudge two pixels to the
    * right.  A little hackish, but what are 'ya gonna do?  -- Cody
+   * XXX: Might be the new drawing code, but two is too much, so just one.
+   *      Also, we have to nudge the area, else the label gets
+   *      clipped. -- MS
    */
   if (xp_theme_is_active () && detail && !strcmp (detail, "label"))
     {
@@ -3386,7 +3401,8 @@ draw_layout (GtkStyle *style,
 
 	      if (side == GTK_POS_TOP || side == GTK_POS_BOTTOM)
 		{
-		  x += 2;
+		  x += 1;
+		  area->x += 1;
 		}
 	    }
 	}
