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

fixes for stock items not known to some GTK+ versions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-08-15 19:08:22 +00:00
parent a650b927da
commit c20889abf8
3 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk1/button.cpp
View File

@@ -157,9 +157,19 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, wxStockItemID stock,
const wxValidator& validator, const wxString& name)
{
#ifdef __WXGTK20__
m_widget = gtk_button_new_from_stock(wxStockItemToGTK(stock));
return Create(parent, id, wxEmptyString,
pos, wxDefaultSize, style, validator, name);
const char *gtkstock = wxStockItemToGTK(stock);
if (gtkstock)
{
m_widget = gtk_button_new_from_stock(gtkstock);
return Create(parent, id, wxEmptyString,
pos, wxDefaultSize, style, validator, name);
}
else
{
// not supported by this GTK+ version
return Create(parent, id, wxGetStockItemLabel(stock),
pos, wxDefaultSize, style, validator, name);
}
#else
return CreateStock(parent, id, stock, descriptiveLabel,
pos, style, validator, name);