allow passing literal strings and results of c_str() to SetXXXLabels() methods too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -46,6 +46,21 @@ public:
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ButtonLabel(const char *label)
|
||||||
|
: m_label(label), m_stockId(wxID_NONE)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
ButtonLabel(const wchar_t *label)
|
||||||
|
: m_label(label), m_stockId(wxID_NONE)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
ButtonLabel(const wxCStrData& label)
|
||||||
|
: m_label(label), m_stockId(wxID_NONE)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
// default copy ctor and dtor are ok
|
// default copy ctor and dtor are ok
|
||||||
|
|
||||||
// get the string label, whether it was originally specified directly
|
// get the string label, whether it was originally specified directly
|
||||||
@@ -122,8 +137,7 @@ public:
|
|||||||
m_extendedMessage = extendedMessage;
|
m_extendedMessage = extendedMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
// change the dialog style flag
|
||||||
// common validation of wxMessageDialog style
|
|
||||||
void SetMessageDialogStyle(long style)
|
void SetMessageDialogStyle(long style)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || !(style & wxYES_NO),
|
wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || !(style & wxYES_NO),
|
||||||
@@ -135,6 +149,7 @@ protected:
|
|||||||
m_dialogStyle = style;
|
m_dialogStyle = style;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
long GetMessageDialogStyle() const { return m_dialogStyle; }
|
long GetMessageDialogStyle() const { return m_dialogStyle; }
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user