From e647dd0d967d77b554d6d7857af34246dcb43cf7 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 16 Dec 2019 12:38:52 -0300 Subject: [PATCH] Fixing warnings The definitions of the settings dialog are now private. --- src/dialogs/settings/dialog.c | 17 +++++++++++++---- src/include/v3270/settings.h | 23 +++++++++-------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/dialogs/settings/dialog.c b/src/dialogs/settings/dialog.c index b522e29..7c20fa8 100644 --- a/src/dialogs/settings/dialog.c +++ b/src/dialogs/settings/dialog.c @@ -33,6 +33,17 @@ #include #include + struct _V3270SettingsDialog { + GtkDialog parent; + GtkNotebook * tabs; + GtkWidget * terminal; + gboolean has_subtitle; + }; + + struct _V3270SettingsDialogClass { + GtkDialogClass parent_class; + }; + G_DEFINE_TYPE(V3270SettingsDialog, V3270SettingsDialog, GTK_TYPE_DIALOG); /*--[ Implement ]------------------------------------------------------------------------------------*/ @@ -50,7 +61,7 @@ static gboolean on_tab_focus(V3270Settings *settings, GdkEvent G_GNUC_UNUSED(*ev } */ -void on_switch_page(GtkNotebook *notebook, V3270Settings *settings, guint page_num, V3270SettingsDialog *dialog) +void on_switch_page(GtkNotebook G_GNUC_UNUSED(*notebook), V3270Settings *settings, guint G_GNUC_UNUSED(page_num), V3270SettingsDialog *dialog) { debug("title: %s",settings->title); debug("label: %s",settings->label); @@ -101,8 +112,6 @@ static void add(GtkContainer *container, GtkWidget *widget) { g_return_if_fail(GTK_IS_V3270_SETTINGS(widget)); - debug("*************************** Added settings dialog %p",widget); - // https://developer.gnome.org/hig/stable/visual-layout.html.en gtk_container_set_border_width(GTK_CONTAINER(widget),18); @@ -221,7 +230,7 @@ static void V3270SettingsDialog_init(V3270SettingsDialog *dialog) gtk_notebook_set_scrollable(dialog->tabs,TRUE); gtk_notebook_set_show_tabs(dialog->tabs,FALSE); - gtk_notebook_set_show_border(dialog->tabs, FALSE); + // gtk_notebook_set_show_border(dialog->tabs, TRUE); g_signal_connect(G_OBJECT(dialog->tabs), "page-added", G_CALLBACK(on_page_changed), dialog); g_signal_connect(G_OBJECT(dialog->tabs), "page-removed", G_CALLBACK(on_page_changed), dialog); g_signal_connect(G_OBJECT(dialog->tabs), "switch-page", G_CALLBACK(on_switch_page), dialog); diff --git a/src/include/v3270/settings.h b/src/include/v3270/settings.h index 23e73ce..df1c8c5 100644 --- a/src/include/v3270/settings.h +++ b/src/include/v3270/settings.h @@ -113,16 +113,8 @@ #define GTK_IS_V3270_SETTINGS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_V3270_SETTINGS_DIALOG)) #define GTK_V3270_SETTINGS_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_V3270_SETTINGS_DIALOG, V3270SettingsDialogClass)) - typedef struct _V3270SettingsDialog { - GtkDialog parent; - GtkNotebook * tabs; - GtkWidget * terminal; - gboolean has_subtitle; - } V3270SettingsDialog; - - typedef struct _V3270SettingsDialogClass { - GtkDialogClass parent_class; - } V3270SettingsDialogClass; + typedef struct _V3270SettingsDialog V3270SettingsDialog; + typedef struct _V3270SettingsDialogClass V3270SettingsDialogClass; LIB3270_EXPORT GType V3270SettingsDialog_get_type(void); @@ -136,15 +128,18 @@ LIB3270_EXPORT void v3270_settings_dialog_apply(GtkWidget *widget); LIB3270_EXPORT void v3270_settings_dialog_revert(GtkWidget *widget); - LIB3270_EXPORT GtkWidget * v3270_host_settings_new(); - LIB3270_EXPORT GtkWidget * v3270_font_settings_new(); - LIB3270_EXPORT GtkWidget * v3270_font_chooser_widget_new() G_GNUC_DEPRECATED; LIB3270_EXPORT GtkWidget * v3270_host_select_new() G_GNUC_DEPRECATED; - // Accelerator settings. + /// @brief Create accelerator settings widget. LIB3270_EXPORT GtkWidget * v3270_accelerator_settings_new(); + /// @brief Create host settings widget. + LIB3270_EXPORT GtkWidget * v3270_host_settings_new(); + + /// @brief Create font settings widget. + LIB3270_EXPORT GtkWidget * v3270_font_settings_new(); + G_END_DECLS -- libgit2 0.21.2