Mercurial > dwindows
comparison gtk/dw.c @ 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 | c38ec904b6d3 |
comparison
equal
deleted
inserted
replaced
1168:4e8f00c31c91 | 1169:8be8607301c8 |
---|---|
404 /* Local data */ | 404 /* Local data */ |
405 static GtkWidgetClass *parent_class = NULL; | 405 static GtkWidgetClass *parent_class = NULL; |
406 | 406 |
407 static void gtk_mdi_class_init(GtkMdiClass *class) | 407 static void gtk_mdi_class_init(GtkMdiClass *class) |
408 { | 408 { |
409 GObjectClass *object_class; | |
410 GtkWidgetClass *widget_class; | 409 GtkWidgetClass *widget_class; |
411 GtkContainerClass *container_class; | 410 GtkContainerClass *container_class; |
412 | 411 |
413 object_class = (GObjectClass *) class; | |
414 widget_class = (GtkWidgetClass *) class; | 412 widget_class = (GtkWidgetClass *) class; |
415 container_class = (GtkContainerClass *) class; | 413 container_class = (GtkContainerClass *) class; |
416 | 414 |
417 parent_class = gtk_type_class (GTK_TYPE_CONTAINER); | 415 parent_class = gtk_type_class (GTK_TYPE_CONTAINER); |
418 | 416 |
4065 * Parameters: | 4063 * Parameters: |
4066 * id: An ID to be used with dw_window_from_id() or 0L. | 4064 * id: An ID to be used with dw_window_from_id() or 0L. |
4067 */ | 4065 */ |
4068 HWND dw_mle_new(unsigned long id) | 4066 HWND dw_mle_new(unsigned long id) |
4069 { | 4067 { |
4070 GtkWidget *tmp, *tmpbox, *scroller; | 4068 GtkWidget *tmp, *tmpbox; |
4069 #if GTK_MAJOR_VERSION < 2 | |
4070 GtkWidget *scroller; | |
4071 #endif | |
4071 int _locked_by_me = FALSE; | 4072 int _locked_by_me = FALSE; |
4072 | 4073 |
4073 DW_MUTEX_LOCK; | 4074 DW_MUTEX_LOCK; |
4074 #if GTK_MAJOR_VERSION > 1 | 4075 #if GTK_MAJOR_VERSION > 1 |
4075 tmpbox = gtk_scrolled_window_new (NULL, NULL); | 4076 tmpbox = gtk_scrolled_window_new (NULL, NULL); |
4077 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); | 4078 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); |
4078 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tmpbox), GTK_SHADOW_ETCHED_IN); | 4079 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tmpbox), GTK_SHADOW_ETCHED_IN); |
4079 tmp = gtk_text_view_new(); | 4080 tmp = gtk_text_view_new(); |
4080 gtk_container_add (GTK_CONTAINER(tmpbox), tmp); | 4081 gtk_container_add (GTK_CONTAINER(tmpbox), tmp); |
4081 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_NONE); | 4082 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_NONE); |
4082 | |
4083 scroller = NULL; | |
4084 #else | 4083 #else |
4085 tmpbox = gtk_hbox_new(FALSE, 0); | 4084 tmpbox = gtk_hbox_new(FALSE, 0); |
4086 tmp = gtk_text_new(NULL, NULL); | 4085 tmp = gtk_text_new(NULL, NULL); |
4087 gtk_text_set_word_wrap(GTK_TEXT(tmp), FALSE); | 4086 gtk_text_set_word_wrap(GTK_TEXT(tmp), FALSE); |
4088 gtk_text_set_line_wrap(GTK_TEXT(tmp), FALSE); | 4087 gtk_text_set_line_wrap(GTK_TEXT(tmp), FALSE); |