diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 20:10:15 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 20:10:15 +0000 |
commit | b2ba996f96dfd3bde403fce818258d97e3ca8002 (patch) | |
tree | 36f4f264fc2c8af5e6695ef31ac78afb7ebdc5c2 /chrome/browser/gtk/bookmark_bar_gtk.cc | |
parent | 92b24c11f42b31158cca43921eac16f33c98839c (diff) | |
download | chromium_src-b2ba996f96dfd3bde403fce818258d97e3ca8002.zip chromium_src-b2ba996f96dfd3bde403fce818258d97e3ca8002.tar.gz chromium_src-b2ba996f96dfd3bde403fce818258d97e3ca8002.tar.bz2 |
GTK: hook up drag and drop of browser actions (for reordering).
The changes are propagated across open chrome windows, but are not persisted between sessions yet.
BUG=26990
Review URL: http://codereview.chromium.org/463056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_bar_gtk.cc')
-rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 05db22b..cac9ed4 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -235,9 +235,7 @@ void BookmarkBarGtk::Init(Profile* profile) { bookmark_toolbar_.Own(gtk_toolbar_new()); SetToolBarStyle(); gtk_widget_set_name(bookmark_toolbar_.get(), "chrome-bookmark-toolbar"); - gtk_widget_set_app_paintable(bookmark_toolbar_.get(), TRUE); - g_signal_connect(bookmark_toolbar_.get(), "expose-event", - G_CALLBACK(&OnToolbarExpose), this); + gtk_util::SuppressDefaultPainting(bookmark_toolbar_.get()); g_signal_connect(bookmark_toolbar_.get(), "size-allocate", G_CALLBACK(&OnToolbarSizeAllocate), this); gtk_box_pack_start(GTK_BOX(bookmark_hbox_), bookmark_toolbar_.get(), @@ -974,23 +972,6 @@ void BookmarkBarGtk::OnFolderClicked(GtkWidget* sender, } // static -gboolean BookmarkBarGtk::OnToolbarExpose(GtkWidget* widget, - GdkEventExpose* event, - BookmarkBarGtk* bar) { - // A GtkToolbar's expose handler first draws a box. We don't want that so we - // need to propagate the expose event to all the container's children. - GList* children = gtk_container_get_children(GTK_CONTAINER(widget)); - for (GList* item = children; item; item = item->next) { - gtk_container_propagate_expose(GTK_CONTAINER(widget), - GTK_WIDGET(item->data), - event); - } - g_list_free(children); - - return TRUE; -} - -// static gboolean BookmarkBarGtk::OnToolbarDragMotion(GtkToolbar* toolbar, GdkDragContext* context, gint x, |