[gtkmm] Fix 'make check' after Gtk::Arrow has been deprecated



commit 45a751c83f3346bf7dd93649e537f700d24fcc54
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Wed May 21 16:42:04 2014 +0200

    Fix 'make check' after Gtk::Arrow has been deprecated
    
    * demos/gtk-demo/example_headerbar.cc:
    Use Gtk::Button::set_image_from_icon_name() instead of Gtk::Arrow.
    * gtk/src/arrow.hg: Add #define GDK_DISABLE_DEPRECATION_WARNINGS in arrow.cc.
    * gtk/src/filelist.am: Move arrow.hg to gtkmm_files_deprecated_hg.

 demos/gtk-demo/example_headerbar.cc |   21 ++++++++++++++-------
 gtk/src/arrow.hg                    |    5 +++++
 gtk/src/filelist.am                 |    2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/demos/gtk-demo/example_headerbar.cc b/demos/gtk-demo/example_headerbar.cc
index 8585e91..89d0641 100644
--- a/demos/gtk-demo/example_headerbar.cc
+++ b/demos/gtk-demo/example_headerbar.cc
@@ -11,6 +11,12 @@
 
 #include "gtkmm.h"
 
+// 2014-05-21: The pan-[up,down,left,right]-symbolic icons are new.
+// See https://bugzilla.gnome.org/show_bug.cgi?id=729565
+// If they are not available in your selected icon theme, perhaps you can
+// use the go-[up,down,previous,next]-symbolic icons.
+#define USE_PAN_ICON_NAMES 0
+
 class Example_HeaderBar : public Gtk::Window
 {
 public:
@@ -22,8 +28,6 @@ protected:
   // Widgets
   Gtk::Image m_send_receive_image;
   Gtk::Button m_send_receive_button;
-  Gtk::Arrow m_left_arrow;
-  Gtk::Arrow m_right_arrow;
   Gtk::Button m_left_arrow_button;
   Gtk::Button m_right_arrow_button;
   Gtk::TextView m_text_view;
@@ -44,9 +48,7 @@ Gtk::Window* do_headerbar()
 }
 
 Example_HeaderBar::Example_HeaderBar()
-: m_left_arrow(Gtk::ARROW_LEFT, Gtk::SHADOW_NONE),
-  m_right_arrow(Gtk::ARROW_RIGHT, Gtk::SHADOW_NONE),
-  m_arrow_buttons_box(Gtk::ORIENTATION_HORIZONTAL)
+: m_arrow_buttons_box(Gtk::ORIENTATION_HORIZONTAL)
 {
   // Window properties
   // Window title is set by header bar
@@ -88,8 +90,13 @@ void Example_HeaderBar::configure_arrow_buttons()
 {
   m_arrow_buttons_box.get_style_context()->add_class("linked");
 
-  m_left_arrow_button.add(m_left_arrow);
-  m_right_arrow_button.add(m_right_arrow);
+#if USE_PAN_ICON_NAMES
+  m_left_arrow_button.set_image_from_icon_name("pan-left-symbolic", Gtk::ICON_SIZE_BUTTON, true);
+  m_right_arrow_button.set_image_from_icon_name("pan-right-symbolic", Gtk::ICON_SIZE_BUTTON, true);
+#else
+  m_left_arrow_button.set_image_from_icon_name("go-previous-symbolic", Gtk::ICON_SIZE_BUTTON, true);
+  m_right_arrow_button.set_image_from_icon_name("go-next-symbolic", Gtk::ICON_SIZE_BUTTON, true);
+#endif
 
   m_arrow_buttons_box.add(m_left_arrow_button);
   m_arrow_buttons_box.add(m_right_arrow_button);
diff --git a/gtk/src/arrow.hg b/gtk/src/arrow.hg
index 24be5a7..be0677f 100644
--- a/gtk/src/arrow.hg
+++ b/gtk/src/arrow.hg
@@ -20,6 +20,11 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/misc_p.h)
 
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
 namespace Gtk
 {
 
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index cd5de02..ce9e361 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -28,7 +28,6 @@ gtkmm_files_any_hg =          \
        appchooserwidget.hg     \
        application.hg          \
        applicationwindow.hg    \
-       arrow.hg                \
        aspectframe.hg          \
        assistant.hg            \
        bin.hg                  \
@@ -212,6 +211,7 @@ gtkmm_files_x11_hg =            \
        socket.hg
 
 gtkmm_files_deprecated_hg =    \
+       arrow.hg                \
        colorselection.hg       \
        fontselection.hg        \
        handlebox.hg            \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]