/////////////////////////////////////////////////////////////////////////////
-// Name: artstd.cpp
+// Name: src/gtk/artstd.cpp
// Purpose: stock wxArtProvider instance with native GTK+ stock icons
// Author: Vaclav Slavik
// Modified by:
#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
#include "wx/artprov.h"
-#include "wx/module.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/module.h"
+#endif
+
+#include "wx/gtk/private.h"
#include <gtk/gtk.h>
/*static*/ void wxArtProvider::InitNativeProvider()
{
- wxArtProvider::PushProvider(new wxGTK2ArtProvider);
+ wxArtProvider::Push(new wxGTK2ArtProvider);
}
// ----------------------------------------------------------------------------
{
#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, )
ART(wxART_FIND, GTK_STOCK_FIND)
ART(wxART_FIND_AND_REPLACE, GTK_STOCK_FIND_AND_REPLACE)
#endif
-
+
return NULL;
-
+
#undef ART
}
// 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;
{
distance = dist;
best = s_sizes[i].icon;
- }
+ }
}
return best;
}
// 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.
-
+
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));
+ g_object_ref(gs_gtkStyle);
gtk_widget_destroy(widget);
}
{
gtk_icon_size_lookup(iconsize, &size.x, &size.y);
}
-
+
return gtk_icon_theme_load_icon(
gtk_icon_theme_get_default(),
iconname,
{
wxCharBuffer stockid = wxArtIDToStock(id);
GtkIconSize stocksize = (size == wxDefaultSize) ?
- wxArtClientToIconSize(client) :
+ wxArtClientToIconSize(client) :
FindClosestIconSize(size);
// we must have some size, this is arbitrary
GDK_INTERP_BILINEAR);
if (p2)
{
- gdk_pixbuf_unref(pixbuf);
+ g_object_unref (pixbuf);
pixbuf = p2;
}
}
-
+
if (!pixbuf)
return wxNullBitmap;
{
if (gs_gtkStyle)
{
- g_object_unref(G_OBJECT(gs_gtkStyle));
+ g_object_unref(gs_gtkStyle);
gs_gtkStyle = NULL;
}
}