Allow using custom labels for wxGenericMessageDialog buttons.

Custom labels set for wxGenericMessageDialog buttons were simply ignored as it
used CreateSeparatedButtonSizer() to create the actual buttons which in turn
always used the standard labels.

Fix this by explicitly creating the buttons with custom labels if necessary.

This also fixes custom label support in wxGenericRichMessageDialog deriving
from this class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-08-30 21:48:21 +00:00
parent b14cca2a84
commit d20ba5f860
3 changed files with 79 additions and 5 deletions

View File

@ -12,6 +12,8 @@
#ifndef _WX_GENERIC_MSGDLGG_H_
#define _WX_GENERIC_MSGDLGG_H_
class WXDLLIMPEXP_FWD_CORE wxSizer;
class WXDLLIMPEXP_CORE wxGenericMessageDialog : public wxMessageDialogBase
{
public:
@ -37,6 +39,12 @@ protected:
virtual void AddMessageDialogDetails(wxSizer *WXUNUSED(sizer)) { }
private:
// Creates and returns a standard button sizer using the style of this
// dialog and the custom labels, if any.
//
// May return NULL on smart phone platforms not using buttons at all.
wxSizer *CreateMsgDlgButtonSizer();
wxPoint m_pos;
bool m_created;

View File

@ -242,6 +242,16 @@ protected:
var = label.GetAsString();
}
// these functions return the custom label or empty string and should be
// used only in specific circumstances such as creating the buttons with
// these labels (in which case it makes sense to only use a custom label if
// it was really given and fall back on stock label otherwise), use the
// Get{Yes,No,OK,Cancel}Label() methods above otherwise
const wxString& GetCustomYesLabel() const { return m_yes; }
const wxString& GetCustomNoLabel() const { return m_no; }
const wxString& GetCustomOKLabel() const { return m_ok; }
const wxString& GetCustomCancelLabel() const { return m_cancel; }
private:
// these functions may be overridden to provide different defaults for the
// default button labels (this is used by wxGTK)

View File

@ -93,6 +93,66 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
m_created = false;
}
wxSizer *wxGenericMessageDialog::CreateMsgDlgButtonSizer()
{
#ifndef __SMARTPHONE__
if ( HasCustomLabels() )
{
wxStdDialogButtonSizer * const sizerStd = new wxStdDialogButtonSizer;
wxButton *btnDef = NULL;
if ( m_dialogStyle & wxOK )
{
btnDef = new wxButton(this, wxID_OK, GetCustomOKLabel());
sizerStd->AddButton(btnDef);
}
if ( m_dialogStyle & wxCANCEL )
{
wxButton * const
cancel = new wxButton(this, wxID_CANCEL, GetCustomCancelLabel());
sizerStd->AddButton(cancel);
if ( m_dialogStyle & wxCANCEL_DEFAULT )
btnDef = cancel;
}
if ( m_dialogStyle & wxYES_NO )
{
wxButton * const
yes = new wxButton(this, wxID_YES, GetCustomYesLabel());
sizerStd->AddButton(yes);
wxButton * const
no = new wxButton(this, wxID_NO, GetCustomNoLabel());
sizerStd->AddButton(no);
if ( m_dialogStyle & wxNO_DEFAULT )
btnDef = no;
else if ( !btnDef )
btnDef = yes;
}
if ( btnDef )
{
btnDef->SetDefault();
btnDef->SetFocus();
}
sizerStd->Realize();
return CreateSeparatedSizer(sizerStd);
}
#endif // !__SMARTPHONE__
// Use standard labels for all buttons
return CreateSeparatedButtonSizer
(
m_dialogStyle & (wxOK | wxCANCEL | wxYES_NO |
wxNO_DEFAULT | wxCANCEL_DEFAULT)
);
}
void wxGenericMessageDialog::DoCreateMsgdialog()
{
wxDialog::Create(m_parent, wxID_ANY, m_caption, m_pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
@ -156,11 +216,7 @@ void wxGenericMessageDialog::DoCreateMsgdialog()
int center_flag = wxEXPAND;
if (m_dialogStyle & wxYES_NO)
center_flag = wxALIGN_CENTRE;
wxSizer *sizerBtn = CreateSeparatedButtonSizer
(
m_dialogStyle & (wxOK | wxCANCEL | wxYES_NO |
wxNO_DEFAULT | wxCANCEL_DEFAULT)
);
wxSizer *sizerBtn = CreateMsgDlgButtonSizer();
if ( sizerBtn )
topsizer->Add(sizerBtn, 0, center_flag | wxALL, 10 );