Mercurial > dwindows

comparison gtk/dw.c @ 1356:88a3cfa800a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Code change to remove a warning on GTK2 for recent versions of gcc. Also added TODO to the comment for the broken code so I can look at it later. Same g_thread_init() deprecation change as done in GTK3.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 18 Nov 2011 14:01:43 +0000
parents dd252596227b
children 2f5e54b0c5c4
comparison
equal deleted inserted replaced
1355:dd252596227b 1356:88a3cfa800a4
2094 _resources.resource_max = res->resource_max; 2094 _resources.resource_max = res->resource_max;
2095 _resources.resource_id = res->resource_id; 2095 _resources.resource_id = res->resource_id;
2096 _resources.resource_data = res->resource_data; 2096 _resources.resource_data = res->resource_data;
2097 } 2097 }
2098 gtk_set_locale(); 2098 gtk_set_locale();
2099 #if !GLIB_CHECK_VERSION(2,32,0)
2099 g_thread_init(NULL); 2100 g_thread_init(NULL);
2101 #endif
2100 #if GTK_MAJOR_VERSION > 1 2102 #if GTK_MAJOR_VERSION > 1
2101 gdk_threads_init(); 2103 gdk_threads_init();
2102 #endif 2104 #endif
2103 2105
2104 gtk_init(argc, argv); 2106 gtk_init(argc, argv);
3736 HWND dw_menu_append_item(HMENUI menu, char *title, unsigned long id, unsigned long flags, int end, int check, HMENUI submenu) 3738 HWND dw_menu_append_item(HMENUI menu, char *title, unsigned long id, unsigned long flags, int end, int check, HMENUI submenu)
3737 { 3739 {
3738 GtkWidget *tmphandle; 3740 GtkWidget *tmphandle;
3739 char accel, *tempbuf = malloc(strlen(title)+1); 3741 char accel, *tempbuf = malloc(strlen(title)+1);
3740 int _locked_by_me = FALSE, submenucount; 3742 int _locked_by_me = FALSE, submenucount;
3741 guint tmp_key;
3742 GtkAccelGroup *accel_group; 3743 GtkAccelGroup *accel_group;
3743 3744
3744 if (!menu) 3745 if (!menu)
3745 { 3746 {
3746 free(tempbuf); 3747 free(tempbuf);
3762 if (check) 3763 if (check)
3763 { 3764 {
3764 if (accel && accel_group) 3765 if (accel && accel_group)
3765 { 3766 {
3766 tmphandle = gtk_check_menu_item_new_with_label(""); 3767 tmphandle = gtk_check_menu_item_new_with_label("");
3768 gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf);
3769 #if 0 /* TODO: This isn't working right */
3767 tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf); 3770 tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf);
3768 #if 0 /* This isn't working right */
3769 gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0); 3771 gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0);
3770 #endif 3772 #endif
3771 } 3773 }
3772 else 3774 else
3773 tmphandle = gtk_check_menu_item_new_with_label(tempbuf); 3775 tmphandle = gtk_check_menu_item_new_with_label(tempbuf);
3778 else 3780 else
3779 { 3781 {
3780 if (accel && accel_group) 3782 if (accel && accel_group)
3781 { 3783 {
3782 tmphandle=gtk_menu_item_new_with_label(""); 3784 tmphandle=gtk_menu_item_new_with_label("");
3785 gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf);
3786 #if 0 /* TODO: This isn't working right */
3783 tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf); 3787 tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf);
3784 #if 0 /* This isn't working right */
3785 gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0); 3788 gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0);
3786 #endif 3789 #endif
3787 } 3790 }
3788 else 3791 else
3789 tmphandle=gtk_menu_item_new_with_label(tempbuf); 3792 tmphandle=gtk_menu_item_new_with_label(tempbuf);