Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Yes/No/Cancel buttons order in wxGTK wxStdDialogButtonSizer.

Browse Source 
"Yes" and "No" buttons should be positioned next to each other for consistency
with the native message box instead of separating them with the "Cancel"
button.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-08-18 22:48:15 +00:00
parent 8eb99915f2
commit 2afba7c46c
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/common/sizer.cpp
View File

@@ -2578,19 +2578,35 @@ void wxStdDialogButtonSizer::Realize()
Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
}
// according to HIG, in explicit apply windows the order is:
// [ Help Apply Cancel OK ]
if (m_buttonApply)
Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
{
// according to HIG, in explicit apply windows the order is:
// [ Help Apply Cancel OK ]
if (m_buttonCancel){
Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
// Cancel or help should be default
// m_buttonCancel->SetDefaultButton();
Add((wxWindow*)m_buttonApply,
0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
if (m_buttonCancel)
Add((wxWindow*)m_buttonCancel,
0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
if (m_buttonAffirmative)
Add((wxWindow*)m_buttonAffirmative,
0, wxALIGN_CENTRE | wxLEFT, 6);
}
else
{
// without an Apply button, have the buttons representing
// affirmative and negative close to each other.
if (m_buttonAffirmative)
Add((wxWindow*)m_buttonAffirmative,
0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
if (m_buttonCancel)
Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT, 6);
}
if (m_buttonAffirmative)
Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6);
#elif defined(__WXMSW__)
// Windows