[glom] Update EggSpreadTable tests.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Update EggSpreadTable tests.
- Date: Thu, 6 Oct 2011 08:54:46 +0000 (UTC)
commit fdc7379ac21c3f0fba3a3aec9c0b5f4eb73ee29f
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Oct 6 10:54:31 2011 +0200
Update EggSpreadTable tests.
* glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc: Fix a crash.
* glom/utility_widgets/test_flowtable.cc:
* glom/utility_widgets/test_flowtable_dnd.cc: Adapt to the changed API.
ChangeLog | 8 ++++++++
.../eggspreadtablemm/test_spreadtablednd.cc | 6 +++---
glom/utility_widgets/test_flowtable.cc | 6 +++---
glom/utility_widgets/test_flowtable_dnd.cc | 3 +--
4 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e9eaf77..bc92459 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2011-10-06 Murray Cumming <murrayc murrayc com>
+ Update EggSpreadTable tests.
+
+ * glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc: Fix a crash.
+ * glom/utility_widgets/test_flowtable.cc:
+ * glom/utility_widgets/test_flowtable_dnd.cc: Adapt to the changed API.
+
+2011-10-06 Murray Cumming <murrayc murrayc com>
+
Update EggSpreadTable
* glom/utility_widgets/eggspreadtable/: Update from libegg with Tristan's
diff --git a/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc b/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc
index ee6f37f..84ef7a1 100644
--- a/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc
+++ b/glom/utility_widgets/eggspreadtablemm/test_spreadtablednd.cc
@@ -18,9 +18,9 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gtkmm.h>
#include <glom/utility_widgets/eggspreadtable/eggspreadtablednd.h>
#include <glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.h>
+#include <gtkmm.h>
static const guint INITIAL_HSPACING = 2;
static const guint INITIAL_VSPACING = 2;
@@ -117,7 +117,7 @@ on_combo_halign_changed()
}
static bool
-on_spreadtable_parent_drop_possible(Gtk::Widget* /* child */)
+on_spreadtable_parent_drop_possible(Gtk::Widget* /* child */, bool& drop_possible)
{
if(parent_accepts_drops)
return true;
@@ -126,7 +126,7 @@ on_spreadtable_parent_drop_possible(Gtk::Widget* /* child */)
}
static bool
-on_inner_spreadtable_drop_possible(Gtk::Widget* /* child */)
+on_inner_spreadtable_drop_possible(Gtk::Widget* /* child */, bool& drop_possible)
{
if(child_accepts_drops)
return true;
diff --git a/glom/utility_widgets/test_flowtable.cc b/glom/utility_widgets/test_flowtable.cc
index 87036f1..bfceb6e 100644
--- a/glom/utility_widgets/test_flowtable.cc
+++ b/glom/utility_widgets/test_flowtable.cc
@@ -80,17 +80,17 @@ static void fill_flowtable(Glom::FlowTable& flowtable)
static void clear_flowtable(Glom::FlowTable& flowtable)
{
+ flowtable.remove_all();
+
//std::cout << G_STRFUNC << ": debug 1" << std::endl;
for(type_vec_widgets::iterator iter = vec_child_widgets.begin(); iter != vec_child_widgets.end(); ++iter)
{
Gtk::Widget* widget = *iter;
//std::cout << " loop: widget=" << widget << std::endl;
- delete widget;
+ delete widget; //TODO: This crashes
}
vec_child_widgets.clear();
-
- flowtable.remove_all();
}
int
diff --git a/glom/utility_widgets/test_flowtable_dnd.cc b/glom/utility_widgets/test_flowtable_dnd.cc
index 6c3a3ec..93facf9 100644
--- a/glom/utility_widgets/test_flowtable_dnd.cc
+++ b/glom/utility_widgets/test_flowtable_dnd.cc
@@ -18,9 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gtkmm.h>
#include "flowtable_dnd.h"
-
+#include <gtkmm.h>
//#include "dragwindow.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]