diff options
13 files changed, 24 insertions, 20 deletions
diff --git a/chrome/browser/chromeos/native_dialog_window.cc b/chrome/browser/chromeos/native_dialog_window.cc index c79bfce..f068649 100644 --- a/chrome/browser/chromeos/native_dialog_window.cc +++ b/chrome/browser/chromeos/native_dialog_window.cc @@ -225,11 +225,11 @@ void NativeDialogHost::Init() { kDialogPadding, kDialogPadding); // Move dialog contents into our container. - GtkWidget* dialog_contents = GTK_DIALOG(dialog_)->vbox; - g_object_ref(dialog_contents); - gtk_container_remove(GTK_CONTAINER(dialog_), dialog_contents); - gtk_container_add(GTK_CONTAINER(contents), dialog_contents); - g_object_unref(dialog_contents); + GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog_)); + g_object_ref(content_area); + gtk_container_remove(GTK_CONTAINER(dialog_), content_area); + gtk_container_add(GTK_CONTAINER(contents), content_area); + g_object_unref(content_area); gtk_widget_hide(dialog_); g_object_set_data(G_OBJECT(dialog_), kNativeDialogHost, diff --git a/chrome/browser/ui/gtk/about_chrome_dialog.cc b/chrome/browser/ui/gtk/about_chrome_dialog.cc index a1d06a5..61f8406 100644 --- a/chrome/browser/ui/gtk/about_chrome_dialog.cc +++ b/chrome/browser/ui/gtk/about_chrome_dialog.cc @@ -118,7 +118,7 @@ void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) { GtkWidget* close_button = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); - GtkWidget* content_area = GTK_DIALOG(dialog)->vbox; + GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); // Use an event box to get the background painting correctly GtkWidget* ebox = gtk_event_box_new(); diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc index c5595da..6b357b1 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc @@ -343,7 +343,7 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) { // +---------------------------------------------------------------+ // // * The url and corresponding label are not shown if creating a new folder. - GtkWidget* content_area = GTK_DIALOG(dialog_)->vbox; + GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog_)); gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing); GtkWidget* vbox = gtk_vbox_new(FALSE, 12); diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc index 7f2f728..4857c83 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc @@ -100,7 +100,8 @@ void CreateApplicationShortcutsDialogGtk::CreateDialogBox(GtkWindow* parent) { l10n_util::GetStringUTF8(IDS_CREATE_SHORTCUTS_COMMIT).c_str(), GTK_STOCK_APPLY, GTK_RESPONSE_ACCEPT); - GtkWidget* content_area = GTK_DIALOG(create_dialog_)->vbox; + GtkWidget* content_area = + gtk_dialog_get_content_area(GTK_DIALOG(create_dialog_)); gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing); GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing); @@ -240,7 +241,8 @@ void CreateApplicationShortcutsDialogGtk::ShowErrorDialog() { IDS_CREATE_SHORTCUTS_ERROR_DIALOG_WIDTH_CHARS, IDS_CREATE_SHORTCUTS_ERROR_DIALOG_HEIGHT_LINES, false); // resizable - GtkWidget* content_area = GTK_DIALOG(error_dialog_)->vbox; + GtkWidget* content_area = + gtk_dialog_get_content_area(GTK_DIALOG(error_dialog_)); gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing); GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing); diff --git a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc index a49bc0a..889a85e 100644 --- a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc @@ -74,7 +74,7 @@ void ShowInstallDialog(GtkWindow* parent, gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); // Create a two column layout. - GtkWidget* content_area = GTK_DIALOG(dialog)->vbox; + GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing); GtkWidget* icon_hbox = gtk_hbox_new(FALSE, gtk_util::kContentAreaSpacing); diff --git a/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc index 922ad55..04e16eb 100644 --- a/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc @@ -53,7 +53,7 @@ void ShowUninstallDialogGtk(GtkWindow* parent, gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); // Create a two column layout. - GtkWidget* content_area = GTK_DIALOG(dialog)->vbox; + GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing); GtkWidget* icon_hbox = gtk_hbox_new(FALSE, gtk_util::kContentAreaSpacing); diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc index db58535..7bda7b0 100644 --- a/chrome/browser/ui/gtk/first_run_dialog.cc +++ b/chrome/browser/ui/gtk/first_run_dialog.cc @@ -268,7 +268,7 @@ void FirstRunDialog::ShowReportingDialog() { g_signal_connect(dialog_, "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL); - GtkWidget* content_area = GTK_DIALOG(dialog_)->vbox; + GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog_)); make_default_ = gtk_check_button_new_with_label( l10n_util::GetStringUTF8(IDS_FR_CUSTOMIZE_DEFAULT_BROWSER).c_str()); diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc index a8d9910..8b6ab75 100644 --- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc @@ -99,11 +99,11 @@ void HungRendererDialogGtk::Init() { // | | // | kill button wait button| // ·-----------------------------------· - GtkWidget* contents_vbox = dialog_->vbox; - gtk_box_set_spacing(GTK_BOX(contents_vbox), gtk_util::kContentAreaSpacing); + GtkWidget* content_area = gtk_dialog_get_content_area(dialog_); + gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing); GtkWidget* hbox = gtk_hbox_new(FALSE, 12); - gtk_box_pack_start(GTK_BOX(contents_vbox), hbox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(content_area), hbox, TRUE, TRUE, 0); // Wrap the icon in a vbox so it stays top aligned. GtkWidget* icon_vbox = gtk_vbox_new(FALSE, 0); diff --git a/chrome/browser/ui/gtk/importer/import_lock_dialog_gtk.cc b/chrome/browser/ui/gtk/importer/import_lock_dialog_gtk.cc index 9e6a150..4df1394 100644 --- a/chrome/browser/ui/gtk/importer/import_lock_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/importer/import_lock_dialog_gtk.cc @@ -47,7 +47,7 @@ ImportLockDialogGtk::ImportLockDialogGtk(GtkWindow* parent, l10n_util::GetStringUTF8(IDS_IMPORTER_LOCK_OK).c_str(), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT); - GtkWidget* content_area = GTK_DIALOG(dialog_)->vbox; + GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog_)); gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing); GtkWidget* label = gtk_label_new( l10n_util::GetStringUTF8(IDS_IMPORTER_LOCK_TEXT).c_str()); diff --git a/chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc b/chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc index dd2b544..a8f0b36 100644 --- a/chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc @@ -81,7 +81,7 @@ ImportProgressDialogGtk::ImportProgressDialogGtk( NULL); importer_host_->set_parent_window(GTK_WINDOW(dialog_)); - GtkWidget* content_area = GTK_DIALOG(dialog_)->vbox; + GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog_)); gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing); GtkWidget* control_group = gtk_vbox_new(FALSE, gtk_util::kControlSpacing); diff --git a/chrome/browser/ui/input_window_dialog_gtk.cc b/chrome/browser/ui/input_window_dialog_gtk.cc index 53bd5dc..f85bd34 100644 --- a/chrome/browser/ui/input_window_dialog_gtk.cc +++ b/chrome/browser/ui/input_window_dialog_gtk.cc @@ -60,7 +60,7 @@ InputWindowDialogGtk::InputWindowDialogGtk(GtkWindow* parent, gtk_dialog_set_has_separator(GTK_DIALOG(dialog_), FALSE); gtk_window_set_resizable(GTK_WINDOW(dialog_), FALSE); - GtkWidget* content_area = GTK_DIALOG(dialog_)->vbox; + GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog_)); gtk_box_set_spacing(GTK_BOX(content_area), 18); GtkWidget* hbox = gtk_hbox_new(FALSE, 6); diff --git a/remoting/host/continue_window_linux.cc b/remoting/host/continue_window_linux.cc index 92b90af..2dcc67e 100644 --- a/remoting/host/continue_window_linux.cc +++ b/remoting/host/continue_window_linux.cc @@ -62,7 +62,8 @@ void ContinueWindowLinux::CreateWindow() { g_signal_connect(continue_window_, "response", G_CALLBACK(OnResponseThunk), this); - GtkWidget* content_area = GTK_DIALOG(continue_window_)->vbox; + GtkWidget* content_area = + gtk_dialog_get_content_area(GTK_DIALOG(continue_window_)); GtkWidget* text_label = gtk_label_new(kMessage); gtk_label_set_line_wrap(GTK_LABEL(text_label), TRUE); diff --git a/remoting/host/disconnect_window_linux.cc b/remoting/host/disconnect_window_linux.cc index f8a27d3..bfd2e1c 100644 --- a/remoting/host/disconnect_window_linux.cc +++ b/remoting/host/disconnect_window_linux.cc @@ -64,7 +64,8 @@ void DisconnectWindowLinux::CreateWindow() { g_signal_connect(disconnect_window_, "response", G_CALLBACK(OnResponseThunk), this); - GtkWidget* content_area = GTK_DIALOG(disconnect_window_)->vbox; + GtkWidget* content_area = + gtk_dialog_get_content_area(GTK_DIALOG(disconnect_window_)); GtkWidget* username_row = gtk_hbox_new(FALSE, 0); // TODO(lambroslambrou): Replace the magic number with an appropriate |