rename all references to default_button_index -> default_id to keep consistent with cancel_id

This commit is contained in:
leethomas 2016-01-10 15:33:27 -08:00
parent dfce803045
commit ae5c6add11
7 changed files with 28 additions and 28 deletions

View file

@ -29,7 +29,7 @@ class GtkMessageBox {
GtkMessageBox(NativeWindow* parent_window,
MessageBoxType type,
const std::vector<std::string>& buttons,
int default_button_index,
int default_id,
int cancel_id,
const std::string& title,
const std::string& message,
@ -61,7 +61,7 @@ class GtkMessageBox {
// Add buttons.
for (size_t i = 0; i < buttons.size(); ++i) {
if (i == (size_t)default_button_index) {
if (i == (size_t)default_id) {
GtkWidget* button = gtk_dialog_add_button(GTK_DIALOG(dialog_),
TranslateToStock(i, buttons[i]),
i);
@ -169,21 +169,21 @@ void GtkMessageBox::OnResponseDialog(GtkWidget* widget, int response) {
int ShowMessageBox(NativeWindow* parent,
MessageBoxType type,
const std::vector<std::string>& buttons,
int default_button_index,
int default_id,
int cancel_id,
int options,
const std::string& title,
const std::string& message,
const std::string& detail,
const gfx::ImageSkia& icon) {
return GtkMessageBox(parent, type, buttons, default_button_index, cancel_id,
return GtkMessageBox(parent, type, buttons, default_id, cancel_id,
title, message, detail, icon).RunSynchronous();
}
void ShowMessageBox(NativeWindow* parent,
MessageBoxType type,
const std::vector<std::string>& buttons,
int default_button_index,
int default_id,
int cancel_id,
int options,
const std::string& title,
@ -191,7 +191,7 @@ void ShowMessageBox(NativeWindow* parent,
const std::string& detail,
const gfx::ImageSkia& icon,
const MessageBoxCallback& callback) {
(new GtkMessageBox(parent, type, buttons, default_button_index, cancel_id,
(new GtkMessageBox(parent, type, buttons, default_id, cancel_id,
title, message, detail, icon))->RunAsynchronous(callback);
}