[niepce] Remove warning about unnecessary Gtk::Orientable. Remove GtkArrow (deprecated)



commit 7d59d0d926289bc5f05fd8c233af0537df59984b
Author: Hubert Figuière <hub figuiere net>
Date:   Fri Oct 31 23:54:07 2014 -0400

    Remove warning about unnecessary Gtk::Orientable.
    Remove GtkArrow (deprecated)

 src/niepce/ui/thumb-view/eog-thumb-nav.cpp |   18 +++++++-----------
 src/niepce/ui/thumbstripview.cpp           |    5 +----
 src/niepce/ui/thumbstripview.hpp           |    1 -
 3 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/src/niepce/ui/thumb-view/eog-thumb-nav.cpp b/src/niepce/ui/thumb-view/eog-thumb-nav.cpp
index 85fecd3..eb33f93 100644
--- a/src/niepce/ui/thumb-view/eog-thumb-nav.cpp
+++ b/src/niepce/ui/thumb-view/eog-thumb-nav.cpp
@@ -311,7 +311,8 @@ eog_thumb_nav_init (EogThumbNav *nav)
         priv->button_left = gtk_button_new ();
        gtk_button_set_relief (GTK_BUTTON (priv->button_left), GTK_RELIEF_NONE);
 
-       arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_ETCHED_IN); 
+       arrow = gtk_image_new_from_icon_name ("pan-start-symbolic",
+                                              GTK_ICON_SIZE_BUTTON);
        gtk_container_add (GTK_CONTAINER (priv->button_left), arrow);
 
        gtk_widget_set_size_request (GTK_WIDGET (priv->button_left), 20, 0);
@@ -349,7 +350,8 @@ eog_thumb_nav_init (EogThumbNav *nav)
         priv->button_right = gtk_button_new ();
        gtk_button_set_relief (GTK_BUTTON (priv->button_right), GTK_RELIEF_NONE);
 
-       arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE); 
+       arrow = gtk_image_new_from_icon_name ("pan-end-symbolic",
+                                              GTK_ICON_SIZE_BUTTON);
        gtk_container_add (GTK_CONTAINER (priv->button_right), arrow);
 
        gtk_widget_set_size_request (GTK_WIDGET (priv->button_right), 20, 0);
@@ -431,9 +433,6 @@ eog_thumb_nav_set_mode (EogThumbNav *nav, EogThumbNavMode mode)
        switch (mode)
        {
        case EOG_THUMB_NAV_MODE_ONE_ROW:
-//             priv->thumbview->set_columns (-1);
-               priv->thumbview->set_orientation(Gtk::ORIENTATION_HORIZONTAL);
-
                priv->thumbview->set_size_request (-1, -1);
                priv->thumbview->set_item_height (100);
 
@@ -446,7 +445,6 @@ eog_thumb_nav_set_mode (EogThumbNav *nav, EogThumbNavMode mode)
                break;
 
        case EOG_THUMB_NAV_MODE_ONE_COLUMN:
-               priv->thumbview->set_orientation(Gtk::ORIENTATION_VERTICAL);
                priv->thumbview->set_columns (1);
 
                priv->thumbview->set_size_request (-1, -1);
@@ -458,11 +456,10 @@ eog_thumb_nav_set_mode (EogThumbNav *nav, EogThumbNavMode mode)
 
                gtk_widget_hide (priv->button_left);
                gtk_widget_hide (priv->button_right);
-               
+
                break;
 
        case EOG_THUMB_NAV_MODE_MULTIPLE_ROWS:
-               priv->thumbview->set_orientation(Gtk::ORIENTATION_VERTICAL);
                priv->thumbview->set_columns (-1);
 
                priv->thumbview->set_size_request (-1, -1);
@@ -474,11 +471,10 @@ eog_thumb_nav_set_mode (EogThumbNav *nav, EogThumbNavMode mode)
 
                gtk_widget_hide (priv->button_left);
                gtk_widget_hide (priv->button_right);
-               
+
                break;
 
        case EOG_THUMB_NAV_MODE_MULTIPLE_COLUMNS:
-               priv->thumbview->set_orientation(Gtk::ORIENTATION_VERTICAL);
                priv->thumbview->set_columns (-1);
 
                priv->thumbview->set_size_request (-1, -1);
@@ -490,7 +486,7 @@ eog_thumb_nav_set_mode (EogThumbNav *nav, EogThumbNavMode mode)
 
                gtk_widget_hide (priv->button_left);
                gtk_widget_hide (priv->button_right);
-               
+
                break;
        }
 }
diff --git a/src/niepce/ui/thumbstripview.cpp b/src/niepce/ui/thumbstripview.cpp
index edb8a8e..f9e93ad 100644
--- a/src/niepce/ui/thumbstripview.cpp
+++ b/src/niepce/ui/thumbstripview.cpp
@@ -78,7 +78,6 @@ ThumbStripCell::ThumbStripCell()
 ThumbStripView::ThumbStripView(const Glib::RefPtr<ui::ImageListStore> & store)
     : Glib::ObjectBase(typeid(ThumbStripView))
     , Gtk::IconView(Glib::RefPtr<Gtk::TreeModel>::cast_dynamic(store))
-    , Gtk::Orientable()
     , m_start_thumb(0)
     , m_end_thumb(0)
     , m_store(store)
@@ -156,9 +155,7 @@ void ThumbStripView::row_deleted(const Gtk::TreeModel::Path&)
 
 void ThumbStripView::update_item_count()
 {
-    if (get_orientation() == Gtk::ORIENTATION_HORIZONTAL) {
-        set_columns(m_model_item_count);
-    }
+    set_columns(m_model_item_count);
 }
 
 void
diff --git a/src/niepce/ui/thumbstripview.hpp b/src/niepce/ui/thumbstripview.hpp
index 11ad8b5..95ff908 100644
--- a/src/niepce/ui/thumbstripview.hpp
+++ b/src/niepce/ui/thumbstripview.hpp
@@ -32,7 +32,6 @@ namespace ui {
 
 class ThumbStripView
   : public Gtk::IconView
-  , public Gtk::Orientable
 {
 public:
     ThumbStripView(const Glib::RefPtr<ui::ImageListStore> & store);


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