[gcompris/gcomprixogoo] windows port in progress.
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gcompris/gcomprixogoo] windows port in progress.
- Date: Sun, 10 Jan 2010 00:48:10 +0000 (UTC)
commit 78a6a77dda608dfe4139e763ffcca42854b902bc
Author: Bruno Coudoin <bruno coudoin free fr>
Date: Sun Jan 10 01:47:38 2010 +0100
windows port in progress.
src/gcompris/gameutil.c | 4 ++++
src/gcompris/gcompris.c | 21 +++++++++------------
2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/src/gcompris/gameutil.c b/src/gcompris/gameutil.c
index d7a6edb..3d460be 100644
--- a/src/gcompris/gameutil.c
+++ b/src/gcompris/gameutil.c
@@ -31,6 +31,10 @@
#include "gcompris.h"
+#ifdef WIN32
+#define realpath(N,R) _fullpath((R),(N),_MAX_PATH)
+#endif
+
extern GooCanvas *canvas;
typedef void (*sighandler_t)(int);
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index ee3e94b..a0566e1 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -90,7 +90,7 @@ static void activation_enter_callback(GtkWidget *widget,
static void activation_done();
static int display_activation_dialog();
static GooCanvasItem *activation_item;
-static GtkEntry *widget_activation_entry;
+static GtkWidget *widget_activation_entry;
#else
#define display_activation_dialog() FALSE
#endif
@@ -898,18 +898,15 @@ display_activation_dialog()
}
/* Entry area */
- widget_activation_entry = (GtkEntry *)gtk_entry_new();
- gtk_entry_set_max_length(widget_activation_entry, 6);
+ widget_activation_entry = gtk_entry_new();
+ gtk_entry_set_max_length(GTK_ENTRY(widget_activation_entry), 6);
activation_item = \
- goo_canvas_item_new (goo_canvas_get_root_item(canvas),
- goo_canvas_widget_get_type (),
- "widget", GTK_WIDGET(widget_activation_entry),
- "x", (double) BOARDWIDTH / 2 - 50,
- "y", (double) BOARDHEIGHT - 60,
- "width", 100.0,
- "height", 30.0,
- "anchor", GTK_ANCHOR_NW,
- "size_pixels", FALSE,
+ goo_canvas_widget_new (goo_canvas_get_root_item(GOO_CANVAS(canvas)),
+ GTK_WIDGET(widget_activation_entry),
+ BOARDWIDTH / 2 - 50,
+ BOARDHEIGHT - 60,
+ 100.0,
+ 30.0,
NULL);
gtk_signal_connect(GTK_OBJECT(widget_activation_entry), "activate",
GTK_SIGNAL_FUNC(activation_enter_callback),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]