[ 1603286 ] make wxMessageDialog Gnome HIG conform for yes_no+cancel

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index fa66968937476f0e61976fd80b2d79437d44273e..a0861aaf379a580f89cd0f54726f70cdb07f5654 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -45,7 +45,10 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
 
     if (style & wxYES_NO)
     {
 
     if (style & wxYES_NO)
     {

-        buttons = GTK_BUTTONS_YES_NO;
+               if (style & wxCANCEL)
+                       buttons = GTK_BUTTONS_NONE;
+               else
+               buttons = GTK_BUTTONS_YES_NO;

     }
 
     if (style & wxOK)
     }
 
     if (style & wxOK)


@@ -81,8 +84,14 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
     if (style & wxYES_NO)
     {
         if (style & wxCANCEL)
     if (style & wxYES_NO)
     {
         if (style & wxCANCEL)

+               {
+            gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_NO,
+                                  GTK_RESPONSE_NO);

             gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL,
                                   GTK_RESPONSE_CANCEL);
             gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL,
                                   GTK_RESPONSE_CANCEL);

+            gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_YES,
+                                  GTK_RESPONSE_YES);
+               }

         if (style & wxNO_DEFAULT)
             gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_NO);
         else
         if (style & wxNO_DEFAULT)
             gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_NO);
         else