[glom] Fix the build with --enable-warnings=fatal.



commit ef2dfddaccb1ebd32fc9eb515865aea07788c566
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Oct 9 16:58:33 2011 +0200

    Fix the build with --enable-warnings=fatal.
    
    * glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc:
    Signal callbacks: Actually use drop_possible.

 ChangeLog                                          |    7 +++++++
 .../eggspreadtablemm/eggspreadtabledndmm.cc        |   20 ++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5ff0f72..7d175dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-09  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with --enable-warnings=fatal.
+
+	* glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc:
+	Signal callbacks: Actually use drop_possible.
+
 2011-10-07  Murray Cumming  <murrayc murrayc com>
 
 	Fields: Adapt choices fields when changing field names.
diff --git a/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc b/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc
index aa9c5e6..6ce8fa2 100644
--- a/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc
+++ b/glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc
@@ -41,7 +41,7 @@ namespace
 static gboolean EggSpreadTableDnd_signal_widget_drop_possible_callback(EggSpreadTableDnd* self, GtkWidget* p0, gboolean* drop_possible, void* data)
 {
   using namespace Egg;
-  typedef sigc::slot< bool, Gtk::Widget* > SlotType;
+  typedef sigc::slot< bool, Gtk::Widget*, bool& > SlotType;
 
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
@@ -51,8 +51,12 @@ static gboolean EggSpreadTableDnd_signal_widget_drop_possible_callback(EggSpread
     {
     #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
-        return static_cast<int>((*static_cast<SlotType*>(slot))(Glib::wrap(p0)
-));
+      {
+        bool cpp_drop_possible = false;
+        const gboolean result = static_cast<int>((*static_cast<SlotType*>(slot))(Glib::wrap(p0), cpp_drop_possible));
+        *drop_possible = cpp_drop_possible;
+        return result;
+      }
     #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
@@ -69,7 +73,7 @@ static gboolean EggSpreadTableDnd_signal_widget_drop_possible_callback(EggSpread
 static gboolean EggSpreadTableDnd_signal_widget_drop_possible_notify_callback(EggSpreadTableDnd* self, GtkWidget* p0, gboolean* drop_possible, void* data)
 {
   using namespace Egg;
-  typedef sigc::slot< bool, Gtk::Widget* > SlotType;
+  typedef sigc::slot< bool, Gtk::Widget*, bool& > SlotType;
 
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
@@ -79,8 +83,12 @@ static gboolean EggSpreadTableDnd_signal_widget_drop_possible_notify_callback(Eg
     {
     #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
-        (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
-);
+      {
+        bool cpp_drop_possible = false;
+        const gboolean result = static_cast<int>((*static_cast<SlotType*>(slot))(Glib::wrap(p0), cpp_drop_possible));
+        *drop_possible = cpp_drop_possible;
+        return result;
+      }
     #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)



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