changeset 1169:8be8607301c8

Clean up some GTK2 warnings with newer compilers.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 16 Sep 2011 22:42:35 +0000
parents 4e8f00c31c91
children 4b94c9f5ddeb
files gtk/dw.c
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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);