summaryrefslogtreecommitdiff
path: root/src/gtkext
diff options
context:
space:
mode:
Diffstat (limited to 'src/gtkext')
-rw-r--r--src/gtkext/easygtk.c6
-rw-r--r--src/gtkext/gtkbinview-int.h2
-rw-r--r--src/gtkext/gtkbinview.c10
-rw-r--r--src/gtkext/gtkbinview.h2
-rw-r--r--src/gtkext/gtkblockview.c6
-rw-r--r--src/gtkext/gtkdockpanel.c4
-rw-r--r--src/gtkext/gtkdockstation.c4
-rw-r--r--src/gtkext/gtkgraphview.c20
-rw-r--r--src/gtkext/gtksourceview.c6
-rw-r--r--src/gtkext/gtkviewpanel-int.h4
-rw-r--r--src/gtkext/gtkviewpanel.c6
-rw-r--r--src/gtkext/gtkviewpanel.h4
12 files changed, 38 insertions, 36 deletions
diff --git a/src/gtkext/easygtk.c b/src/gtkext/easygtk.c
index 5218381..510c74f 100644
--- a/src/gtkext/easygtk.c
+++ b/src/gtkext/easygtk.c
@@ -334,7 +334,7 @@ GtkWidget *qck_create_button(GObject *object, const char *name, const char *capt
GtkWidget *result; /* Résultat à renvoyer */
result = gtk_button_new_with_label(caption);
- GTK_WIDGET_SET_FLAGS(result, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(result, TRUE);
if (G_IS_OBJECT(object) && name != NULL)
{
@@ -373,7 +373,7 @@ GtkWidget *qck_create_button_from_stock(GObject *object, const char *name, const
GtkWidget *result; /* Résultat à renvoyer */
result = gtk_button_new_from_stock(stock);
- GTK_WIDGET_SET_FLAGS(result, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(result, TRUE);
if (G_IS_OBJECT(object) && name != NULL)
{
@@ -413,7 +413,7 @@ GtkWidget *qck_create_button_with_img(GObject *object, const char *name, const c
GtkWidget *render; /* Image à ajouter au bouton */
result = gtk_button_new();
- GTK_WIDGET_SET_FLAGS(result, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(result, TRUE);
render = gtk_image_new_from_stock(image, GTK_ICON_SIZE_BUTTON);
gtk_widget_show(render);
diff --git a/src/gtkext/gtkbinview-int.h b/src/gtkext/gtkbinview-int.h
index 94d406f..7091e15 100644
--- a/src/gtkext/gtkbinview-int.h
+++ b/src/gtkext/gtkbinview-int.h
@@ -48,7 +48,7 @@ struct _GtkBinView
{
GtkViewPanel parent; /* A laisser en premier */
- GOpenidaBinary *binary; /* Contenu binaire affiché */
+ GLoadedBinary *binary; /* Contenu binaire affiché */
GRenderingLine *lines; /* Contenu à représenter */
GRenderingLine *last; /* Dernière ligne associée */
diff --git a/src/gtkext/gtkbinview.c b/src/gtkext/gtkbinview.c
index a1657b3..2fe88ad 100644
--- a/src/gtkext/gtkbinview.c
+++ b/src/gtkext/gtkbinview.c
@@ -39,7 +39,7 @@ typedef struct _bv_loading_ack
/* Prend acte de l'association d'un binaire chargé. */
-static void gtk_bin_view_attach_binary(GtkBinView *, GOpenidaBinary *);
+static void gtk_bin_view_attach_binary(GtkBinView *, GLoadedBinary *);
/* Prend note de la fin d'une construction d'une visualisation. */
static void ack_loaded_lines_for_bin_view(GtkBinView *, bv_loading_ack *);
@@ -137,7 +137,7 @@ GtkWidget* gtk_binview_new(void)
* *
******************************************************************************/
-static void gtk_bin_view_attach_binary(GtkBinView *view, GOpenidaBinary *binary)
+static void gtk_bin_view_attach_binary(GtkBinView *view, GLoadedBinary *binary)
{
bv_loading_ack ack; /* Informations d'acquitement */
@@ -147,8 +147,10 @@ static void gtk_bin_view_attach_binary(GtkBinView *view, GOpenidaBinary *binary)
g_signal_connect(view, "lines-set", G_CALLBACK(ack_loaded_lines_for_bin_view), &ack);
+ /*
gtk_bin_view_set_rendering_lines(view, binary,
- g_openida_binary_get_lines(binary), NULL);
+ g_loaded_binary_get_lines(binary), NULL);
+ */
/* Attente de la fin de construction */
g_mutex_lock(ack.mutex);
@@ -233,7 +235,7 @@ void gtk_bin_view_show_border(GtkBinView *view, bool show)
* *
******************************************************************************/
-void gtk_bin_view_set_rendering_lines(GtkBinView *view, GOpenidaBinary *binary, GRenderingLine *lines, GRenderingLine *last)
+void gtk_bin_view_set_rendering_lines(GtkBinView *view, GLoadedBinary *binary, GRenderingLine *lines, GRenderingLine *last)
{
view->binary = binary;
diff --git a/src/gtkext/gtkbinview.h b/src/gtkext/gtkbinview.h
index b6027a6..165f423 100644
--- a/src/gtkext/gtkbinview.h
+++ b/src/gtkext/gtkbinview.h
@@ -57,7 +57,7 @@ void gtk_bin_view_show_border(GtkBinView *, bool);
/* Définit les lignes à associer à la représentation. */
-void gtk_bin_view_set_rendering_lines(GtkBinView *, GOpenidaBinary *, GRenderingLine *, GRenderingLine *);
+void gtk_bin_view_set_rendering_lines(GtkBinView *, GLoadedBinary *, GRenderingLine *, GRenderingLine *);
/* Fournit la liste des lignes associées à la représentation. */
GRenderingLine *gtk_bin_view_get_lines(const GtkBinView *);
diff --git a/src/gtkext/gtkblockview.c b/src/gtkext/gtkblockview.c
index cd2d99d..398856f 100644
--- a/src/gtkext/gtkblockview.c
+++ b/src/gtkext/gtkblockview.c
@@ -53,7 +53,7 @@ static void gtk_block_view_class_init(GtkBlockViewClass *);
static void gtk_block_view_init(GtkBlockView *);
/* Prend acte de l'association d'un binaire chargé. */
-static void gtk_block_view_attach_binary(GtkBlockView *, GOpenidaBinary *, bool *, bool *);
+static void gtk_block_view_attach_binary(GtkBlockView *, GLoadedBinary *, bool *, bool *);
@@ -145,11 +145,11 @@ GtkWidget *gtk_block_view_new(void)
* *
******************************************************************************/
-static void gtk_block_view_attach_binary(GtkBlockView *view, GOpenidaBinary *binary, bool *addr, bool *code)
+static void gtk_block_view_attach_binary(GtkBlockView *view, GLoadedBinary *binary, bool *addr, bool *code)
{
GCodeBuffer *buffer; /* Tampon par défaut */
- buffer = g_openida_binary_get_disassembled_buffer(binary);
+ buffer = g_loaded_binary_get_disassembled_buffer(binary);
gtk_buffer_view_attach_buffer(GTK_BUFFER_VIEW(view), g_buffer_view_new(buffer), addr, code);
diff --git a/src/gtkext/gtkdockpanel.c b/src/gtkext/gtkdockpanel.c
index 24e99eb..79a4a0e 100644
--- a/src/gtkext/gtkdockpanel.c
+++ b/src/gtkext/gtkdockpanel.c
@@ -67,7 +67,7 @@ static void on_dock_item_content_changed(GDockItem *, GtkWidget *, GtkWidget *,
static void _gtk_dock_panel_remove_item(GtkDockPanel *, GDockItem *, GtkWidget *);
/* Met à jour le titre du support de panneaux dockables. */
-static gboolean gtk_dock_panel_update_title(GtkNotebook *, GtkNotebookPage *, guint, gpointer);
+static gboolean gtk_dock_panel_update_title(GtkNotebook *, gpointer *, guint, gpointer);
@@ -742,7 +742,7 @@ static void _gtk_dock_panel_remove_item(GtkDockPanel *dpanel, GDockItem *ditem,
* *
******************************************************************************/
-static gboolean gtk_dock_panel_update_title(GtkNotebook *notebook, GtkNotebookPage *page, guint index, gpointer data)
+static gboolean gtk_dock_panel_update_title(GtkNotebook *notebook, gpointer *page, guint index, gpointer data)
{
GDockItem *ditem; /* Elément nouvellement actif */
const gchar *desc; /* Description à afficher */
diff --git a/src/gtkext/gtkdockstation.c b/src/gtkext/gtkdockstation.c
index a91998e..ba17788 100644
--- a/src/gtkext/gtkdockstation.c
+++ b/src/gtkext/gtkdockstation.c
@@ -40,7 +40,7 @@ static void gtk_dock_station_class_init(GtkDockStationClass *);
static void gtk_dock_station_init(GtkDockStation *);
/* Met à jour le titre du support de panneaux concentrés. */
-static gboolean gtk_dock_station_switch_panel(GtkNotebook *, GtkNotebookPage *, guint, gpointer);
+static gboolean gtk_dock_station_switch_panel(GtkNotebook *, gpointer *, guint, gpointer);
@@ -173,7 +173,7 @@ GtkWidget *gtk_dock_station_new(void)
* *
******************************************************************************/
-static gboolean gtk_dock_station_switch_panel(GtkNotebook *notebook, GtkNotebookPage *page, guint index, gpointer data)
+static gboolean gtk_dock_station_switch_panel(GtkNotebook *notebook, gpointer *page, guint index, gpointer data)
{
GtkWidget *widget; /* Panneau concerné */
char *caption; /* Texte à redonner */
diff --git a/src/gtkext/gtkgraphview.c b/src/gtkext/gtkgraphview.c
index 8366c1f..6ce6060 100644
--- a/src/gtkext/gtkgraphview.c
+++ b/src/gtkext/gtkgraphview.c
@@ -87,7 +87,7 @@ static void gtk_graph_view_scroll(GtkGraphView *);
static void gtk_graph_view_reset(GtkGraphView *);
/* Liste d'éléments du graphique à placer. */
-static GtkViewPanel **gtk_graph_view_load_nodes(GtkGraphView *, GOpenidaBinary *, vmpa_t, vmpa_t);
+static GtkViewPanel **gtk_graph_view_load_nodes(GtkGraphView *, GLoadedBinary *, vmpa_t, vmpa_t);
@@ -319,7 +319,7 @@ static void gtk_graph_view_define_main_address(GtkGraphView *view, vmpa_t addr)
{
gtk_graph_view_reset(view);
- format = g_openida_binary_get_format(GTK_VIEW_PANEL(view)->binary);
+ format = g_loaded_binary_get_format(GTK_VIEW_PANEL(view)->binary);
routines = g_binary_format_get_routines(G_BIN_FORMAT(format), &routines_count);
for (i = 0; i < routines_count; i++)
@@ -533,7 +533,7 @@ static void gtk_graph_view_reset(GtkGraphView *view)
* *
******************************************************************************/
-static GtkViewPanel **gtk_graph_view_load_nodes(GtkGraphView *view, GOpenidaBinary *binary, vmpa_t start, vmpa_t end)
+static GtkViewPanel **gtk_graph_view_load_nodes(GtkGraphView *view, GLoadedBinary *binary, vmpa_t start, vmpa_t end)
{
GtkViewPanel **result; /* Liste à retourner */
size_t *count; /* Nombre d'éléments créés. */
@@ -551,11 +551,11 @@ static GtkViewPanel **gtk_graph_view_load_nodes(GtkGraphView *view, GOpenidaBina
count = &view->childs_count;
*count = 0;
- list = g_openida_binary_get_instructions(binary);
- buffer = g_openida_binary_get_disassembled_buffer(binary);
+ list = g_loaded_binary_get_instructions(binary);
+ buffer = g_loaded_binary_get_disassembled_buffer(binary);
- addr = g_openida_binary_display_addresses_in_text(binary);
- code = g_openida_binary_display_code_in_text(binary);
+ addr = g_loaded_binary_display_addresses_in_text(binary);
+ code = g_loaded_binary_display_code_in_text(binary);
first = start;
last = first;
@@ -718,7 +718,7 @@ static void gtk_graph_view_define_main_address(GtkGraphView *, vmpa_t);
static bool gtk_graph_view_get_address_coordinates(const GtkGraphView *, vmpa_t, gint *, gint *);
/* Définit la liste complète des éléments du futur graphique. */
-static GtkBinView **gtk_graph_view_load_nodes(GtkGraphView *, GOpenidaBinary *, GRenderingLine *, GRenderingLine *);
+static GtkBinView **gtk_graph_view_load_nodes(GtkGraphView *, GLoadedBinary *, GRenderingLine *, GRenderingLine *);
/* Prend note de la fin d'une construction d'une visualisation. */
static void notify_graph_view(GtkBinView *, GtkGraphView *);
@@ -870,7 +870,7 @@ static void gtk_graph_view_define_main_address(GtkGraphView *view, vmpa_t addr)
{
gtk_graph_view_reset(view);
- format = g_openida_binary_get_format(GTK_BIN_VIEW(view)->binary);
+ format = g_loaded_binary_get_format(GTK_BIN_VIEW(view)->binary);
routines = g_binary_format_get_routines(G_BIN_FORMAT(format), &routines_count);
for (i = 0; i < routines_count; i++)
@@ -954,7 +954,7 @@ static bool gtk_graph_view_get_address_coordinates(const GtkGraphView *view, vmp
* *
******************************************************************************/
-static GtkBinView **gtk_graph_view_load_nodes(GtkGraphView *view, GOpenidaBinary *binary, GRenderingLine *first, GRenderingLine *last)
+static GtkBinView **gtk_graph_view_load_nodes(GtkGraphView *view, GLoadedBinary *binary, GRenderingLine *first, GRenderingLine *last)
{
#if 0
GtkBinView **result; /* Liste à retourner */
diff --git a/src/gtkext/gtksourceview.c b/src/gtkext/gtksourceview.c
index 1244bb8..5faed7b 100644
--- a/src/gtkext/gtksourceview.c
+++ b/src/gtkext/gtksourceview.c
@@ -53,7 +53,7 @@ static void gtk_source_view_class_init(GtkSourceViewClass *);
static void gtk_source_view_init(GtkSourceView *);
/* Prend acte de l'association d'un binaire chargé. */
-static void gtk_source_view_attach_binary(GtkSourceView *, GOpenidaBinary *, bool *, bool *);
+static void gtk_source_view_attach_binary(GtkSourceView *, GLoadedBinary *, bool *, bool *);
@@ -145,11 +145,11 @@ GtkWidget *gtk_source_view_new(void)
* *
******************************************************************************/
-static void gtk_source_view_attach_binary(GtkSourceView *view, GOpenidaBinary *binary, bool *addr, bool *code)
+static void gtk_source_view_attach_binary(GtkSourceView *view, GLoadedBinary *binary, bool *addr, bool *code)
{
GCodeBuffer *buffer; /* Tampon par défaut */
- buffer = g_openida_binary_get_decompiled_buffer(binary, -1);
+ buffer = g_loaded_binary_get_decompiled_buffer(binary, -1);
/* FIXME */
if (buffer != NULL)
diff --git a/src/gtkext/gtkviewpanel-int.h b/src/gtkext/gtkviewpanel-int.h
index a4edd06..6e6cbaf 100644
--- a/src/gtkext/gtkviewpanel-int.h
+++ b/src/gtkext/gtkviewpanel-int.h
@@ -34,7 +34,7 @@
/* Prend acte de l'association d'un binaire chargé. */
-typedef void (* attach_binary_fc) (GtkViewPanel *, GOpenidaBinary *, bool *, bool *);
+typedef void (* attach_binary_fc) (GtkViewPanel *, GLoadedBinary *, bool *, bool *);
/* Réagit à la sélection externe d'une adresse. */
typedef void (* define_address_fc) (GtkViewPanel *, vmpa_t);
@@ -57,7 +57,7 @@ struct _GtkViewPanel
GdkGC *gc; /* Contexte graphique du rendu */
bool show_border; /* Affichage d'une bordure ? */
- GOpenidaBinary *binary; /* Binaire à visualiser */
+ GLoadedBinary *binary; /* Binaire à visualiser */
attach_binary_fc attach; /* Association avec un binaire */
define_address_fc define; /* Centrage sur une partie */
diff --git a/src/gtkext/gtkviewpanel.c b/src/gtkext/gtkviewpanel.c
index 326e4d8..2935458 100644
--- a/src/gtkext/gtkviewpanel.c
+++ b/src/gtkext/gtkviewpanel.c
@@ -246,7 +246,7 @@ static void gtk_view_panel_realize(GtkWidget *widget)
guint attributes_mask; /* Masque de prise en compte */
GdkColor white; /* Couleur de fond normale */
- GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
+ gtk_widget_set_realized(widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;
@@ -356,7 +356,7 @@ void gtk_view_panel_show_border(GtkViewPanel *panel, bool show)
* *
******************************************************************************/
-void gtk_view_panel_attach_binary(GtkViewPanel *panel, GOpenidaBinary *binary, bool *addr, bool *code)
+void gtk_view_panel_attach_binary(GtkViewPanel *panel, GLoadedBinary *binary, bool *addr, bool *code)
{
g_object_ref(G_OBJECT(binary));
panel->binary = binary;
@@ -468,7 +468,7 @@ void gtk_view_panel_set_code_display(const GtkViewPanel *panel, bool state)
* *
******************************************************************************/
-GOpenidaBinary *gtk_view_panel_get_binary(const GtkViewPanel *panel)
+GLoadedBinary *gtk_view_panel_get_binary(const GtkViewPanel *panel)
{
return panel->binary;
diff --git a/src/gtkext/gtkviewpanel.h b/src/gtkext/gtkviewpanel.h
index 12b0e44..f1dd2b7 100644
--- a/src/gtkext/gtkviewpanel.h
+++ b/src/gtkext/gtkviewpanel.h
@@ -54,7 +54,7 @@ GType gtk_view_panel_get_type(void);
void gtk_view_panel_show_border(GtkViewPanel *, bool);
/* Associe à un panneau d'affichage un binaire chargé. */
-void gtk_view_panel_attach_binary(GtkViewPanel *, GOpenidaBinary *, bool *, bool *);
+void gtk_view_panel_attach_binary(GtkViewPanel *, GLoadedBinary *, bool *, bool *);
/* Indique si les adresses doivent apparaître dans le rendu. */
bool gtk_view_panel_get_addresses_display(const GtkViewPanel *);
@@ -69,7 +69,7 @@ bool gtk_view_panel_get_code_display(const GtkViewPanel *);
void gtk_view_panel_set_code_display(const GtkViewPanel *, bool);
/* Fournit le binaire associé à la représentation. */
-GOpenidaBinary *gtk_view_panel_get_binary(const GtkViewPanel *);
+GLoadedBinary *gtk_view_panel_get_binary(const GtkViewPanel *);
/* Indique si la vue contient une addrese donnée. */
bool gtk_view_panel_contain_address(const GtkViewPanel *, vmpa_t);
generated by cgit v0.11.2-87-g4458 at 2024-05-16 08:30:20 (GMT)