Mercurial > dwindows
changeset 1356:88a3cfa800a4
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 | 46c3bcd25b53 |
files | gtk/dw.c |
diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/gtk/dw.c Fri Nov 18 13:49:11 2011 +0000 +++ b/gtk/dw.c Fri Nov 18 14:01:43 2011 +0000 @@ -2096,7 +2096,9 @@ _resources.resource_data = res->resource_data; } gtk_set_locale(); +#if !GLIB_CHECK_VERSION(2,32,0) g_thread_init(NULL); +#endif #if GTK_MAJOR_VERSION > 1 gdk_threads_init(); #endif @@ -3738,7 +3740,6 @@ GtkWidget *tmphandle; char accel, *tempbuf = malloc(strlen(title)+1); int _locked_by_me = FALSE, submenucount; - guint tmp_key; GtkAccelGroup *accel_group; if (!menu) @@ -3764,8 +3765,9 @@ if (accel && accel_group) { tmphandle = gtk_check_menu_item_new_with_label(""); + gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf); +#if 0 /* TODO: This isn't working right */ tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf); -#if 0 /* This isn't working right */ gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0); #endif } @@ -3780,8 +3782,9 @@ if (accel && accel_group) { tmphandle=gtk_menu_item_new_with_label(""); + gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf); +#if 0 /* TODO: This isn't working right */ tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf); -#if 0 /* This isn't working right */ gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0); #endif }