diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 23:24:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 23:24:52 +0000 |
| commit | 5d000c47dda53af105cb8098c9fef5288008757b (patch) | |
| tree | cbfba940c62992a4ce68b844dac29e91776c7921 /views | |
| parent | ed634bf615561459266438450a8300026ce0224c (diff) | |
| download | chromium_src-5d000c47dda53af105cb8098c9fef5288008757b.zip chromium_src-5d000c47dda53af105cb8098c9fef5288008757b.tar.gz chromium_src-5d000c47dda53af105cb8098c9fef5288008757b.tar.bz2 | |
linux: delete code that worked around gtk <2.18
We now depend on GTK 2.18, and in fact we've been infobaring users
who don't have it informing them that Chrome will stop working.
Review URL: http://codereview.chromium.org/7791004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/combobox/native_combobox_gtk.cc | 4 | ||||
| -rw-r--r-- | views/controls/menu/native_menu_gtk.cc | 13 |
2 files changed, 0 insertions, 17 deletions
diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc index 76e550d..3efdb75 100644 --- a/views/controls/combobox/native_combobox_gtk.cc +++ b/views/controls/combobox/native_combobox_gtk.cc @@ -180,11 +180,7 @@ void NativeComboboxGtk::FocusedMenuItemChanged() { GtkCellView* cell_view = GTK_CELL_VIEW(child); GtkTreePath* path = gtk_cell_view_get_displayed_row(cell_view); GtkTreeModel* model = NULL; -#if GTK_CHECK_VERSION(2, 16, 0) model = gtk_cell_view_get_model(cell_view); -#else - g_object_get(cell_view, "model", &model, NULL); -#endif GtkTreeIter iter; if (model && gtk_tree_model_get_iter(model, &iter, path)) { GValue value = { 0 }; diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc index 8a87830..50810bb 100644 --- a/views/controls/menu/native_menu_gtk.cc +++ b/views/controls/menu/native_menu_gtk.cc @@ -393,11 +393,9 @@ GtkWidget* NativeMenuGtk::AddMenuItemAt(int index, gtk_image_new_from_pixbuf(pixbuf)); g_object_unref(pixbuf); -#if GTK_CHECK_VERSION(2,16,0) // Show the image even if the "gtk-menu-images" setting is turned off. gtk_image_menu_item_set_always_show_image( GTK_IMAGE_MENU_ITEM(menu_item), TRUE); -#endif } else { menu_item = gtk_menu_item_new_with_mnemonic(label.c_str()); } @@ -606,18 +604,7 @@ void NativeMenuGtk::SendAccessibilityEvent() { // Get the menu item's label. std::string name; -#if GTK_CHECK_VERSION(2, 16, 0) name = gtk_menu_item_get_label(GTK_MENU_ITEM(menu_item)); -#else - GList* children = gtk_container_get_children(GTK_CONTAINER(menu_item)); - for (GList* l = g_list_first(children); l != NULL; l = g_list_next(l)) { - GtkWidget* child = static_cast<GtkWidget*>(l->data); - if (GTK_IS_LABEL(child)) { - name = gtk_label_get_label(GTK_LABEL(child)); - break; - } - } -#endif if (ViewsDelegate::views_delegate) { ViewsDelegate::views_delegate->NotifyMenuItemFocused( |