summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/gtk/menu_gtk.cc4
-rw-r--r--chrome/browser/gtk/tab_strip_gtk.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index 7a55648..47a89f9 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -129,7 +129,7 @@ void MenuGtk::BuildMenuIn(GtkWidget* menu,
}
if (accel_group && menu_data->accel_key) {
- // If we ever want to let the user do any key re-mapping, we'll need to
+ // If we ever want to let the user do any key remaping, we'll need to
// change the following so we make a gtk_accel_map which keeps the actual
// keys.
gtk_widget_add_accelerator(menu_item,
@@ -150,7 +150,6 @@ void MenuGtk::BuildMenuIn(GtkWidget* menu,
gtk_menu_append(menu, menu_item);
last_menu_item = menu_item;
}
- gtk_widget_modify_bg(menu, GTK_STATE_NORMAL, &gfx::kGdkWhite);
}
void MenuGtk::BuildMenuFromDelegate() {
@@ -181,7 +180,6 @@ void MenuGtk::BuildMenuFromDelegate() {
gtk_widget_show(menu_item);
gtk_menu_shell_append(GTK_MENU_SHELL(menu_.get()), menu_item);
}
- gtk_widget_modify_bg(menu_.get(), GTK_STATE_NORMAL, &gfx::kGdkWhite);
}
// static
diff --git a/chrome/browser/gtk/tab_strip_gtk.cc b/chrome/browser/gtk/tab_strip_gtk.cc
index 94b2cc8..20b5308 100644
--- a/chrome/browser/gtk/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tab_strip_gtk.cc
@@ -239,7 +239,7 @@ void TabStripGtk::TileImageInt(GdkPixbuf* pixbuf,
}
void TabStripGtk::PaintTab(int index, bool selected) {
- GdkGC* gc = tabstrip_.get()->style->fg_gc[GTK_WIDGET_STATE(tabstrip_.get())];
+ GdkGC* gc = gdk_gc_new(tabstrip_.get()->window);
TabImage& image = (selected) ? tab_active_ : tab_inactive_;
TabData& data = tab_data_.at(index);
gfx::Rect bounds = data.bounds;
@@ -282,6 +282,8 @@ void TabStripGtk::PaintTab(int index, bool selected) {
DrawImageInt(close_button_.normal,
data.close_button_bounds.x(), data.close_button_bounds.y());
+
+ g_object_unref(gc);
}
////////////////////////////////////////////////////////////////////////////////