# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1316212955 0 # Node ID 8be8607301c8899b9b8c97f1ffae94730f82a821 # Parent 4e8f00c31c91c79dbd3aeaef818afde9e0e6d918 Clean up some GTK2 warnings with newer compilers. diff -r 4e8f00c31c91 -r 8be8607301c8 gtk/dw.c --- a/gtk/dw.c Fri Sep 16 22:28:14 2011 +0000 +++ b/gtk/dw.c Fri Sep 16 22:42:35 2011 +0000 @@ -406,11 +406,9 @@ static void gtk_mdi_class_init(GtkMdiClass *class) { - GObjectClass *object_class; GtkWidgetClass *widget_class; GtkContainerClass *container_class; - object_class = (GObjectClass *) class; widget_class = (GtkWidgetClass *) class; container_class = (GtkContainerClass *) class; @@ -4067,7 +4065,10 @@ */ HWND dw_mle_new(unsigned long id) { - GtkWidget *tmp, *tmpbox, *scroller; + GtkWidget *tmp, *tmpbox; +#if GTK_MAJOR_VERSION < 2 + GtkWidget *scroller; +#endif int _locked_by_me = FALSE; DW_MUTEX_LOCK; @@ -4079,8 +4080,6 @@ tmp = gtk_text_view_new(); gtk_container_add (GTK_CONTAINER(tmpbox), tmp); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_NONE); - - scroller = NULL; #else tmpbox = gtk_hbox_new(FALSE, 0); tmp = gtk_text_new(NULL, NULL);