add upstream 11.2

1 files changed, 4 insertions, 4 deletions

diff --git a/wx+/std_button_layout.h b/wx+/std_button_layout.h
index d2c5fc32..25745132 100644
--- a/wx+/std_button_layout.h
+++ b/wx+/std_button_layout.h
@@ -18,12 +18,12 @@ namespace zen
 struct StdButtons
 {
     StdButtons& setAffirmative   (wxButton* btn) { btnYes    = btn; return *this; }
-    StdButtons& setAffirmativeAll(wxButton* btn) { btnYesAll = btn; return *this; }
+    StdButtons& setAffirmativeAll(wxButton* btn) { btnYes2   = btn; return *this; }
     StdButtons& setNegative      (wxButton* btn) { btnNo     = btn; return *this; }
     StdButtons& setCancel        (wxButton* btn) { btnCancel = btn; return *this; }
 
     wxButton* btnYes    = nullptr;
-    wxButton* btnYesAll = nullptr;
+    wxButton* btnYes2   = nullptr;
     wxButton* btnNo     = nullptr;
     wxButton* btnCancel = nullptr;
 };
@@ -67,7 +67,7 @@ void setStandardButtonLayout(wxBoxSizer& sizer, const StdButtons& buttons)
     };
 
     detach(buttonsTmp.btnYes);
-    detach(buttonsTmp.btnYesAll);
+    detach(buttonsTmp.btnYes2);
     detach(buttonsTmp.btnNo);
     detach(buttonsTmp.btnCancel);
 
@@ -110,7 +110,7 @@ void setStandardButtonLayout(wxBoxSizer& sizer, const StdButtons& buttons)
     sizer.Add(spaceRimH, 0);
     attach(buttonsTmp.btnNo);
     attach(buttonsTmp.btnCancel);
-    attach(buttonsTmp.btnYesAll);
+    attach(buttonsTmp.btnYes2);
     attach(buttonsTmp.btnYes);
 
     sizer.Add(spaceRimH, 0);