[niepce] Fix Gtk::Orientable implementation that was crashing on Gtkmm 3.12 due to duplicate property "orient



commit 5cb52f54aa4f4358e50653508053ba724dd962f3
Author: Hubert Figuière <hub figuiere net>
Date:   Fri Jul 4 17:53:28 2014 -0400

    Fix Gtk::Orientable implementation that was crashing on Gtkmm 3.12 due
    to duplicate property "orientation"
    
    Bump requirement to Gtkmm 3.12. By the time we ship this will be old.

 configure.ac                     |    2 +-
 src/niepce/ui/thumbstripview.cpp |   11 ++---------
 src/niepce/ui/thumbstripview.hpp |   16 ++--------------
 3 files changed, 5 insertions(+), 24 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4bd8c60..d6d4757 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl all the library version.
 dnl if one is harcoded elsewhere, it is a bug
 LIBGIOMM_VERSION=2.16
 LIBGLIBMM_VERSION=2.32
-LIBGTKMM_VERSION=3.4
+LIBGTKMM_VERSION=3.12
 EXEMPI_VERSION=2.2.0
 SQLITE_VERSION=3.0
 GEGL_VERSION=0.2.0
diff --git a/src/niepce/ui/thumbstripview.cpp b/src/niepce/ui/thumbstripview.cpp
index 443770a..edb8a8e 100644
--- a/src/niepce/ui/thumbstripview.cpp
+++ b/src/niepce/ui/thumbstripview.cpp
@@ -1,7 +1,7 @@
 /* Eye Of Gnome - Thumbnail View
  *
  * Copyright (C) 2006 The Free Software Foundation
- * Copyright (C) 2007-2013 Hubert Figuiere
+ * Copyright (C) 2007-2014 Hubert Figuiere
  *
  * C++-ization: Hubert Figuiere <hub figuiere net>
  * Original Author: Claudio Saavedra <csaavedra alumnos utalca cl>
@@ -75,16 +75,9 @@ ThumbStripCell::ThumbStripCell()
     set_drawflag(false);
 }
 
-ThumbStripViewBase::ThumbStripViewBase(const Glib::RefPtr<ui::ImageListStore> & store)
-    : Glib::ObjectBase(typeid(ThumbStripViewBase))
-    , Gtk::IconView(Glib::RefPtr<Gtk::TreeModel>::cast_dynamic(store))
-    , m_orientation_property(*this, "orientation")
-{
-}
-
 ThumbStripView::ThumbStripView(const Glib::RefPtr<ui::ImageListStore> & store)
     : Glib::ObjectBase(typeid(ThumbStripView))
-    , ThumbStripViewBase(store)
+    , Gtk::IconView(Glib::RefPtr<Gtk::TreeModel>::cast_dynamic(store))
     , Gtk::Orientable()
     , m_start_thumb(0)
     , m_end_thumb(0)
diff --git a/src/niepce/ui/thumbstripview.hpp b/src/niepce/ui/thumbstripview.hpp
index e46d94a..11ad8b5 100644
--- a/src/niepce/ui/thumbstripview.hpp
+++ b/src/niepce/ui/thumbstripview.hpp
@@ -1,7 +1,7 @@
 /*
  * niepce - niepce/ui/thumbstripview.hpp
  *
- * Copyright (C) 2009-2013 Hubert Figuiere
+ * Copyright (C) 2009-2014 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,20 +30,8 @@
 
 namespace ui {
 
-/** This is needed to implement the property
- * That must be registered before the Interface is registered
- */
-class ThumbStripViewBase
-    : public Gtk::IconView
-{
-protected:
-    ThumbStripViewBase(const Glib::RefPtr<ui::ImageListStore> & store);
-
-    Glib::Property<Gtk::Orientation> m_orientation_property;
-};
-
 class ThumbStripView
-  : public ThumbStripViewBase
+  : public Gtk::IconView
   , public Gtk::Orientable
 {
 public:


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