From 5d7457f9cac3386bbc4f16066b0f45fb2da7acea Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Mon, 15 Nov 2004 11:15:08 +0000
Subject: [PATCH] fixed to work with themes that redefine icons (e.g. Fedora's
 Bluecurve)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/artgtk.cpp  | 40 +++++++++++++++++++++++++++++++++++++---
 src/gtk1/artgtk.cpp | 40 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index 2ae43ddbf8..6302fbb37a 100644
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -23,6 +23,7 @@
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
 
 #include "wx/artprov.h"
+#include "wx/module.h"
 
 #include <gtk/gtk.h>
 
@@ -159,6 +160,9 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
     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
@@ -169,13 +173,21 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
     //        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(G_OBJECT(gs_gtkStyle));
+        gtk_widget_destroy(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);
 }
@@ -242,4 +254,26 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
     return bmp;
 }
 
+// ----------------------------------------------------------------------------
+// Cleanup
+// ----------------------------------------------------------------------------
+
+class wxArtGtkModule: public wxModule
+{
+public:
+    bool OnInit() { return true; }
+    void OnExit()
+    {
+        if (gs_gtkStyle)
+        {
+            g_object_unref(G_OBJECT(gs_gtkStyle));
+            gs_gtkStyle = NULL;
+        }
+    }
+
+    DECLARE_DYNAMIC_CLASS(wxArtGtkModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxArtGtkModule, wxModule)
+
 #endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
diff --git a/src/gtk1/artgtk.cpp b/src/gtk1/artgtk.cpp
index 2ae43ddbf8..6302fbb37a 100644
--- a/src/gtk1/artgtk.cpp
+++ b/src/gtk1/artgtk.cpp
@@ -23,6 +23,7 @@
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
 
 #include "wx/artprov.h"
+#include "wx/module.h"
 
 #include <gtk/gtk.h>
 
@@ -159,6 +160,9 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
     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
@@ -169,13 +173,21 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
     //        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(G_OBJECT(gs_gtkStyle));
+        gtk_widget_destroy(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);
 }
@@ -242,4 +254,26 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
     return bmp;
 }
 
+// ----------------------------------------------------------------------------
+// Cleanup
+// ----------------------------------------------------------------------------
+
+class wxArtGtkModule: public wxModule
+{
+public:
+    bool OnInit() { return true; }
+    void OnExit()
+    {
+        if (gs_gtkStyle)
+        {
+            g_object_unref(G_OBJECT(gs_gtkStyle));
+            gs_gtkStyle = NULL;
+        }
+    }
+
+    DECLARE_DYNAMIC_CLASS(wxArtGtkModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxArtGtkModule, wxModule)
+
 #endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
-- 
2.45.2