Commit 13c0f3e6ef4c5bc9e151fc63b6f6fe1c83b38184
1 parent
7734fd3b
Exists in
master
and in
1 other branch
Working on FT Dialog.
Showing
3 changed files
with
6 additions
and
8 deletions
Show diff stats
src/dialogs/commondialog.c
... | ... | @@ -69,15 +69,15 @@ LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *paren |
69 | 69 | |
70 | 70 | if(parent) |
71 | 71 | { |
72 | - gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent)); | |
72 | + gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(gtk_widget_get_toplevel(parent))); | |
73 | 73 | gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); |
74 | 74 | gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); |
75 | 75 | } |
76 | 76 | |
77 | - GtkWidget * header = gtk_dialog_get_header_bar(GTK_DIALOG(dialog)); | |
78 | - | |
79 | - if(header) | |
77 | + if(use_header) | |
80 | 78 | { |
79 | + GtkWidget * header = gtk_dialog_get_header_bar(GTK_DIALOG(dialog)); | |
80 | + | |
81 | 81 | gtk_header_bar_set_title(GTK_HEADER_BAR(header),title); |
82 | 82 | gtk_header_bar_pack_start(GTK_HEADER_BAR(header),create_button(dialog,_("_Cancel"),G_CALLBACK(cancel_clicked))); |
83 | 83 | gtk_header_bar_pack_end(GTK_HEADER_BAR(header),create_button(dialog,apply,G_CALLBACK(apply_clicked))); | ... | ... |
src/include/v3270/filetransfer.h
... | ... | @@ -141,9 +141,6 @@ |
141 | 141 | typedef struct _V3270FTDialog V3270FTDialog; |
142 | 142 | typedef struct _V3270FTDialogClass V3270FTDialogClass; |
143 | 143 | |
144 | - LIB3270_EXPORT GtkWidget * v3270_ft_dialog_new(GtkWidget *parent); | |
145 | - | |
146 | - | |
147 | 144 | G_END_DECLS |
148 | 145 | |
149 | 146 | #endif // V3270FT_H_INCLUDED | ... | ... |
src/v3270ft/dialog.c
... | ... | @@ -322,7 +322,7 @@ static void V3270FTDialog_init(V3270FTDialog *widget) |
322 | 322 | // gtk_widget_set_sensitive(widget->button.begin,FALSE); |
323 | 323 | gtk_widget_set_tooltip_markup(widget->button.begin,_("Start transfer")); |
324 | 324 | |
325 | - | |
325 | +/* | |
326 | 326 | #ifdef DEBUG |
327 | 327 | GObject * activity = v3270_ft_activity_new(); |
328 | 328 | |
... | ... | @@ -332,6 +332,7 @@ static void V3270FTDialog_init(V3270FTDialog *widget) |
332 | 332 | |
333 | 333 | v3270_activity_list_append(widget->queue.view,activity); |
334 | 334 | #endif // DEBUG |
335 | +*/ | |
335 | 336 | |
336 | 337 | } |
337 | 338 | ... | ... |