fixed wxXmlResource::Load's detection of filenames to be done as early as possible

[wxWidgets.git] / src / gtk / artgtk.cpp

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index 6153868e5c0834e93917839e1933b3cbaafdb07a..7bc18ba46cf755936ba1d66261d3ca73ed1a7f60 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -20,20 +20,8 @@
     #pragma hdrstop
 #endif
 
-#if !defined(__WXUNIVERSAL__)
-
 #include "wx/artprov.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/module.h"
-#endif
-
-#include <gtk/gtkversion.h>
-#if GTK_CHECK_VERSION(2, 9, 0)
-    // gtk_object_sink
-    #undef GTK_DISABLE_DEPRECATED
-#endif
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
 
 // compatibility with older GTK+ versions:
 #ifndef GTK_STOCK_FILE
@@ -64,7 +52,10 @@ protected:
 // CreateBitmap routine
 // ----------------------------------------------------------------------------
 
-static const char *wxArtIDToStock(const wxArtID& id)
+namespace
+{
+
+const char *wxArtIDToStock(const wxArtID& id)
 {
     #define ART(wxid, gtkid) \
            if (id == wxid) return gtkid;
@@ -130,7 +121,7 @@ static const char *wxArtIDToStock(const wxArtID& id)
     #undef ART
 }
 
-GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
+GtkIconSize ArtClientToIconSize(const wxArtClient& client)
 {
     if (client == wxART_TOOLBAR)
         return GTK_ICON_SIZE_LARGE_TOOLBAR;
@@ -144,7 +135,7 @@ GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
         return GTK_ICON_SIZE_INVALID; // this is arbitrary
 }
 
-static GtkIconSize FindClosestIconSize(const wxSize& size)
+GtkIconSize FindClosestIconSize(const wxSize& size)
 {
     #define NUM_SIZES 6
     static struct
@@ -191,10 +182,7 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
     return best;
 }
 
-
-static GtkStyle *gs_gtkStyle = NULL;
-
-static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
+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
@@ -204,26 +192,18 @@ 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.
 
-    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);
+    GtkStyle* style = wxGTKPrivate::GetButtonWidget()->style;
+    GtkIconSet* iconset = gtk_style_lookup_icon_set(style, stockid);
 
     if (!iconset)
         return NULL;
 
-    return gtk_icon_set_render_icon(iconset, gs_gtkStyle,
+    return gtk_icon_set_render_icon(iconset, style,
                                     gtk_widget_get_default_direction(),
                                     GTK_STATE_NORMAL, size, NULL, NULL);
 }
 
-static GdkPixbuf *CreateThemeIcon(const char *iconname,
+GdkPixbuf *CreateThemeIcon(const char *iconname,
                                   GtkIconSize iconsize, const wxSize& sz)
 {
     wxSize size(sz);
@@ -239,13 +219,15 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname,
                     (GtkIconLookupFlags)0, NULL);
 }
 
+} // anonymous namespace
+
 wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                          const wxArtClient& client,
                                          const wxSize& size)
 {
     wxCharBuffer stockid = wxArtIDToStock(id);
     GtkIconSize stocksize = (size == wxDefaultSize) ?
-                                wxArtClientToIconSize(client) :
+                                ArtClientToIconSize(client) :
                                 FindClosestIconSize(size);
 
     // we must have some size, this is arbitrary
@@ -281,25 +263,18 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
 }
 
 // ----------------------------------------------------------------------------
-// Cleanup
+// wxArtProvider::GetNativeSizeHint()
 // ----------------------------------------------------------------------------
 
-class wxArtGtkModule: public wxModule
+/*static*/
+wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)
 {
-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__)
+    // Gtk has specific sizes for each client, see artgtk.cpp
+    GtkIconSize gtk_size = ArtClientToIconSize(client);
+    // no size hints for this client
+    if (gtk_size == GTK_ICON_SIZE_INVALID)
+        return wxDefaultSize;
+    gint width, height;
+    gtk_icon_size_lookup( gtk_size, &width, &height);
+    return wxSize(width, height);
+}