From 39d48633458130498eeabc02332754ba34b8b645 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Thu, 10 Aug 2006 18:59:28 +0000 Subject: 64bit compilation fixes & About dialog embellishments git-archimport-id: mdk@sv.gnu.org/mdk--devel--1--patch-37 --- mixgtk/mixgtk.glade | 256 +++++++++++++++++++++++++++------------------- mixlib/mix_parser.c | 3 +- mixlib/mix_symbol_table.c | 4 +- 3 files changed, 157 insertions(+), 106 deletions(-) diff --git a/mixgtk/mixgtk.glade b/mixgtk/mixgtk.glade index 434d171..e50a68b 100644 --- a/mixgtk/mixgtk.glade +++ b/mixgtk/mixgtk.glade @@ -4113,7 +4113,7 @@ disk7 GDK_GRAVITY_NORTH_WEST True False - True + False @@ -4127,7 +4127,7 @@ disk7 True - GTK_BUTTONBOX_END + GTK_BUTTONBOX_SPREAD @@ -4155,121 +4155,171 @@ disk7 - - 6 + + 3 True - False - 8 + 0 + 0 + GTK_SHADOW_ETCHED_IN - + True - MIX virtual machine -(GNU MDK) - False - False - GTK_JUSTIFY_CENTER - False - False 0.5 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - False - - + 1 + 1 + 0 + 0 + 0 + 0 - - - 52 - 16 - True - label223 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - False - - + + + 15 + True + False + 10 - - - True - Copyright (C) 2001-2006 -Free Software Foundation, Inc - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + <b>MIX virtual machine</b> +<small>(GNU MDK)</small> + False + True + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + - - - True - Please send bug reports to -bug-mdk@gnu.org - False - False - GTK_JUSTIFY_CENTER - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + 52 + 16 + True + label223 + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + False + + + + + + True + True + http://www.gnu.org/software/mdk/mdk.html + False + True + GTK_JUSTIFY_CENTER + False + True + 0.5 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + <small>Please send bug reports to bug-mdk@gnu.org</small> + False + True + GTK_JUSTIFY_CENTER + True + True + 0.5 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + False + + + + + + True + <small>Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +Free Software Foundation, Inc</small> + False + True + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + - - 0 - True - False - 0 - False - False + True + True diff --git a/mixlib/mix_parser.c b/mixlib/mix_parser.c index a811cce..edda2b2 100644 --- a/mixlib/mix_parser.c +++ b/mixlib/mix_parser.c @@ -548,7 +548,8 @@ add_raw_ (mix_parser_t *parser, mix_word_t word, guint lineno) ins_node_ *node = g_new (ins_node_, 1); node->ins = word; node->lineno = lineno; - g_tree_insert (parser->ins_table, (gpointer)((guint)parser->loc_count), + g_tree_insert (parser->ins_table, + GUINT_TO_POINTER ((guint)parser->loc_count), (gpointer)node); } } diff --git a/mixlib/mix_symbol_table.c b/mixlib/mix_symbol_table.c index f219b81..5153c73 100644 --- a/mixlib/mix_symbol_table.c +++ b/mixlib/mix_symbol_table.c @@ -122,7 +122,7 @@ mix_symbol_table_add (mix_symbol_table_t *table, if ( !g_hash_table_lookup_extended (table, sym, &key, &val) ) { key = g_strdup (sym); - g_hash_table_insert (table, key, GINT_TO_POINTER (value)); + g_hash_table_insert (table, key, GUINT_TO_POINTER (value)); return MIX_SYM_OK; } else @@ -141,7 +141,7 @@ mix_symbol_table_insert (mix_symbol_table_t *table, if ( !g_hash_table_lookup_extended (table, sym, &key, &val) ) key = g_strdup (sym); - g_hash_table_insert (table, key, GINT_TO_POINTER (new_value)); + g_hash_table_insert (table, key, GUINT_TO_POINTER (new_value)); return MIX_SYM_OK; } -- cgit v1.2.3