X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b737ad10dec946cd7d5e38c43c666e8efe89f0ae..b6cf9ad090a3ab83c3f14043af9798b61eaff1d3:/src/gtk/artgtk.cpp diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp index 47aa4c93db..c3da6e3e90 100644 --- a/src/gtk/artgtk.cpp +++ b/src/gtk/artgtk.cpp @@ -110,6 +110,7 @@ static const char *wxArtIDToStock(const wxArtID& id) ART(wxART_CUT, GTK_STOCK_CUT) ART(wxART_PASTE, GTK_STOCK_PASTE) ART(wxART_DELETE, GTK_STOCK_DELETE) + ART(wxART_NEW, GTK_STOCK_NEW) ART(wxART_UNDO, GTK_STOCK_UNDO) ART(wxART_REDO, GTK_STOCK_REDO) @@ -136,7 +137,7 @@ GtkIconSize wxArtClientToIconSize(const wxArtClient& client) else if (client == wxART_BUTTON) return GTK_ICON_SIZE_BUTTON; else - return GTK_ICON_SIZE_BUTTON; // this is arbitrary + return GTK_ICON_SIZE_INVALID; // this is arbitrary } static GtkIconSize FindClosestIconSize(const wxSize& size) @@ -245,6 +246,10 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, wxArtClientToIconSize(client) : FindClosestIconSize(size); + // we must have some size, this is arbitrary + if (stocksize == GTK_ICON_SIZE_INVALID) + stocksize = GTK_ICON_SIZE_BUTTON; + // allow passing GTK+ stock IDs to wxArtProvider: if (!stockid) stockid = id.ToAscii();