[glom] Fix the build with latest gtkmm.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Fix the build with latest gtkmm.
- Date: Mon, 13 Dec 2010 11:08:13 +0000 (UTC)
commit 6dac6337dcd7a185214dd44f27735235782207f7
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Dec 13 12:07:56 2010 +0100
Fix the build with latest gtkmm.
* glom/mode_design/print_layouts/window_print_layout_edit.cc:
Use Widget::render_icon_pixbuf() instead of the old render_icon() method.
ChangeLog | 7 +++++++
.../print_layouts/window_print_layout_edit.cc | 2 +-
.../utility_widgets/canvas/canvas_image_movable.cc | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b5e6967..b83912c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-13 Murray Cumming <murrayc murrayc com>
+
+ Fix the build with latest gtkmm.
+
+ * glom/mode_design/print_layouts/window_print_layout_edit.cc:
+ Use Widget::render_icon_pixbuf() instead of the old render_icon() method.
+
2010-12-08 Murray Cumming <murrayc murrayc com>
Partial port to recent gtkmm API changes from git master.
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.cc b/glom/mode_design/print_layouts/window_print_layout_edit.cc
index 5f16606..72f8dd0 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.cc
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.cc
@@ -245,7 +245,7 @@ Glib::RefPtr<Gdk::Pixbuf> Window_PrintLayout_Edit::get_icon_for_toolbar_item(Gtk
const Gtk::StockID stock_id = action->property_stock_id();
if(!(stock_id.get_string().empty())) //The operator bool() is only in later versions of gtkmm 2.*.x
{
- result = item.render_icon(stock_id, Gtk::ICON_SIZE_LARGE_TOOLBAR);
+ result = item.render_icon_pixbuf(stock_id, Gtk::ICON_SIZE_LARGE_TOOLBAR);
}
else
{
diff --git a/glom/utility_widgets/canvas/canvas_image_movable.cc b/glom/utility_widgets/canvas/canvas_image_movable.cc
index f8bc8ea..d823437 100644
--- a/glom/utility_widgets/canvas/canvas_image_movable.cc
+++ b/glom/utility_widgets/canvas/canvas_image_movable.cc
@@ -197,7 +197,7 @@ void CanvasImageMovable::set_image_empty()
Glib::RefPtr<Gdk::Pixbuf> pixbuf;
if(widget)
- pixbuf = widget->render_icon(Gtk::Stock::MISSING_IMAGE, Gtk::ICON_SIZE_DIALOG);
+ pixbuf = widget->render_icon_pixbuf(Gtk::Stock::MISSING_IMAGE, Gtk::ICON_SIZE_DIALOG);
property_pixbuf() = pixbuf;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]