From aea69823ed63f7a41e2df1d39e28208bc51b158a Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 12 Feb 2019 16:42:09 -0200 Subject: [PATCH] Fixing build warnings. --- src/dialogs/commondialog.c | 6 +++--- src/dialogs/hostselect.c | 2 +- src/dialogs/tools.c | 12 ++++++++++++ src/include/internals.h | 14 ++------------ src/include/v3270.h | 2 +- src/testprogram/testprogram.c | 3 +-- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/dialogs/commondialog.c b/src/dialogs/commondialog.c index 625dcc2..31fbdf2 100644 --- a/src/dialogs/commondialog.c +++ b/src/dialogs/commondialog.c @@ -50,7 +50,7 @@ static GtkWidget * create_button(GtkWidget *dialog, const gchar *mnemonic, GCall return button; } -LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *parent, const gchar *apply) +LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *title, const gchar *apply) { gboolean use_header; g_object_get(gtk_settings_get_default(), "gtk-dialogs-use-header", &use_header, NULL); @@ -67,9 +67,9 @@ LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *paren // https://developer.gnome.org/hig/stable/visual-layout.html.en gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),18); - if(parent) + if(widget) { - gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(gtk_widget_get_toplevel(parent))); + gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(gtk_widget_get_toplevel(widget))); gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); } diff --git a/src/dialogs/hostselect.c b/src/dialogs/hostselect.c index c504b78..279424d 100644 --- a/src/dialogs/hostselect.c +++ b/src/dialogs/hostselect.c @@ -311,7 +311,7 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) } GtkWidget * dialog = v3270_host_select_new(widget); - GtkWidget * win = v3270_dialog_new(_("Configure host"), GTK_WINDOW(gtk_widget_get_toplevel(widget)), _("C_onnect")); + GtkWidget * win = v3270_dialog_new(widget, _("Configure host"), _("C_onnect")); gtk_window_set_default_size(GTK_WINDOW(win), 700, 150); diff --git a/src/dialogs/tools.c b/src/dialogs/tools.c index 05f2059..15df15d 100644 --- a/src/dialogs/tools.c +++ b/src/dialogs/tools.c @@ -70,5 +70,17 @@ return child; } + GtkWidget * v3270_box_pack_start(GtkWidget *box, GtkWidget *child, gboolean expand, gboolean fill, guint padding) + { + gtk_box_pack_start(GTK_BOX(box),child,expand,fill,padding); + return child; + } + + GtkWidget * v3270_box_pack_end(GtkWidget *box, GtkWidget *child, gboolean expand, gboolean fill, guint padding) + { + gtk_box_pack_end(GTK_BOX(box),child,expand,fill,padding); + return child; + } + diff --git a/src/include/internals.h b/src/include/internals.h index 8dfa60a..1e14114 100644 --- a/src/include/internals.h +++ b/src/include/internals.h @@ -52,18 +52,8 @@ G_BEGIN_DECLS - inline GtkWidget * v3270_box_pack_start(GtkWidget *box, GtkWidget *child, gboolean expand, gboolean fill, guint padding) - { - gtk_box_pack_start(GTK_BOX(box),child,expand,fill,padding); - return child; - } - - inline GtkWidget * v3270_box_pack_end(GtkWidget *box, GtkWidget *child, gboolean expand, gboolean fill, guint padding) - { - gtk_box_pack_end(GTK_BOX(box),child,expand,fill,padding); - return child; - } - + G_GNUC_INTERNAL GtkWidget * v3270_box_pack_start(GtkWidget *box, GtkWidget *child, gboolean expand, gboolean fill, guint padding); + G_GNUC_INTERNAL GtkWidget * v3270_box_pack_end(GtkWidget *box, GtkWidget *child, gboolean expand, gboolean fill, guint padding); G_GNUC_INTERNAL GtkWidget * v3270_box_pack_frame(GtkWidget *box, GtkWidget *child, const gchar *title, GtkAlign align, gboolean expand, gboolean fill, guint padding); G_GNUC_INTERNAL GtkWidget * v3270_box_pack_frame(GtkWidget *box, GtkWidget *child, const gchar *title, GtkAlign align, gboolean expand, gboolean fill, guint padding); G_GNUC_INTERNAL GtkWidget * v3270_dialog_create_grid(GtkAlign align); diff --git a/src/include/v3270.h b/src/include/v3270.h index 25a6589..769e90a 100644 --- a/src/include/v3270.h +++ b/src/include/v3270.h @@ -289,7 +289,7 @@ LIB3270_EXPORT int v3270_exec_command(GtkWidget *widget, const gchar *cmdline); - LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *parent, const gchar *apply); + LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *title, const gchar *apply); G_END_DECLS diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c index 4cecf71..6e6d586 100644 --- a/src/testprogram/testprogram.c +++ b/src/testprogram/testprogram.c @@ -158,8 +158,7 @@ static void ft_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) static void color_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) { - GtkWidget * dialog = v3270_dialog_new(_("Color setup"), NULL, _("_Save")); - + GtkWidget * dialog = v3270_dialog_new(terminal, _("Color setup"), _("_Save")); GtkWidget * colors = v3270_color_selection_new(terminal); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),colors,TRUE,TRUE,2); -- libgit2 0.21.2