Skip to content

Fix the "enumeration values 'ButtonsDefault' and 'ButtonsOk' not handled in switch" #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvo5 merged 1 commit into from
Jul 9, 2026
Merged

Fix the "enumeration values 'ButtonsDefault' and 'ButtonsOk' not handled in switch" #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions common/ruserdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ class RUserDialog {
virtual bool message(const char *msg,
DialogType dialog = DialogInfo,
ButtonsType buttons = ButtonsDefault,
bool defres = true) = 0;
bool defaultResponse = true) = 0;

virtual bool confirm(const char *msg, bool defres = true) {
return message(msg, DialogQuestion, ButtonsYesNo, defres);
virtual bool confirm(const char *msg, bool defaultResponse = true) {
return message(msg, DialogQuestion, ButtonsYesNo, defaultResponse);
}

virtual bool proceed(const char *msg, bool defres = true) {
return message(msg, DialogInfo, ButtonsOkCancel, defres);
virtual bool proceed(const char *msg, bool defaultResponse = true) {
return message(msg, DialogInfo, ButtonsOkCancel, defaultResponse);
}

virtual bool warning(const char *msg, bool nocancel = true) {
Expand Down
39 changes: 16 additions & 23 deletions gtk/rguserdialog.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ bool RGUserDialog::showErrors()

bool RGUserDialog::message(const char *msg,
RUserDialog::DialogType dialog,
RUserDialog::ButtonsType buttons, bool defres)
RUserDialog::ButtonsType buttons, bool defaultResponse)
{
GtkWidget *dia;
GtkResponseType res;
Expand Down Expand Up @@ -170,33 +170,26 @@ bool RGUserDialog::message(const char *msg,
break;
}

dia = gtk_message_dialog_new (GTK_WINDOW(_parentWindow),
GTK_DIALOG_DESTROY_WITH_PARENT,
gtkmessage, gtkbuttons, NULL);
GdkPixbuf *icon = get_gdk_pixbuf( "synaptic" );
dia = gtk_message_dialog_new(GTK_WINDOW(_parentWindow),
GTK_DIALOG_DESTROY_WITH_PARENT,
gtkmessage, gtkbuttons, NULL);
GdkPixbuf *icon = get_gdk_pixbuf("synaptic");
gtk_window_set_icon(GTK_WINDOW(dia), icon);

gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(dia), utf8(msg));
gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dia), utf8(msg));
gtk_container_set_border_width(GTK_CONTAINER(dia), 6);

if (defres) {
switch (buttons) {
case RUserDialog::ButtonsOkCancel:
gtk_dialog_set_default_response(GTK_DIALOG(dia), GTK_RESPONSE_OK);
break;
case RUserDialog::ButtonsYesNo:
gtk_dialog_set_default_response(GTK_DIALOG(dia), GTK_RESPONSE_YES);
break;
switch (buttons) {
case RUserDialog::ButtonsOkCancel: {
Comment thread
amaa-99 marked this conversation as resolved.
gtk_dialog_set_default_response(GTK_DIALOG(dia), defaultResponse ? GTK_RESPONSE_OK : GTK_RESPONSE_CANCEL);
break;
}
} else {
switch (buttons) {
case RUserDialog::ButtonsOkCancel:
gtk_dialog_set_default_response(GTK_DIALOG(dia),
GTK_RESPONSE_CANCEL);
break;
case RUserDialog::ButtonsYesNo:
gtk_dialog_set_default_response(GTK_DIALOG(dia), GTK_RESPONSE_NO);
break;
case RUserDialog::ButtonsYesNo: {
gtk_dialog_set_default_response(GTK_DIALOG(dia), defaultResponse ? GTK_RESPONSE_YES : GTK_RESPONSE_NO);
break;
}
default: {
break;
}
}

Expand Down
2 changes: 1 addition & 1 deletion gtk/rguserdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class RGUserDialog : public RUserDialog
virtual bool message(const char *msg,
RUserDialog::DialogType dialog=RUserDialog::DialogInfo,
RUserDialog::ButtonsType buttons=RUserDialog::ButtonsOk,
bool defres=true);
bool defaultResponse=true);

};

Expand Down