summaryrefslogtreecommitdiff
path: root/src/gui/menus
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2015-07-24 21:53:29 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2015-07-24 21:53:29 (GMT)
commit0bd8f885b20c1d660507c62e35410e2e5a958066 (patch)
tree10c92cdaa52235f9f4ab1b7b4a51b881a7eba800 /src/gui/menus
parent156d2e2f6beda2302552ac79678494d914fda05b (diff)
Applied or canceled the effect of collected items on a given binary.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@556 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/gui/menus')
-rw-r--r--src/gui/menus/edition.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/menus/edition.c b/src/gui/menus/edition.c
index d49f794..bc55478 100644
--- a/src/gui/menus/edition.c
+++ b/src/gui/menus/edition.c
@@ -103,25 +103,25 @@ GtkWidget *build_menu_edition(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *b
deepmenuitem = qck_create_menu_item(NULL, NULL, _("Hexadecimal"),
G_CALLBACK(mcb_edition_switch_numeric_operand), bar);
add_accelerator_to_menu_item(deepmenuitem, "H", accgroup);
- g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IST_HEXDECIMAL));
+ g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IOD_HEX));
gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
deepmenuitem = qck_create_menu_item(NULL, NULL, _("Decimal"),
G_CALLBACK(mcb_edition_switch_numeric_operand), bar);
add_accelerator_to_menu_item(deepmenuitem, "D", accgroup);
- g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IST_DECIMAL));
+ g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IOD_DEC));
gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
deepmenuitem = qck_create_menu_item(NULL, NULL, _("Octal"),
G_CALLBACK(mcb_edition_switch_numeric_operand), bar);
add_accelerator_to_menu_item(deepmenuitem, "O", accgroup);
- g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IST_OCTAL));
+ g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IOD_OCT));
gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
deepmenuitem = qck_create_menu_item(NULL, NULL, _("Binary"),
G_CALLBACK(mcb_edition_switch_numeric_operand), bar);
add_accelerator_to_menu_item(deepmenuitem, "B", accgroup);
- g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IST_BINARY));
+ g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IOD_BIN));
gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
deepmenuitem = qck_create_menu_separator();
@@ -129,7 +129,7 @@ GtkWidget *build_menu_edition(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *b
deepmenuitem = qck_create_menu_item(NULL, NULL, _("Default"),
G_CALLBACK(mcb_edition_switch_numeric_operand), bar);
- g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IST_DEFAULT));
+ g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IOD_COUNT));
gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
submenuitem = qck_create_menu_separator();
@@ -218,7 +218,7 @@ static void mcb_edition_goto(GtkMenuItem *menuitem, GMenuBar *bar)
static void mcb_edition_switch_numeric_operand(GtkMenuItem *menuitem, GMenuBar *bar)
{
- ImmSwitchType type; /* Type de basculement */
+ ImmOperandDisplay display; /* Type de basculement */
GtkViewPanel *vpanel; /* Afficheur effectif de code */
GBufferLine *line; /* Ligne de position courante */
GBufferSegment *segment; /* Segment actif s'il existe */
@@ -226,7 +226,7 @@ static void mcb_edition_switch_numeric_operand(GtkMenuItem *menuitem, GMenuBar *
virt_t virt; /* Adresse virtuelle */
vmpa2t addr; /* Adresse de destination */
- type = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(menuitem), "kind_of_switch"));
+ display = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(menuitem), "kind_of_switch"));
vpanel = g_editor_item_get_current_view(G_EDITOR_ITEM(bar));