diff --git a/src/include/pw3270/actions.h b/src/include/pw3270/actions.h index d5e241e..c568689 100644 --- a/src/include/pw3270/actions.h +++ b/src/include/pw3270/actions.h @@ -180,6 +180,7 @@ /// @brief Update simple action from LIB3270's property description. void pw3270_simple_action_set_lib3270_property(pw3270SimpleAction *action, const LIB3270_PROPERTY * property); + /* // // Dialog action // @@ -194,6 +195,7 @@ typedef struct _pw3270DialogActionClass pw3270DialogActionClass; pw3270SimpleAction * pw3270_dialog_action_new(GtkWidget * (*factory)(pw3270SimpleAction *action, GtkWidget *)); + */ // // V3270 Property Action diff --git a/src/objects/actions/dialog.c b/src/objects/actions/dialog.c index b7810d3..c203ed1 100644 --- a/src/objects/actions/dialog.c +++ b/src/objects/actions/dialog.c @@ -32,6 +32,7 @@ * */ + /* #include "private.h" #include #include @@ -122,3 +123,4 @@ } +*/ diff --git a/src/objects/actions/save.c b/src/objects/actions/save.c index ad87684..a492aab 100644 --- a/src/objects/actions/save.c +++ b/src/objects/actions/save.c @@ -38,14 +38,14 @@ #include - static GtkWidget * factory(pw3270SimpleAction *action, GtkWidget *terminal); + static GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal); static void response(GtkWidget *dialog, gint response_id, GtkWidget *terminal); GAction * pw3270_action_save_session_as_new(void) { - pw3270SimpleAction * action = pw3270_dialog_action_new(factory); + V3270SimpleAction * action = v3270_dialog_action_new(factory); - action->parent.name = "save.session.as"; + action->name = "save.session.as"; action->label = _("Save As"); action->icon_name = "document-save-as"; action->tooltip = _("Save session properties"); @@ -54,7 +54,7 @@ } - GtkWidget * factory(pw3270SimpleAction *action, GtkWidget *terminal) { + GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal) { GtkWidget * dialog = gtk_file_chooser_dialog_new( @@ -75,9 +75,9 @@ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),current_file); } - g_signal_connect(dialog,"close",G_CALLBACK(gtk_widget_destroy),NULL); g_signal_connect(dialog,"response",G_CALLBACK(response),terminal); + gtk_widget_show_all(dialog); return dialog; } diff --git a/src/objects/application/application.c b/src/objects/application/application.c index 93d78b6..f11e2c2 100644 --- a/src/objects/application/application.c +++ b/src/objects/application/application.c @@ -291,7 +291,9 @@ if(application->plugins) { #pragma GCC diagnostic push +#ifdef _WIN32 #pragma GCC diagnostic ignored "-Wcast-function-type" +#endif // _WIN32 g_slist_free_full(application->plugins,(GDestroyNotify) g_module_close); #pragma GCC diagnostic pop application->plugins = NULL; diff --git a/src/objects/window/actions/hostproperties.c b/src/objects/window/actions/hostproperties.c index f1a1e80..ccd6054 100644 --- a/src/objects/window/actions/hostproperties.c +++ b/src/objects/window/actions/hostproperties.c @@ -33,13 +33,13 @@ #include #include - static GtkWidget * factory(pw3270SimpleAction *action, GtkWidget *terminal); + static GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal); GAction * pw3270_action_host_properties_new(void) { - pw3270SimpleAction * action = pw3270_dialog_action_new(factory); + V3270SimpleAction * action = v3270_dialog_action_new(factory); - action->parent.name = "host.properties"; + action->name = "host.properties"; action->group.id = LIB3270_ACTION_GROUP_OFFLINE; action->icon_name = "network-server"; action->label = N_("Host properties"); @@ -47,7 +47,7 @@ return G_ACTION(action); } - GtkWidget * factory(pw3270SimpleAction G_GNUC_UNUSED(*action), GtkWidget *terminal) { + GtkWidget * factory(V3270SimpleAction G_GNUC_UNUSED(*action), GtkWidget *terminal) { GtkWidget * dialog = v3270_settings_dialog_new(); V3270Settings * settings = GTK_V3270_SETTINGS(v3270_host_settings_new()); @@ -62,9 +62,9 @@ v3270_settings_dialog_set_terminal_widget(dialog, terminal); - g_signal_connect(dialog,"close",G_CALLBACK(gtk_widget_destroy),NULL); g_signal_connect(dialog,"response",G_CALLBACK(v3270_setttings_dialog_response),settings); + gtk_widget_show_all(dialog); return dialog; } diff --git a/src/objects/window/actions/sessionproperties.c b/src/objects/window/actions/sessionproperties.c index 21efedd..7718eba 100644 --- a/src/objects/window/actions/sessionproperties.c +++ b/src/objects/window/actions/sessionproperties.c @@ -34,22 +34,20 @@ #include #include - static GtkWidget * factory(pw3270SimpleAction *action, GtkWidget *terminal); + static GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal); GAction * pw3270_action_session_properties_new(void) { - pw3270SimpleAction * action = pw3270_dialog_action_new(factory); + V3270SimpleAction * action = v3270_dialog_action_new(factory); - action->parent.name = "session.properties"; + action->name = "session.properties"; action->icon_name = "preferences-other"; action->label = _("Session properties"); return G_ACTION(action); - - } - GtkWidget * factory(pw3270SimpleAction *action, GtkWidget *terminal) { + GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal) { size_t ix; @@ -69,12 +67,6 @@ gtk_container_add(GTK_CONTAINER(dialog), elements[ix]); } - /* - gtk_container_add(GTK_CONTAINER(dialog), v3270_host_select_new()); - gtk_container_add(GTK_CONTAINER(dialog), v3270_color_selection_new()); - gtk_container_add(GTK_CONTAINER(dialog), v3270_font_chooser_widget_new()); - */ - // Setup dialog box gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(gtk_widget_get_toplevel(terminal))); gtk_window_set_modal(GTK_WINDOW(dialog),TRUE); @@ -84,6 +76,7 @@ g_signal_connect(dialog,"close",G_CALLBACK(gtk_widget_destroy),NULL); g_signal_connect(dialog,"response",G_CALLBACK(v3270_setttings_dialog_response),terminal); + gtk_widget_show_all(dialog); return dialog; } diff --git a/src/objects/window/actions/setcolors.c b/src/objects/window/actions/setcolors.c index 93ada66..f95dc8a 100644 --- a/src/objects/window/actions/setcolors.c +++ b/src/objects/window/actions/setcolors.c @@ -34,13 +34,13 @@ #include #include - static GtkWidget * factory(pw3270SimpleAction *action, GtkWidget *terminal); + static GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal); GAction * pw3270_set_color_action_new(void) { - pw3270SimpleAction * action = pw3270_dialog_action_new(factory); + V3270SimpleAction * action = v3270_dialog_action_new(factory); - action->parent.name = "set.colors"; + action->name = "set.colors"; action->icon_name = "gtk-select-color"; action->label = _("Colors"); action->tooltip = _("Change terminal colors"); @@ -49,9 +49,10 @@ } - GtkWidget * factory(pw3270SimpleAction G_GNUC_UNUSED(*action), GtkWidget *terminal) { - - return v3270_settings_get_edit_dialog(v3270_color_settings_new(),terminal,FALSE); + GtkWidget * factory(V3270SimpleAction G_GNUC_UNUSED(*action), GtkWidget *terminal) { + GtkWidget *dialog = v3270_settings_get_edit_dialog(v3270_color_settings_new(),terminal,FALSE); + gtk_widget_show_all(dialog); + return dialog; } -- libgit2 0.21.2