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

fixed to work with themes that redefine icons (e.g. Fedora's Bluecurve)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-11-15 11:15:08 +00:00
parent 862f336798
commit 5d7457f9ca
2 changed files with 74 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/gtk/artgtk.cpp
View File

@@ -23,6 +23,7 @@
#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
#include "wx/artprov.h" #include "wx/artprov.h"
#include "wx/module.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@@ -159,6 +160,9 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
return best; return best;
} }
static GtkStyle *gs_gtkStyle = NULL;
static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size) static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
{ {
// FIXME: This code is not 100% correct, because stock pixmap are // 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 // with "stock-id" representation (in addition to pixmap and pixbuf
// ones) and would convert it to pixbuf when rendered. // ones) and would convert it to pixbuf when rendered.
GtkStyle *style = gtk_widget_get_default_style(); if (gs_gtkStyle == NULL)
GtkIconSet *iconset = gtk_style_lookup_icon_set(style, stockid); {
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) if (!iconset)
return NULL; 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_widget_get_default_direction(),
GTK_STATE_NORMAL, size, NULL, NULL); GTK_STATE_NORMAL, size, NULL, NULL);
} }
@@ -242,4 +254,26 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
return bmp; 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__) #endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)

40
src/gtk1/artgtk.cpp
View File

@@ -23,6 +23,7 @@
#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
#include "wx/artprov.h" #include "wx/artprov.h"
#include "wx/module.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@@ -159,6 +160,9 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
return best; return best;
} }
static GtkStyle *gs_gtkStyle = NULL;
static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size) static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
{ {
// FIXME: This code is not 100% correct, because stock pixmap are // 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 // with "stock-id" representation (in addition to pixmap and pixbuf
// ones) and would convert it to pixbuf when rendered. // ones) and would convert it to pixbuf when rendered.
GtkStyle *style = gtk_widget_get_default_style(); if (gs_gtkStyle == NULL)
GtkIconSet *iconset = gtk_style_lookup_icon_set(style, stockid); {
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) if (!iconset)
return NULL; 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_widget_get_default_direction(),
GTK_STATE_NORMAL, size, NULL, NULL); GTK_STATE_NORMAL, size, NULL, NULL);
} }
@@ -242,4 +254,26 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
return bmp; 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__) #endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)