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

Rewrite GTK section of wxStdDialogButtonSizer using wxSizerFlags.

Browse Source 
Using wxSizerFlags makes the code shorter and more understandable but
otherwise there are no real changes in behaviour except for a minor fix to one
of the border which was wrong before.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-08-30 21:48:06 +00:00
parent 8f0e43661a
commit 4c624eb1e5
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/common/sizer.cpp
View File

@@ -2567,46 +2567,51 @@ void wxStdDialogButtonSizer::Realize()
// Extra space around and at the right // Extra space around and at the right
Add(12, 40); Add(12, 40);
#elif defined(__WXGTK20__) #elif defined(__WXGTK20__)
Add(0, 0, 0, wxLEFT, 9); // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en
// describes the margins and the buttons order but basically it is
//
// [Help] [Alternative] [Cancel] [Affirmative]
//
// in general case but, somewhat confusingly, the native message box
// uses "No Yes Cancel" with these particular buttons so do we as well.
// Flags ensuring that margins between the buttons are 6 pixels.
const wxSizerFlags
flagsBtn = wxSizerFlags().Centre().Border(wxLEFT | wxRIGHT, 3);
// Margin around the entire sizer button should be 12.
AddSpacer(9);
if (m_buttonHelp) if (m_buttonHelp)
Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); Add(m_buttonHelp, flagsBtn);
// extra whitespace between help and cancel/ok buttons // extra whitespace between help and cancel/ok buttons
Add(0, 0, 1, wxEXPAND, 0); AddStretchSpacer();
if (m_buttonNegative){ if (m_buttonNegative)
Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); Add(m_buttonNegative, flagsBtn);
}
if (m_buttonApply) if (m_buttonApply)
{ {
// according to HIG, in explicit apply windows the order is: Add(m_buttonApply, flagsBtn);
// [ Help Apply Cancel OK ]
Add((wxWindow*)m_buttonApply,
0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
if (m_buttonCancel) if (m_buttonCancel)
Add((wxWindow*)m_buttonCancel, Add(m_buttonCancel, flagsBtn);
0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
if (m_buttonAffirmative) if (m_buttonAffirmative)
Add((wxWindow*)m_buttonAffirmative, Add(m_buttonAffirmative, flagsBtn);
0, wxALIGN_CENTRE | wxLEFT, 6);
} }
else else // No [Apply]
{ {
// without an Apply button, have the buttons representing
// affirmative and negative close to each other.
if (m_buttonAffirmative) if (m_buttonAffirmative)
Add((wxWindow*)m_buttonAffirmative, Add(m_buttonAffirmative, flagsBtn);
0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
if (m_buttonCancel) if (m_buttonCancel)
Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT, 6); Add(m_buttonCancel, flagsBtn);
} }
// Ensure that the right margin is 12 as well.
AddSpacer(9);
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
// Windows // Windows