X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5ab476a0f4107b37180e5edd25ac30f8eab1d3b..883ea3bf80503de1f2aa797ce91acda654d88d74:/src/gtk/artgtk.cpp?ds=sidebyside diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp index 2ae43ddbf8..07d8f4cf4c 100644 --- a/src/gtk/artgtk.cpp +++ b/src/gtk/artgtk.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: artstd.cpp +// Name: src/gtk/artstd.cpp // Purpose: stock wxArtProvider instance with native GTK+ stock icons // Author: Vaclav Slavik // Modified by: @@ -20,10 +20,19 @@ #pragma hdrstop #endif -#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) +#if !defined(__WXUNIVERSAL__) #include "wx/artprov.h" +#ifndef WX_PRECOMP + #include "wx/module.h" +#endif + +#include +#if GTK_CHECK_VERSION(2, 9, 0) + // gtk_object_sink + #undef GTK_DISABLE_DEPRECATED +#endif #include // compatibility with older GTK+ versions: @@ -48,7 +57,7 @@ protected: /*static*/ void wxArtProvider::InitNativeProvider() { - wxArtProvider::PushProvider(new wxGTK2ArtProvider); + Push(new wxGTK2ArtProvider); } // ---------------------------------------------------------------------------- @@ -59,12 +68,12 @@ static const char *wxArtIDToStock(const wxArtID& id) { #define ART(wxid, gtkid) \ if (id == wxid) return gtkid; - + ART(wxART_ERROR, GTK_STOCK_DIALOG_ERROR) ART(wxART_INFORMATION, GTK_STOCK_DIALOG_INFO) ART(wxART_WARNING, GTK_STOCK_DIALOG_WARNING) ART(wxART_QUESTION, GTK_STOCK_DIALOG_QUESTION) - + //ART(wxART_HELP_SIDE_PANEL, ) ART(wxART_HELP_SETTINGS, GTK_STOCK_SELECT_FONT) //ART(wxART_HELP_BOOK, ) @@ -86,19 +95,46 @@ static const char *wxArtIDToStock(const wxArtID& id) //ART(wxART_REPORT_VIEW, ) //ART(wxART_LIST_VIEW, ) //ART(wxART_NEW_DIR, ) +#ifdef __WXGTK24__ ART(wxART_FOLDER, GTK_STOCK_DIRECTORY) + ART(wxART_FOLDER_OPEN, GTK_STOCK_DIRECTORY) +#endif //ART(wxART_GO_DIR_UP, ) ART(wxART_EXECUTABLE_FILE, GTK_STOCK_EXECUTE) ART(wxART_NORMAL_FILE, GTK_STOCK_FILE) ART(wxART_TICK_MARK, GTK_STOCK_APPLY) ART(wxART_CROSS_MARK, GTK_STOCK_CANCEL) - + +#ifdef __WXGTK24__ + ART(wxART_FLOPPY, GTK_STOCK_FLOPPY) + ART(wxART_CDROM, GTK_STOCK_CDROM) + ART(wxART_HARDDISK, GTK_STOCK_HARDDISK) + ART(wxART_REMOVABLE, GTK_STOCK_HARDDISK) + + ART(wxART_FILE_SAVE, GTK_STOCK_SAVE) + ART(wxART_FILE_SAVE_AS, GTK_STOCK_SAVE_AS) + + ART(wxART_COPY, GTK_STOCK_COPY) + 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) + + ART(wxART_QUIT, GTK_STOCK_QUIT) + + ART(wxART_FIND, GTK_STOCK_FIND) + ART(wxART_FIND_AND_REPLACE, GTK_STOCK_FIND_AND_REPLACE) +#endif + return NULL; - + #undef ART } -static GtkIconSize wxArtClientToIconSize(const wxArtClient& client) +GtkIconSize wxArtClientToIconSize(const wxArtClient& client) { if (client == wxART_TOOLBAR) return GTK_ICON_SIZE_LARGE_TOOLBAR; @@ -109,7 +145,7 @@ static 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) @@ -145,8 +181,8 @@ static GtkIconSize FindClosestIconSize(const wxSize& size) // only use larger bitmaps, scaling down looks better than scaling up: if (size.x > s_sizes[i].x || size.y > s_sizes[i].y) continue; - - unsigned dist = (size.x - s_sizes[i].x) * (size.x - s_sizes[i].x) + + + unsigned dist = (size.x - s_sizes[i].x) * (size.x - s_sizes[i].x) + (size.y - s_sizes[i].y) * (size.y - s_sizes[i].y); if (dist == 0) return s_sizes[i].icon; @@ -154,33 +190,44 @@ static GtkIconSize FindClosestIconSize(const wxSize& size) { distance = dist; best = s_sizes[i].icon; - } + } } return best; } + +static GtkStyle *gs_gtkStyle = NULL; + static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size) { // FIXME: This code is not 100% correct, because stock pixmap are // context-dependent and may be affected by theme engine, the // correct value can only be obtained for given GtkWidget object. - // + // // Fool-proof implementation of stock bitmaps would extend wxBitmap // with "stock-id" representation (in addition to pixmap and pixbuf // ones) and would convert it to pixbuf when rendered. - - GtkStyle *style = gtk_widget_get_default_style(); - GtkIconSet *iconset = gtk_style_lookup_icon_set(style, stockid); + + if (gs_gtkStyle == NULL) + { + GtkWidget *widget = gtk_button_new(); + gs_gtkStyle = gtk_rc_get_style(widget); + wxASSERT( gs_gtkStyle != NULL ); + g_object_ref(gs_gtkStyle); + gtk_object_sink((GtkObject*)widget); + } + + GtkIconSet *iconset = gtk_style_lookup_icon_set(gs_gtkStyle, stockid); if (!iconset) return NULL; - return gtk_icon_set_render_icon(iconset, style, + return gtk_icon_set_render_icon(iconset, gs_gtkStyle, gtk_widget_get_default_direction(), GTK_STATE_NORMAL, size, NULL, NULL); } -#if GTK_CHECK_VERSION(2,4,0) +#ifdef __WXGTK24__ static GdkPixbuf *CreateThemeIcon(const char *iconname, GtkIconSize iconsize, const wxSize& sz) { @@ -189,14 +236,14 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname, { gtk_icon_size_lookup(iconsize, &size.x, &size.y); } - + return gtk_icon_theme_load_icon( gtk_icon_theme_get_default(), iconname, size.x, (GtkIconLookupFlags)0, NULL); } -#endif // GTK+ >= 2.4.0 +#endif wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, const wxArtClient& client, @@ -204,18 +251,24 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, { wxCharBuffer stockid = wxArtIDToStock(id); GtkIconSize stocksize = (size == wxDefaultSize) ? - wxArtClientToIconSize(client) : + 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(); GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize); -#if GTK_CHECK_VERSION(2,4,0) - if (!pixbuf) +#ifdef __WXGTK24__ + if (!pixbuf && !gtk_check_version(2,4,0)) + { pixbuf = CreateThemeIcon(stockid, stocksize, size); + } #endif if (pixbuf && size != wxDefaultSize && @@ -226,20 +279,38 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, GDK_INTERP_BILINEAR); if (p2) { - gdk_pixbuf_unref(pixbuf); + g_object_unref (pixbuf); pixbuf = p2; } } - - if (!pixbuf) - return wxNullBitmap; wxBitmap bmp; - bmp.SetWidth(gdk_pixbuf_get_width(pixbuf)); - bmp.SetHeight(gdk_pixbuf_get_height(pixbuf)); - bmp.SetPixbuf(pixbuf); + if (pixbuf != NULL) + bmp.SetPixbuf(pixbuf); return bmp; } -#endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) +// ---------------------------------------------------------------------------- +// Cleanup +// ---------------------------------------------------------------------------- + +class wxArtGtkModule: public wxModule +{ +public: + bool OnInit() { return true; } + void OnExit() + { + if (gs_gtkStyle) + { + g_object_unref(gs_gtkStyle); + gs_gtkStyle = NULL; + } + } + + DECLARE_DYNAMIC_CLASS(wxArtGtkModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxArtGtkModule, wxModule) + +#endif // !defined(__WXUNIVERSAL__)