--- np2/x11/gtk/Attic/gtk_screen.c 2004/07/27 17:07:49 1.6 +++ np2/x11/gtk/Attic/gtk_screen.c 2005/03/12 12:36:40 1.8 @@ -1,4 +1,4 @@ -/* $Id: gtk_screen.c,v 1.6 2004/07/27 17:07:49 monaka Exp $ */ +/* $Id: gtk_screen.c,v 1.8 2005/03/12 12:36:40 monaka Exp $ */ /* * Copyright (c) 2003 NONAKA Kimihiro @@ -12,8 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -82,7 +80,7 @@ static X11SCRNSURF scrnsurf; SCRNMNG *scrnmngp = &scrnmng; -GtkWidget *window; +GtkWidget *main_window; GtkWidget *drawarea; @@ -275,7 +273,7 @@ scrnmng_create(UINT8 mode) scrnmng.flag = SCRNFLAG_HAVEEXTEND; visual = gtk_widget_get_visual(drawarea); - if (!gtkdrawmng_getformat(drawarea, window, &fmt)) + if (!gtkdrawmng_getformat(drawarea, main_window, &fmt)) return FAILURE; switch (fmt.bits_per_pixel) {