[atomix/wip/gtk3-port] Removed gnomecanvas includes from files but board



commit f604fe214c7d70ef4d01a3194752fad4f86999a2
Author: Robert Roth <robert roth off gmail com>
Date:   Sun Jan 11 10:56:59 2015 +0200

    Removed gnomecanvas includes from files but board

 src/canvas_helper.h |    1 +
 src/goal.c          |    3 +--
 src/main.h          |    1 -
 src/undo.c          |    2 +-
 src/undo.h          |    4 ++--
 5 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/src/canvas_helper.h b/src/canvas_helper.h
index e9aec4f..fba3eae 100644
--- a/src/canvas_helper.h
+++ b/src/canvas_helper.h
@@ -20,6 +20,7 @@
 #define _ATOMIX_CANVAS_HELPER_H_
 
 #include "theme.h"
+#include <libgnomecanvas/libgnomecanvas.h>
 
 void set_background_color (GtkWidget * canvas, GdkColor * color);
 
diff --git a/src/goal.c b/src/goal.c
index abb829b..e291b8a 100644
--- a/src/goal.c
+++ b/src/goal.c
@@ -38,8 +38,7 @@ struct _GoalPrivate
 };
 
 void goal_print_offset (gpointer ptr, gpointer data);
-GnomeCanvasItem *create_small_item (GnomeCanvasGroup *group,
-                                   gdouble x, gdouble y, Tile *tile);
+GtkImage *create_small_item (gdouble x, gdouble y, Tile *tile);
 static gboolean compare_playfield_with_goal (Goal *goal, PlayField *pf,
                                             guint start_row,
                                             guint start_col);
diff --git a/src/main.h b/src/main.h
index ff01fd2..3978ae7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -23,7 +23,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libgnomecanvas/libgnomecanvas.h>
 #include "theme-manager.h"
 #include "level-manager.h"
 #include "goal.h"
diff --git a/src/undo.c b/src/undo.c
index 4c4b4dd..16f9cda 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -42,7 +42,7 @@ void undo_clear (void)
   undo_stack = NULL;
 }
 
-void undo_push_move (GnomeCanvasItem *item, gint src_row, gint src_col,
+void undo_push_move (gpointer item, gint src_row, gint src_col,
                     gint dest_row, gint dest_col)
 {
   UndoMove *move = g_new0 (UndoMove, 1);
diff --git a/src/undo.h b/src/undo.h
index c3292bf..a43f84e 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -22,7 +22,7 @@
 
 typedef struct
 {
-  GnomeCanvasItem *item;
+  gpointer item;
   gint src_row;
   gint src_col;
   gint dest_row;
@@ -31,7 +31,7 @@ typedef struct
 
 gboolean undo_exists (void);
 
-void undo_push_move (GnomeCanvasItem * item,
+void undo_push_move (gpointer item,
                     gint src_row, gint src_col,
                     gint dest_row, gint dest_col);
 


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