diff options
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/dock-item.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/dock.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/imagetoggler.cpp | 26 | ||||
| -rw-r--r-- | src/ui/widget/imagetoggler.h | 13 |
4 files changed, 36 insertions, 11 deletions
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp index 0f93968e5..b9cc50845 100644 --- a/src/ui/widget/dock-item.cpp +++ b/src/ui/widget/dock-item.cpp @@ -58,7 +58,11 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l Gtk::StockItem item; Gtk::StockID stockId(icon_name); if ( Gtk::StockItem::lookup(stockId, item) ) { +#if WITH_GTKMM_3_0 + _icon_pixbuf = _dock.getWidget().render_icon_pixbuf( stockId, Gtk::ICON_SIZE_MENU ); +#else _icon_pixbuf = _dock.getWidget().render_icon( stockId, Gtk::ICON_SIZE_MENU ); +#endif } } } diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp index ab3a8adca..a7dabef1c 100644 --- a/src/ui/widget/dock.cpp +++ b/src/ui/widget/dock.cpp @@ -25,7 +25,7 @@ namespace Widget { namespace { -void hideCallback(GtkObject */*object*/, gpointer dock_ptr) +void hideCallback(GObject * /*object*/, gpointer dock_ptr) { g_return_if_fail( dock_ptr != NULL ); @@ -33,7 +33,7 @@ void hideCallback(GtkObject */*object*/, gpointer dock_ptr) dock->hide(); } -void unhideCallback(GtkObject */*object*/, gpointer dock_ptr) +void unhideCallback(GObject * /*object*/, gpointer dock_ptr) { g_return_if_fail( dock_ptr != NULL ); diff --git a/src/ui/widget/imagetoggler.cpp b/src/ui/widget/imagetoggler.cpp index 6517219f2..73c343887 100644 --- a/src/ui/widget/imagetoggler.cpp +++ b/src/ui/widget/imagetoggler.cpp @@ -71,17 +71,27 @@ ImageToggler::get_size_vfunc( Gtk::Widget& widget, } } - -void -ImageToggler::render_vfunc( const Glib::RefPtr<Gdk::Drawable>& window, - Gtk::Widget& widget, - const Gdk::Rectangle& background_area, - const Gdk::Rectangle& cell_area, - const Gdk::Rectangle& expose_area, - Gtk::CellRendererState flags ) +#if WITH_GTKMM_3_0 +void ImageToggler::render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, + Gtk::Widget& widget, + const Gdk::Rectangle& background_area, + const Gdk::Rectangle& cell_area, + Gtk::CellRendererState flags ) +#else +void ImageToggler::render_vfunc( const Glib::RefPtr<Gdk::Drawable>& window, + Gtk::Widget& widget, + const Gdk::Rectangle& background_area, + const Gdk::Rectangle& cell_area, + const Gdk::Rectangle& expose_area, + Gtk::CellRendererState flags ) +#endif { property_pixbuf() = _property_active.get_value() ? _property_pixbuf_on : _property_pixbuf_off; +#if WITH_GTKMM_3_0 + Gtk::CellRendererPixbuf::render_vfunc( cr, widget, background_area, cell_area, flags ); +#else Gtk::CellRendererPixbuf::render_vfunc( window, widget, background_area, cell_area, expose_area, flags ); +#endif } bool diff --git a/src/ui/widget/imagetoggler.h b/src/ui/widget/imagetoggler.h index 6389ce8af..0a20fe7ed 100644 --- a/src/ui/widget/imagetoggler.h +++ b/src/ui/widget/imagetoggler.h @@ -10,6 +10,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#if HAVE_CONFIG_H +#include "config.h" +#endif + #include <glibmm/property.h> #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> @@ -37,13 +41,20 @@ protected: Gdk::Rectangle const *cell_area, int *x_offset, int *y_offset, int *width, int *height ) const; - +#if WITH_GTKMM_3_0 + virtual void render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr, + Gtk::Widget& widget, + const Gdk::Rectangle& background_area, + const Gdk::Rectangle& cell_area, + Gtk::CellRendererState flags ); +#else virtual void render_vfunc( const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags ); +#endif virtual bool activate_vfunc(GdkEvent *event, Gtk::Widget &widget, |