diff options
| -rw-r--r-- | mixgtk/mixgtk.glade | 256 | ||||
| -rw-r--r-- | mixlib/mix_parser.c | 3 | ||||
| -rw-r--r-- | 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</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> - <property name="has_separator">True</property> + <property name="has_separator">False</property> <signal name="delete_event" handler="gtk_widget_hide" last_modification_time="Tue, 08 Aug 2006 13:25:56 GMT"/> <signal name="destroy_event" handler="gtk_widget_hide" last_modification_time="Tue, 08 Aug 2006 13:26:18 GMT"/> <signal name="destroy" handler="gtk_widget_hide" last_modification_time="Tue, 08 Aug 2006 13:26:49 GMT"/> @@ -4127,7 +4127,7 @@ disk7</property> <child internal-child="action_area"> <widget class="GtkHButtonBox" id="dialog-action_area13"> <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> <child> <widget class="GtkButton" id="okbutton2"> @@ -4155,121 +4155,171 @@ disk7</property> </child> <child> - <widget class="GtkVBox" id="vbox9"> - <property name="border_width">6</property> + <widget class="GtkFrame" id="frame7"> + <property name="border_width">3</property> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">8</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <child> - <widget class="GtkLabel" id="label1441"> + <widget class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="label" translatable="yes">MIX virtual machine -(GNU MDK)</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">False</property> - <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">False</property> - </packing> - </child> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> - <child> - <widget class="GtkLabel" id="version_label"> - <property name="width_request">52</property> - <property name="height_request">16</property> - <property name="visible">True</property> - <property name="label" translatable="yes">label223</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">False</property> - </packing> - </child> + <child> + <widget class="GtkVBox" id="vbox9"> + <property name="border_width">15</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">10</property> - <child> - <widget class="GtkLabel" id="label1442"> - <property name="visible">True</property> - <property name="label" translatable="yes">Copyright (C) 2001-2006 -Free Software Foundation, Inc</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="label1441"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>MIX virtual machine</b> +<small>(GNU MDK)</small></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> - <child> - <widget class="GtkLabel" id="label1440"> - <property name="visible">True</property> - <property name="label" translatable="yes">Please send bug reports to -bug-mdk@gnu.org</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <child> + <widget class="GtkLabel" id="version_label"> + <property name="width_request">52</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">label223</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="mdk_web"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">http://www.gnu.org/software/mdk/mdk.html</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">False</property> + <property name="selectable">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1440"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"><small>Please send bug reports to bug-mdk@gnu.org</small></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1442"> + <property name="visible">True</property> + <property name="label" translatable="yes"><small>Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +Free Software Foundation, Inc</small></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">False</property> - </packing> </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> 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; } |