Mercurial > dwindows
comparison gtk4/dw.c @ 2998:4861e9f49907
GTK4: Here we go down this rabbit hole again. GTK 4.10 is deprecating tons of
functionality with deficient replacement APIs. GtkComboBox is deprecated now
suggesting GtkDropDown as a replacement, however GtkDropDown is just a list
selection and does not have an editable entryfield version. I haven't
completely gone through the changes, but I will attempt to switch to the new
APIs where possible to reduce the number of deprecation warnings.
This is the first set switching gtk_widget_hide/show() to use
gtk_widget_set_visible() instead. This removes about 50 warnings.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Wed, 17 May 2023 05:49:25 +0000 |
parents | 8450b87e960c |
children | a70d8ce6151c |
comparison
equal
deleted
inserted
replaced
2997:8450b87e960c | 2998:4861e9f49907 |
---|---|
1881 GTK_DIALOG_USE_HEADER_BAR | | 1881 GTK_DIALOG_USE_HEADER_BAR | |
1882 GTK_DIALOG_MODAL, gtkicon, gtkbuttons, "%s", title); | 1882 GTK_DIALOG_MODAL, gtkicon, gtkbuttons, "%s", title); |
1883 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", outbuf); | 1883 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", outbuf); |
1884 if(flags & DW_MB_YESNOCANCEL) | 1884 if(flags & DW_MB_YESNOCANCEL) |
1885 gtk_dialog_add_button(GTK_DIALOG(dialog), "Cancel", GTK_RESPONSE_CANCEL); | 1885 gtk_dialog_add_button(GTK_DIALOG(dialog), "Cancel", GTK_RESPONSE_CANCEL); |
1886 gtk_widget_show(GTK_WIDGET(dialog)); | 1886 gtk_widget_set_visible(GTK_WIDGET(dialog), TRUE); |
1887 g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp); | 1887 g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp); |
1888 /* Center the dialog on the screen since there is no parent */ | 1888 /* Center the dialog on the screen since there is no parent */ |
1889 dw_window_get_pos_size((HWND)dialog, NULL, NULL, &width, &height); | 1889 dw_window_get_pos_size((HWND)dialog, NULL, NULL, &width, &height); |
1890 dw_window_set_pos((HWND)dialog, (dw_screen_width() - width)/2, (dw_screen_height() - height)/2); | 1890 dw_window_set_pos((HWND)dialog, (dw_screen_width() - width)/2, (dw_screen_height() - height)/2); |
1891 response = DW_POINTER_TO_INT(dw_dialog_wait(tmp)); | 1891 response = DW_POINTER_TO_INT(dw_dialog_wait(tmp)); |
2049 | 2049 |
2050 if(defaultitem) | 2050 if(defaultitem) |
2051 gtk_widget_grab_focus(defaultitem); | 2051 gtk_widget_grab_focus(defaultitem); |
2052 } | 2052 } |
2053 else if(GTK_IS_WIDGET(handle)) | 2053 else if(GTK_IS_WIDGET(handle)) |
2054 gtk_widget_show(handle); | 2054 gtk_widget_set_visible(handle, TRUE); |
2055 } | 2055 } |
2056 DW_FUNCTION_RETURN_THIS(retval); | 2056 DW_FUNCTION_RETURN_THIS(retval); |
2057 } | 2057 } |
2058 | 2058 |
2059 /* | 2059 /* |
2067 DW_FUNCTION_RESTORE_PARAM1(handle, HWND) | 2067 DW_FUNCTION_RESTORE_PARAM1(handle, HWND) |
2068 { | 2068 { |
2069 int retval = DW_ERROR_NONE; | 2069 int retval = DW_ERROR_NONE; |
2070 | 2070 |
2071 if(handle && GTK_IS_WIDGET(handle)) | 2071 if(handle && GTK_IS_WIDGET(handle)) |
2072 gtk_widget_hide(handle); | 2072 gtk_widget_set_visible(handle, FALSE); |
2073 DW_FUNCTION_RETURN_THIS(retval); | 2073 DW_FUNCTION_RETURN_THIS(retval); |
2074 } | 2074 } |
2075 | 2075 |
2076 /* | 2076 /* |
2077 * Destroys a window and all of it's children. | 2077 * Destroys a window and all of it's children. |
2367 { | 2367 { |
2368 gtk_font_chooser_set_font(fd, font); | 2368 gtk_font_chooser_set_font(fd, font); |
2369 free(font); | 2369 free(font); |
2370 } | 2370 } |
2371 | 2371 |
2372 gtk_widget_show(GTK_WIDGET(fd)); | 2372 gtk_widget_set_visible(GTK_WIDGET(fd), TRUE); |
2373 g_signal_connect(G_OBJECT(fd), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp); | 2373 g_signal_connect(G_OBJECT(fd), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp); |
2374 | 2374 |
2375 if(DW_POINTER_TO_INT(dw_dialog_wait(tmp)) == GTK_RESPONSE_OK) | 2375 if(DW_POINTER_TO_INT(dw_dialog_wait(tmp)) == GTK_RESPONSE_OK) |
2376 { | 2376 { |
2377 char *fontname = gtk_font_chooser_get_font(fd); | 2377 char *fontname = gtk_font_chooser_get_font(fd); |
2680 { | 2680 { |
2681 GtkWidget *box = dw_box_new(DW_VERT, 0); | 2681 GtkWidget *box = dw_box_new(DW_VERT, 0); |
2682 GtkWidget *grid = gtk_grid_new(); | 2682 GtkWidget *grid = gtk_grid_new(); |
2683 GtkWidget *tmp = gtk_window_new(); | 2683 GtkWidget *tmp = gtk_window_new(); |
2684 | 2684 |
2685 gtk_widget_show(grid); | 2685 gtk_widget_set_visible(grid, TRUE); |
2686 | 2686 |
2687 /* Handle the window style flags */ | 2687 /* Handle the window style flags */ |
2688 gtk_window_set_title(GTK_WINDOW(tmp), title); | 2688 gtk_window_set_title(GTK_WINDOW(tmp), title); |
2689 gtk_window_set_resizable(GTK_WINDOW(tmp), (flStyle & DW_FCF_SIZEBORDER) ? TRUE : FALSE); | 2689 gtk_window_set_resizable(GTK_WINDOW(tmp), (flStyle & DW_FCF_SIZEBORDER) ? TRUE : FALSE); |
2690 /* Either the CLOSEBUTTON or SYSMENU flags should make it deletable */ | 2690 /* Either the CLOSEBUTTON or SYSMENU flags should make it deletable */ |
2724 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int) | 2724 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int) |
2725 { | 2725 { |
2726 GtkWidget *tmp = gtk_grid_new(); | 2726 GtkWidget *tmp = gtk_grid_new(); |
2727 g_object_set_data(G_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type)); | 2727 g_object_set_data(G_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type)); |
2728 _dw_widget_set_pad(tmp, pad); | 2728 _dw_widget_set_pad(tmp, pad); |
2729 gtk_widget_show(tmp); | 2729 gtk_widget_set_visible(tmp, TRUE); |
2730 DW_FUNCTION_RETURN_THIS(tmp); | 2730 DW_FUNCTION_RETURN_THIS(tmp); |
2731 } | 2731 } |
2732 | 2732 |
2733 /* | 2733 /* |
2734 * Create a new scrollable Box to be packed. | 2734 * Create a new scrollable Box to be packed. |
2752 g_object_set_data(G_OBJECT(tmp), "_dw_boxhandle", (gpointer)box); | 2752 g_object_set_data(G_OBJECT(tmp), "_dw_boxhandle", (gpointer)box); |
2753 _dw_widget_set_pad(box, pad); | 2753 _dw_widget_set_pad(box, pad); |
2754 | 2754 |
2755 gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(tmp), box); | 2755 gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(tmp), box); |
2756 g_object_set_data(G_OBJECT(tmp), "_dw_user", box); | 2756 g_object_set_data(G_OBJECT(tmp), "_dw_user", box); |
2757 gtk_widget_show(box); | 2757 gtk_widget_set_visible(box, TRUE); |
2758 gtk_widget_show(tmp); | 2758 gtk_widget_set_visible(tmp, TRUE); |
2759 | 2759 |
2760 DW_FUNCTION_RETURN_THIS(tmp); | 2760 DW_FUNCTION_RETURN_THIS(tmp); |
2761 } | 2761 } |
2762 | 2762 |
2763 /* | 2763 /* |
2830 tmp = gtk_grid_new(); | 2830 tmp = gtk_grid_new(); |
2831 g_object_set_data(G_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type)); | 2831 g_object_set_data(G_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type)); |
2832 g_object_set_data(G_OBJECT(frame), "_dw_boxhandle", (gpointer)tmp); | 2832 g_object_set_data(G_OBJECT(frame), "_dw_boxhandle", (gpointer)tmp); |
2833 _dw_widget_set_pad(tmp, pad); | 2833 _dw_widget_set_pad(tmp, pad); |
2834 gtk_frame_set_child(GTK_FRAME(frame), tmp); | 2834 gtk_frame_set_child(GTK_FRAME(frame), tmp); |
2835 gtk_widget_show(tmp); | 2835 gtk_widget_set_visible(tmp, TRUE); |
2836 gtk_widget_show(frame); | 2836 gtk_widget_set_visible(frame, TRUE); |
2837 if(_DWDefaultFont) | 2837 if(_DWDefaultFont) |
2838 dw_window_set_font(frame, _DWDefaultFont); | 2838 dw_window_set_font(frame, _DWDefaultFont); |
2839 DW_FUNCTION_RETURN_THIS(frame); | 2839 DW_FUNCTION_RETURN_THIS(frame); |
2840 } | 2840 } |
2841 | 2841 |
2856 #else | 2856 #else |
2857 gtk_picture_set_keep_aspect_ratio(GTK_PICTURE(tmp), TRUE); | 2857 gtk_picture_set_keep_aspect_ratio(GTK_PICTURE(tmp), TRUE); |
2858 #endif | 2858 #endif |
2859 gtk_widget_set_halign(GTK_WIDGET(tmp), GTK_ALIGN_CENTER); | 2859 gtk_widget_set_halign(GTK_WIDGET(tmp), GTK_ALIGN_CENTER); |
2860 gtk_widget_set_valign(GTK_WIDGET(tmp), GTK_ALIGN_CENTER); | 2860 gtk_widget_set_valign(GTK_WIDGET(tmp), GTK_ALIGN_CENTER); |
2861 gtk_widget_show(tmp); | 2861 gtk_widget_set_visible(tmp, TRUE); |
2862 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 2862 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
2863 DW_FUNCTION_RETURN_THIS(tmp); | 2863 DW_FUNCTION_RETURN_THIS(tmp); |
2864 } | 2864 } |
2865 | 2865 |
2866 /* | 2866 /* |
2880 if(top) | 2880 if(top) |
2881 gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tmp), GTK_POS_TOP); | 2881 gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tmp), GTK_POS_TOP); |
2882 else | 2882 else |
2883 gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tmp), GTK_POS_BOTTOM); | 2883 gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tmp), GTK_POS_BOTTOM); |
2884 gtk_notebook_set_scrollable(GTK_NOTEBOOK(tmp), TRUE); | 2884 gtk_notebook_set_scrollable(GTK_NOTEBOOK(tmp), TRUE); |
2885 gtk_widget_show(tmp); | 2885 gtk_widget_set_visible(tmp, TRUE); |
2886 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 2886 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
2887 g_object_set_data(G_OBJECT(tmp), "_dw_pagearray", (gpointer)pagearray); | 2887 g_object_set_data(G_OBJECT(tmp), "_dw_pagearray", (gpointer)pagearray); |
2888 DW_FUNCTION_RETURN_THIS(tmp); | 2888 DW_FUNCTION_RETURN_THIS(tmp); |
2889 } | 2889 } |
2890 | 2890 |
2980 | 2980 |
2981 /* Create a new menu bar */ | 2981 /* Create a new menu bar */ |
2982 tmp = gtk_popover_menu_bar_new_from_model(G_MENU_MODEL(menu)); | 2982 tmp = gtk_popover_menu_bar_new_from_model(G_MENU_MODEL(menu)); |
2983 snprintf(tempbuf, 24, "menu%d", ++_dw_menugroup); | 2983 snprintf(tempbuf, 24, "menu%d", ++_dw_menugroup); |
2984 gtk_widget_insert_action_group(GTK_WIDGET(tmp), tempbuf, G_ACTION_GROUP(group)); | 2984 gtk_widget_insert_action_group(GTK_WIDGET(tmp), tempbuf, G_ACTION_GROUP(group)); |
2985 gtk_widget_show(tmp); | 2985 gtk_widget_set_visible(tmp, TRUE); |
2986 | 2986 |
2987 /* Save pointers to each other */ | 2987 /* Save pointers to each other */ |
2988 g_object_set_data(G_OBJECT(location), "_dw_menubar", (gpointer)tmp); | 2988 g_object_set_data(G_OBJECT(location), "_dw_menubar", (gpointer)tmp); |
2989 g_object_set_data(G_OBJECT(tmp), "_dw_window", (gpointer)location); | 2989 g_object_set_data(G_OBJECT(tmp), "_dw_window", (gpointer)location); |
2990 g_object_set_data(G_OBJECT(tmp), "_dw_menugroup", GINT_TO_POINTER(_dw_menugroup)); | 2990 g_object_set_data(G_OBJECT(tmp), "_dw_menugroup", GINT_TO_POINTER(_dw_menugroup)); |
3469 tmp = gtk_scrolled_window_new(); | 3469 tmp = gtk_scrolled_window_new(); |
3470 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (tmp), | 3470 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (tmp), |
3471 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); | 3471 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); |
3472 | 3472 |
3473 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); | 3473 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); |
3474 gtk_widget_show(tmp); | 3474 gtk_widget_set_visible(tmp, TRUE); |
3475 return tmp; | 3475 return tmp; |
3476 } | 3476 } |
3477 | 3477 |
3478 GtkWidget *_dw_tree_view_setup(GtkWidget *tmp, GtkTreeModel *store) | 3478 GtkWidget *_dw_tree_view_setup(GtkWidget *tmp, GtkTreeModel *store) |
3479 { | 3479 { |
3541 gtk_tree_view_set_expander_column(GTK_TREE_VIEW(tree), col); | 3541 gtk_tree_view_set_expander_column(GTK_TREE_VIEW(tree), col); |
3542 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE); | 3542 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE); |
3543 | 3543 |
3544 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); | 3544 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); |
3545 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); | 3545 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); |
3546 gtk_widget_show(tree); | 3546 gtk_widget_set_visible(tree, TRUE); |
3547 | 3547 |
3548 if(_DWDefaultFont) | 3548 if(_DWDefaultFont) |
3549 dw_window_set_font(tmp, _DWDefaultFont); | 3549 dw_window_set_font(tmp, _DWDefaultFont); |
3550 } | 3550 } |
3551 DW_FUNCTION_RETURN_THIS(tmp); | 3551 DW_FUNCTION_RETURN_THIS(tmp); |
3566 GtkWidget *tmp = gtk_label_new(text); | 3566 GtkWidget *tmp = gtk_label_new(text); |
3567 | 3567 |
3568 /* Left and centered */ | 3568 /* Left and centered */ |
3569 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f); | 3569 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f); |
3570 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f); | 3570 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f); |
3571 gtk_widget_show(tmp); | 3571 gtk_widget_set_visible(tmp, TRUE); |
3572 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3572 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3573 if(_DWDefaultFont) | 3573 if(_DWDefaultFont) |
3574 dw_window_set_font(tmp, _DWDefaultFont); | 3574 dw_window_set_font(tmp, _DWDefaultFont); |
3575 DW_FUNCTION_RETURN_THIS(tmp); | 3575 DW_FUNCTION_RETURN_THIS(tmp); |
3576 } | 3576 } |
3587 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG) | 3587 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG) |
3588 { | 3588 { |
3589 GtkWidget *tmp, *frame = gtk_frame_new(NULL); | 3589 GtkWidget *tmp, *frame = gtk_frame_new(NULL); |
3590 tmp = gtk_label_new(text); | 3590 tmp = gtk_label_new(text); |
3591 gtk_frame_set_child(GTK_FRAME(frame), tmp); | 3591 gtk_frame_set_child(GTK_FRAME(frame), tmp); |
3592 gtk_widget_show(tmp); | 3592 gtk_widget_set_visible(tmp, TRUE); |
3593 gtk_widget_show(frame); | 3593 gtk_widget_set_visible(frame, TRUE); |
3594 | 3594 |
3595 /* Left and centered */ | 3595 /* Left and centered */ |
3596 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f); | 3596 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f); |
3597 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f); | 3597 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f); |
3598 g_object_set_data(G_OBJECT(frame), "_dw_id", GINT_TO_POINTER(cid)); | 3598 g_object_set_data(G_OBJECT(frame), "_dw_id", GINT_TO_POINTER(cid)); |
3619 gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(tmpbox), tmp); | 3619 gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(tmpbox), tmp); |
3620 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_WORD); | 3620 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_WORD); |
3621 | 3621 |
3622 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3622 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3623 g_object_set_data(G_OBJECT(tmpbox), "_dw_user", (gpointer)tmp); | 3623 g_object_set_data(G_OBJECT(tmpbox), "_dw_user", (gpointer)tmp); |
3624 gtk_widget_show(tmp); | 3624 gtk_widget_set_visible(tmp, TRUE); |
3625 gtk_widget_show(tmpbox); | 3625 gtk_widget_set_visible(tmpbox, TRUE); |
3626 if(_DWDefaultFont) | 3626 if(_DWDefaultFont) |
3627 dw_window_set_font(tmpbox, _DWDefaultFont); | 3627 dw_window_set_font(tmpbox, _DWDefaultFont); |
3628 DW_FUNCTION_RETURN_THIS(tmpbox); | 3628 DW_FUNCTION_RETURN_THIS(tmpbox); |
3629 } | 3629 } |
3630 | 3630 |
3640 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG) | 3640 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG) |
3641 { | 3641 { |
3642 GtkEntryBuffer *buffer = gtk_entry_buffer_new(text, -1); | 3642 GtkEntryBuffer *buffer = gtk_entry_buffer_new(text, -1); |
3643 GtkWidget *tmp = gtk_entry_new_with_buffer(buffer); | 3643 GtkWidget *tmp = gtk_entry_new_with_buffer(buffer); |
3644 | 3644 |
3645 gtk_widget_show(tmp); | 3645 gtk_widget_set_visible(tmp, TRUE); |
3646 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3646 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3647 | 3647 |
3648 if(_DWDefaultFont) | 3648 if(_DWDefaultFont) |
3649 dw_window_set_font(tmp, _DWDefaultFont); | 3649 dw_window_set_font(tmp, _DWDefaultFont); |
3650 DW_FUNCTION_RETURN_THIS(tmp); | 3650 DW_FUNCTION_RETURN_THIS(tmp); |
3664 GtkEntryBuffer *buffer = gtk_entry_buffer_new(text, -1); | 3664 GtkEntryBuffer *buffer = gtk_entry_buffer_new(text, -1); |
3665 GtkWidget *tmp = gtk_entry_new_with_buffer(buffer); | 3665 GtkWidget *tmp = gtk_entry_new_with_buffer(buffer); |
3666 | 3666 |
3667 gtk_entry_set_visibility(GTK_ENTRY(tmp), FALSE); | 3667 gtk_entry_set_visibility(GTK_ENTRY(tmp), FALSE); |
3668 | 3668 |
3669 gtk_widget_show(tmp); | 3669 gtk_widget_set_visible(tmp, TRUE); |
3670 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3670 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3671 | 3671 |
3672 if(_DWDefaultFont) | 3672 if(_DWDefaultFont) |
3673 dw_window_set_font(tmp, _DWDefaultFont); | 3673 dw_window_set_font(tmp, _DWDefaultFont); |
3674 DW_FUNCTION_RETURN_THIS(tmp); | 3674 DW_FUNCTION_RETURN_THIS(tmp); |
3691 tmp = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(store)); | 3691 tmp = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(store)); |
3692 gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(tmp), 0); | 3692 gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(tmp), 0); |
3693 buffer = gtk_entry_get_buffer(GTK_ENTRY(gtk_combo_box_get_child(GTK_COMBO_BOX(tmp)))); | 3693 buffer = gtk_entry_get_buffer(GTK_ENTRY(gtk_combo_box_get_child(GTK_COMBO_BOX(tmp)))); |
3694 gtk_entry_buffer_set_max_length(buffer, 0); | 3694 gtk_entry_buffer_set_max_length(buffer, 0); |
3695 gtk_entry_buffer_set_text(buffer, text, -1); | 3695 gtk_entry_buffer_set_text(buffer, text, -1); |
3696 gtk_widget_show(tmp); | 3696 gtk_widget_set_visible(tmp, TRUE); |
3697 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_COMBOBOX)); | 3697 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_COMBOBOX)); |
3698 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3698 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3699 if(_DWDefaultFont) | 3699 if(_DWDefaultFont) |
3700 dw_window_set_font(tmp, _DWDefaultFont); | 3700 dw_window_set_font(tmp, _DWDefaultFont); |
3701 DW_FUNCTION_RETURN_THIS(tmp); | 3701 DW_FUNCTION_RETURN_THIS(tmp); |
3711 DW_FUNCTION_ADD_PARAM2(text, cid) | 3711 DW_FUNCTION_ADD_PARAM2(text, cid) |
3712 DW_FUNCTION_RETURN(dw_button_new, HWND) | 3712 DW_FUNCTION_RETURN(dw_button_new, HWND) |
3713 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG) | 3713 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG) |
3714 { | 3714 { |
3715 GtkWidget *tmp = gtk_button_new_with_label(text); | 3715 GtkWidget *tmp = gtk_button_new_with_label(text); |
3716 gtk_widget_show(tmp); | 3716 gtk_widget_set_visible(tmp, TRUE); |
3717 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3717 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3718 if(_DWDefaultFont) | 3718 if(_DWDefaultFont) |
3719 dw_window_set_font(tmp, _DWDefaultFont); | 3719 dw_window_set_font(tmp, _DWDefaultFont); |
3720 DW_FUNCTION_RETURN_THIS(tmp); | 3720 DW_FUNCTION_RETURN_THIS(tmp); |
3721 } | 3721 } |
3738 { | 3738 { |
3739 dw_window_set_bitmap(bitmap, cid, NULL); | 3739 dw_window_set_bitmap(bitmap, cid, NULL); |
3740 gtk_button_set_child(GTK_BUTTON(tmp), bitmap); | 3740 gtk_button_set_child(GTK_BUTTON(tmp), bitmap); |
3741 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap); | 3741 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap); |
3742 } | 3742 } |
3743 gtk_widget_show(tmp); | 3743 gtk_widget_set_visible(tmp, TRUE); |
3744 if(text) | 3744 if(text) |
3745 gtk_widget_set_tooltip_text(tmp, text); | 3745 gtk_widget_set_tooltip_text(tmp, text); |
3746 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3746 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3747 DW_FUNCTION_RETURN_THIS(tmp); | 3747 DW_FUNCTION_RETURN_THIS(tmp); |
3748 } | 3748 } |
3769 { | 3769 { |
3770 dw_window_set_bitmap(bitmap, 0, filename); | 3770 dw_window_set_bitmap(bitmap, 0, filename); |
3771 gtk_button_set_child(GTK_BUTTON(tmp), bitmap); | 3771 gtk_button_set_child(GTK_BUTTON(tmp), bitmap); |
3772 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap); | 3772 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap); |
3773 } | 3773 } |
3774 gtk_widget_show(tmp); | 3774 gtk_widget_set_visible(tmp, TRUE); |
3775 if(text) | 3775 if(text) |
3776 gtk_widget_set_tooltip_text(tmp, text); | 3776 gtk_widget_set_tooltip_text(tmp, text); |
3777 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3777 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3778 DW_FUNCTION_RETURN_THIS(tmp); | 3778 DW_FUNCTION_RETURN_THIS(tmp); |
3779 } | 3779 } |
3799 { | 3799 { |
3800 dw_window_set_bitmap_from_data(bitmap, 0, data, len); | 3800 dw_window_set_bitmap_from_data(bitmap, 0, data, len); |
3801 gtk_button_set_child(GTK_BUTTON(tmp), bitmap); | 3801 gtk_button_set_child(GTK_BUTTON(tmp), bitmap); |
3802 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap); | 3802 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap); |
3803 } | 3803 } |
3804 gtk_widget_show(tmp); | 3804 gtk_widget_set_visible(tmp, TRUE); |
3805 if(text) | 3805 if(text) |
3806 gtk_widget_set_tooltip_text(tmp, text); | 3806 gtk_widget_set_tooltip_text(tmp, text); |
3807 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3807 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3808 DW_FUNCTION_RETURN_THIS(tmp); | 3808 DW_FUNCTION_RETURN_THIS(tmp); |
3809 } | 3809 } |
3822 GtkAdjustment *adj = (GtkAdjustment *)gtk_adjustment_new((float)atoi(text), -65536.0, 65536.0, 1.0, 5.0, 0.0); | 3822 GtkAdjustment *adj = (GtkAdjustment *)gtk_adjustment_new((float)atoi(text), -65536.0, 65536.0, 1.0, 5.0, 0.0); |
3823 GtkWidget *tmp = gtk_spin_button_new(adj, 0, 0); | 3823 GtkWidget *tmp = gtk_spin_button_new(adj, 0, 0); |
3824 | 3824 |
3825 gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(tmp), TRUE); | 3825 gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(tmp), TRUE); |
3826 gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(tmp), TRUE); | 3826 gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(tmp), TRUE); |
3827 gtk_widget_show(tmp); | 3827 gtk_widget_set_visible(tmp, TRUE); |
3828 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adj); | 3828 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adj); |
3829 g_object_set_data(G_OBJECT(adj), "_dw_spinbutton", (gpointer)tmp); | 3829 g_object_set_data(G_OBJECT(adj), "_dw_spinbutton", (gpointer)tmp); |
3830 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3830 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3831 if(_DWDefaultFont) | 3831 if(_DWDefaultFont) |
3832 dw_window_set_font(tmp, _DWDefaultFont); | 3832 dw_window_set_font(tmp, _DWDefaultFont); |
3844 DW_FUNCTION_RETURN(dw_radiobutton_new, HWND) | 3844 DW_FUNCTION_RETURN(dw_radiobutton_new, HWND) |
3845 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG) | 3845 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG) |
3846 { | 3846 { |
3847 GtkWidget *tmp = gtk_toggle_button_new_with_label(text); | 3847 GtkWidget *tmp = gtk_toggle_button_new_with_label(text); |
3848 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3848 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3849 gtk_widget_show(tmp); | 3849 gtk_widget_set_visible(tmp, TRUE); |
3850 | 3850 |
3851 if(_DWDefaultFont) | 3851 if(_DWDefaultFont) |
3852 dw_window_set_font(tmp, _DWDefaultFont); | 3852 dw_window_set_font(tmp, _DWDefaultFont); |
3853 DW_FUNCTION_RETURN_THIS(tmp); | 3853 DW_FUNCTION_RETURN_THIS(tmp); |
3854 } | 3854 } |
3867 | 3867 |
3868 { | 3868 { |
3869 GtkAdjustment *adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, (gfloat)increments, 1, 1, 1); | 3869 GtkAdjustment *adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, (gfloat)increments, 1, 1, 1); |
3870 GtkWidget *tmp = gtk_scale_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment); | 3870 GtkWidget *tmp = gtk_scale_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment); |
3871 | 3871 |
3872 gtk_widget_show(tmp); | 3872 gtk_widget_set_visible(tmp, TRUE); |
3873 gtk_scale_set_draw_value(GTK_SCALE(tmp), 0); | 3873 gtk_scale_set_draw_value(GTK_SCALE(tmp), 0); |
3874 gtk_scale_set_digits(GTK_SCALE(tmp), 0); | 3874 gtk_scale_set_digits(GTK_SCALE(tmp), 0); |
3875 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment); | 3875 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment); |
3876 g_object_set_data(G_OBJECT(adjustment), "_dw_slider", (gpointer)tmp); | 3876 g_object_set_data(G_OBJECT(adjustment), "_dw_slider", (gpointer)tmp); |
3877 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3877 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3892 { | 3892 { |
3893 GtkAdjustment *adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, 0, 1, 1, 1); | 3893 GtkAdjustment *adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, 0, 1, 1, 1); |
3894 GtkWidget *tmp = gtk_scrollbar_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment); | 3894 GtkWidget *tmp = gtk_scrollbar_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment); |
3895 | 3895 |
3896 gtk_widget_set_can_focus(tmp, FALSE); | 3896 gtk_widget_set_can_focus(tmp, FALSE); |
3897 gtk_widget_show(tmp); | 3897 gtk_widget_set_visible(tmp, TRUE); |
3898 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment); | 3898 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment); |
3899 g_object_set_data(G_OBJECT(adjustment), "_dw_scrollbar", (gpointer)tmp); | 3899 g_object_set_data(G_OBJECT(adjustment), "_dw_scrollbar", (gpointer)tmp); |
3900 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3900 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3901 DW_FUNCTION_RETURN_THIS(tmp); | 3901 DW_FUNCTION_RETURN_THIS(tmp); |
3902 } | 3902 } |
3911 DW_FUNCTION_RETURN(dw_percent_new, HWND) | 3911 DW_FUNCTION_RETURN(dw_percent_new, HWND) |
3912 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG) | 3912 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG) |
3913 | 3913 |
3914 { | 3914 { |
3915 GtkWidget *tmp = gtk_progress_bar_new(); | 3915 GtkWidget *tmp = gtk_progress_bar_new(); |
3916 gtk_widget_show(tmp); | 3916 gtk_widget_set_visible(tmp, TRUE); |
3917 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3917 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3918 DW_FUNCTION_RETURN_THIS(tmp); | 3918 DW_FUNCTION_RETURN_THIS(tmp); |
3919 } | 3919 } |
3920 | 3920 |
3921 /* | 3921 /* |
3928 DW_FUNCTION_ADD_PARAM2(text, cid) | 3928 DW_FUNCTION_ADD_PARAM2(text, cid) |
3929 DW_FUNCTION_RETURN(dw_checkbox_new, HWND) | 3929 DW_FUNCTION_RETURN(dw_checkbox_new, HWND) |
3930 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG) | 3930 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG) |
3931 { | 3931 { |
3932 GtkWidget *tmp = gtk_check_button_new_with_label(text); | 3932 GtkWidget *tmp = gtk_check_button_new_with_label(text); |
3933 gtk_widget_show(tmp); | 3933 gtk_widget_set_visible(tmp, TRUE); |
3934 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 3934 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
3935 if(_DWDefaultFont) | 3935 if(_DWDefaultFont) |
3936 dw_window_set_font(tmp, _DWDefaultFont); | 3936 dw_window_set_font(tmp, _DWDefaultFont); |
3937 DW_FUNCTION_RETURN_THIS(tmp); | 3937 DW_FUNCTION_RETURN_THIS(tmp); |
3938 } | 3938 } |
3973 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); | 3973 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); |
3974 if(multi) | 3974 if(multi) |
3975 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE); | 3975 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE); |
3976 else | 3976 else |
3977 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); | 3977 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); |
3978 gtk_widget_show(tree); | 3978 gtk_widget_set_visible(tree, TRUE); |
3979 if(_DWDefaultFont) | 3979 if(_DWDefaultFont) |
3980 dw_window_set_font(tmp, _DWDefaultFont); | 3980 dw_window_set_font(tmp, _DWDefaultFont); |
3981 } | 3981 } |
3982 DW_FUNCTION_RETURN_THIS(tmp); | 3982 DW_FUNCTION_RETURN_THIS(tmp); |
3983 } | 3983 } |
5464 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); | 5464 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); |
5465 if(g_object_get_data(G_OBJECT(handle), "_dw_multi_sel")) | 5465 if(g_object_get_data(G_OBJECT(handle), "_dw_multi_sel")) |
5466 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE); | 5466 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE); |
5467 else | 5467 else |
5468 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); | 5468 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); |
5469 gtk_widget_show(tree); | 5469 gtk_widget_set_visible(tree, TRUE); |
5470 free(array); | 5470 free(array); |
5471 if(_DWDefaultFont) | 5471 if(_DWDefaultFont) |
5472 dw_window_set_font(handle, _DWDefaultFont); | 5472 dw_window_set_font(handle, _DWDefaultFont); |
5473 return DW_ERROR_NONE; | 5473 return DW_ERROR_NONE; |
5474 } | 5474 } |
6614 { | 6614 { |
6615 GtkWidget *tmp = gtk_drawing_area_new(); | 6615 GtkWidget *tmp = gtk_drawing_area_new(); |
6616 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 6616 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
6617 g_signal_connect(G_OBJECT(tmp), "destroy", G_CALLBACK(_dw_render_destroy), NULL); | 6617 g_signal_connect(G_OBJECT(tmp), "destroy", G_CALLBACK(_dw_render_destroy), NULL); |
6618 gtk_widget_set_can_focus(tmp, TRUE); | 6618 gtk_widget_set_can_focus(tmp, TRUE); |
6619 gtk_widget_show(tmp); | 6619 gtk_widget_set_visible(tmp, TRUE); |
6620 if(_DWDefaultFont) | 6620 if(_DWDefaultFont) |
6621 dw_window_set_font(tmp, _DWDefaultFont); | 6621 dw_window_set_font(tmp, _DWDefaultFont); |
6622 DW_FUNCTION_RETURN_THIS(tmp); | 6622 DW_FUNCTION_RETURN_THIS(tmp); |
6623 } | 6623 } |
6624 | 6624 |
6713 | 6713 |
6714 cd = (GtkColorChooser *)gtk_color_chooser_dialog_new("Choose color", NULL); | 6714 cd = (GtkColorChooser *)gtk_color_chooser_dialog_new("Choose color", NULL); |
6715 gtk_color_chooser_set_use_alpha(cd, FALSE); | 6715 gtk_color_chooser_set_use_alpha(cd, FALSE); |
6716 gtk_color_chooser_set_rgba(cd, &color); | 6716 gtk_color_chooser_set_rgba(cd, &color); |
6717 | 6717 |
6718 gtk_widget_show(GTK_WIDGET(cd)); | 6718 gtk_widget_set_visible(GTK_WIDGET(cd), TRUE); |
6719 g_signal_connect(G_OBJECT(cd), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp); | 6719 g_signal_connect(G_OBJECT(cd), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp); |
6720 | 6720 |
6721 if(DW_POINTER_TO_INT(dw_dialog_wait(tmp)) == GTK_RESPONSE_OK) | 6721 if(DW_POINTER_TO_INT(dw_dialog_wait(tmp)) == GTK_RESPONSE_OK) |
6722 { | 6722 { |
6723 gtk_color_chooser_get_rgba(cd, &color); | 6723 gtk_color_chooser_get_rgba(cd, &color); |
8494 /* Can't pack nothing with GTK, so create an empty label */ | 8494 /* Can't pack nothing with GTK, so create an empty label */ |
8495 if(!item) | 8495 if(!item) |
8496 { | 8496 { |
8497 item = gtk_label_new(""); | 8497 item = gtk_label_new(""); |
8498 g_object_set_data(G_OBJECT(item), "_dw_padding", GINT_TO_POINTER(1)); | 8498 g_object_set_data(G_OBJECT(item), "_dw_padding", GINT_TO_POINTER(1)); |
8499 gtk_widget_show(item); | 8499 gtk_widget_set_visible(item, TRUE); |
8500 } | 8500 } |
8501 | 8501 |
8502 /* Check if the item to be packed is a special box */ | 8502 /* Check if the item to be packed is a special box */ |
8503 tmpitem = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_boxhandle"); | 8503 tmpitem = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_boxhandle"); |
8504 | 8504 |
9987 gtk_paned_set_shrink_end_child(GTK_PANED(tmp), FALSE); | 9987 gtk_paned_set_shrink_end_child(GTK_PANED(tmp), FALSE); |
9988 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 9988 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
9989 *percent = 50.0; | 9989 *percent = 50.0; |
9990 g_object_set_data(G_OBJECT(tmp), "_dw_percent", (gpointer)percent); | 9990 g_object_set_data(G_OBJECT(tmp), "_dw_percent", (gpointer)percent); |
9991 g_signal_connect(G_OBJECT(tmp), "realize", G_CALLBACK(_dw_splitbar_realize), NULL); | 9991 g_signal_connect(G_OBJECT(tmp), "realize", G_CALLBACK(_dw_splitbar_realize), NULL); |
9992 gtk_widget_show(tmp); | 9992 gtk_widget_set_visible(tmp, TRUE); |
9993 DW_FUNCTION_RETURN_THIS(tmp); | 9993 DW_FUNCTION_RETURN_THIS(tmp); |
9994 } | 9994 } |
9995 | 9995 |
9996 /* | 9996 /* |
9997 * Sets the position of a splitbar (pecentage). | 9997 * Sets the position of a splitbar (pecentage). |
10055 { | 10055 { |
10056 GtkWidget *tmp = gtk_calendar_new(); | 10056 GtkWidget *tmp = gtk_calendar_new(); |
10057 GTimeZone *tz = g_time_zone_new_local(); | 10057 GTimeZone *tz = g_time_zone_new_local(); |
10058 GDateTime *now = g_date_time_new_now(tz); | 10058 GDateTime *now = g_date_time_new_now(tz); |
10059 | 10059 |
10060 gtk_widget_show(tmp); | 10060 gtk_widget_set_visible(tmp, TRUE); |
10061 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); | 10061 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(cid)); |
10062 /* select today */ | 10062 /* select today */ |
10063 gtk_calendar_set_show_day_names(GTK_CALENDAR(tmp), TRUE); | 10063 gtk_calendar_set_show_day_names(GTK_CALENDAR(tmp), TRUE); |
10064 gtk_calendar_set_show_heading(GTK_CALENDAR(tmp), TRUE); | 10064 gtk_calendar_set_show_heading(GTK_CALENDAR(tmp), TRUE); |
10065 gtk_calendar_select_day(GTK_CALENDAR(tmp), now); | 10065 gtk_calendar_select_day(GTK_CALENDAR(tmp), now); |
10362 | 10362 |
10363 g_object_unref(G_OBJECT(path)); | 10363 g_object_unref(G_OBJECT(path)); |
10364 } | 10364 } |
10365 } | 10365 } |
10366 | 10366 |
10367 gtk_widget_show(GTK_WIDGET(filew)); | 10367 gtk_widget_set_visible(GTK_WIDGET(filew), TRUE); |
10368 g_signal_connect(G_OBJECT(filew), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp); | 10368 g_signal_connect(G_OBJECT(filew), "response", G_CALLBACK(_dw_dialog_response), (gpointer)tmp); |
10369 | 10369 |
10370 if(DW_POINTER_TO_INT(dw_dialog_wait(tmp)) == GTK_RESPONSE_ACCEPT) | 10370 if(DW_POINTER_TO_INT(dw_dialog_wait(tmp)) == GTK_RESPONSE_ACCEPT) |
10371 { | 10371 { |
10372 GFile *file = gtk_file_chooser_get_file(GTK_FILE_CHOOSER(filew)); | 10372 GFile *file = gtk_file_chooser_get_file(GTK_FILE_CHOOSER(filew)); |
10527 WebKitWebView *web_view; | 10527 WebKitWebView *web_view; |
10528 | 10528 |
10529 if((web_view = _dw_html_web_view(handle))) | 10529 if((web_view = _dw_html_web_view(handle))) |
10530 { | 10530 { |
10531 webkit_web_view_load_html(web_view, string, "file:///"); | 10531 webkit_web_view_load_html(web_view, string, "file:///"); |
10532 gtk_widget_show(GTK_WIDGET(handle)); | 10532 gtk_widget_set_visible(GTK_WIDGET(handle), TRUE); |
10533 } | 10533 } |
10534 return DW_ERROR_NONE; | 10534 return DW_ERROR_NONE; |
10535 #else | 10535 #else |
10536 return DW_ERROR_UNKNOWN; | 10536 return DW_ERROR_UNKNOWN; |
10537 #endif | 10537 #endif |
10552 WebKitWebView *web_view; | 10552 WebKitWebView *web_view; |
10553 | 10553 |
10554 if((web_view = _dw_html_web_view(handle))) | 10554 if((web_view = _dw_html_web_view(handle))) |
10555 { | 10555 { |
10556 webkit_web_view_load_uri(web_view, url); | 10556 webkit_web_view_load_uri(web_view, url); |
10557 gtk_widget_show(GTK_WIDGET(handle)); | 10557 gtk_widget_set_visible(GTK_WIDGET(handle), TRUE); |
10558 } | 10558 } |
10559 return DW_ERROR_NONE; | 10559 return DW_ERROR_NONE; |
10560 #else | 10560 #else |
10561 return DW_ERROR_UNKNOWN; | 10561 return DW_ERROR_UNKNOWN; |
10562 #endif | 10562 #endif |
10667 /* Make sure java script is enabled */ | 10667 /* Make sure java script is enabled */ |
10668 webkit_settings_set_enable_javascript(settings, TRUE); | 10668 webkit_settings_set_enable_javascript(settings, TRUE); |
10669 webkit_web_view_set_settings(web_view, settings); | 10669 webkit_web_view_set_settings(web_view, settings); |
10670 widget = (GtkWidget *)web_view; | 10670 widget = (GtkWidget *)web_view; |
10671 g_object_set_data(G_OBJECT(widget), "_dw_id", GINT_TO_POINTER(cid)); | 10671 g_object_set_data(G_OBJECT(widget), "_dw_id", GINT_TO_POINTER(cid)); |
10672 gtk_widget_show(widget); | 10672 gtk_widget_set_visible(widget, TRUE); |
10673 #else | 10673 #else |
10674 dw_debug( "HTML widget not available; you do not have access to webkit.\n" ); | 10674 dw_debug( "HTML widget not available; you do not have access to webkit.\n" ); |
10675 #endif | 10675 #endif |
10676 DW_FUNCTION_RETURN_THIS(widget); | 10676 DW_FUNCTION_RETURN_THIS(widget); |
10677 } | 10677 } |