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

Don't avoid stock items with GTK+3

Browse Source 
They still work fine with GTK+3, we just have to avoid them with GTK+4
This commit is contained in:
Paul Cornett
2018-11-16 23:31:30 -08:00
parent de57bcd1bc
commit 29bd2c9274
4 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gtk/msgdlg.cpp
View File

@@ -49,47 +49,57 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
wxString wxMessageDialog::GetDefaultYesLabel() const
{
#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
#ifdef __WXGTK4__
return wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_YES));
#else
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
return GTK_STOCK_YES;
#endif // GTK >= 3.10 / < 3.10
wxGCC_WARNING_RESTORE()
#endif
}
wxString wxMessageDialog::GetDefaultNoLabel() const
{
#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
#ifdef __WXGTK4__
return wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_NO));
#else
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
return GTK_STOCK_NO;
#endif // GTK >= 3.10 / < 3.10
wxGCC_WARNING_RESTORE()
#endif
}
wxString wxMessageDialog::GetDefaultOKLabel() const
{
#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
#ifdef __WXGTK4__
return wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_OK));
#else
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
return GTK_STOCK_OK;
#endif // GTK >= 3.10 / < 3.10
wxGCC_WARNING_RESTORE()
#endif
}
wxString wxMessageDialog::GetDefaultCancelLabel() const
{
#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
#ifdef __WXGTK4__
return wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_CANCEL));
#else
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
return GTK_STOCK_CANCEL;
#endif // GTK >= 3.10 / < 3.10
wxGCC_WARNING_RESTORE()
#endif
}
wxString wxMessageDialog::GetDefaultHelpLabel() const
{
#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
#ifdef __WXGTK4__
return wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_HELP));
#else
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
return GTK_STOCK_HELP;
#endif // GTK >= 3.10 / < 3.10
wxGCC_WARNING_RESTORE()
#endif
}
void wxMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& label)
@@ -102,11 +112,11 @@ void wxMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& label)
}
else // stock label
{
#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
#ifdef __WXGTK4__
var = wxConvertMnemonicsToGTK(wxGetStockLabel(stockId));
#else
var = wxGetStockGtkID(stockId);
#endif // GTK >= 3.10 / < 3.10
#endif
}
}