wok-current annotate gtkglext/stuff/gtk2.20.patch @ rev 18443

libgd: fix build
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Sep 24 18:27:14 2015 +0200 (2015-09-24)
parents
children
rev   line source
slaxemulator@7425 1 diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c
slaxemulator@7425 2 --- gtkglext-1.2.0.orig/gtk/gtkglwidget.c 2004-02-20 11:38:36.000000000 +0200
slaxemulator@7425 3 +++ gtkglext-1.2.0/gtk/gtkglwidget.c 2010-04-20 19:29:42.941917275 +0300
slaxemulator@7425 4 @@ -127,7 +127,7 @@
slaxemulator@7425 5 * Synchronize OpenGL and window resizing request streams.
slaxemulator@7425 6 */
slaxemulator@7425 7
slaxemulator@7425 8 - if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
slaxemulator@7425 9 + if (gtk_widget_get_realized (widget) && private->is_realized)
slaxemulator@7425 10 {
slaxemulator@7425 11 gldrawable = gdk_window_get_gl_drawable (widget->window);
slaxemulator@7425 12 gdk_gl_drawable_wait_gdk (gldrawable);
slaxemulator@7425 13 @@ -154,7 +154,7 @@
slaxemulator@7425 14 * Remove OpenGL-capability from widget->window.
slaxemulator@7425 15 */
slaxemulator@7425 16
slaxemulator@7425 17 - if (GTK_WIDGET_REALIZED (widget))
slaxemulator@7425 18 + if (gtk_widget_get_realized (widget))
slaxemulator@7425 19 gdk_window_unset_gl_capability (widget->window);
slaxemulator@7425 20
slaxemulator@7425 21 private->is_realized = FALSE;
slaxemulator@7425 22 @@ -174,7 +174,7 @@
slaxemulator@7425 23 */
slaxemulator@7425 24
slaxemulator@7425 25 toplevel = gtk_widget_get_toplevel (widget);
slaxemulator@7425 26 - if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
slaxemulator@7425 27 + if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
slaxemulator@7425 28 {
slaxemulator@7425 29 GTK_GL_NOTE (MISC,
slaxemulator@7425 30 g_message (" - Install colormap to the top-level window."));
slaxemulator@7425 31 @@ -194,7 +194,7 @@
slaxemulator@7425 32 * Set a background of "None" on window to avoid AIX X server crash.
slaxemulator@7425 33 */
slaxemulator@7425 34
slaxemulator@7425 35 - if (GTK_WIDGET_REALIZED (widget))
slaxemulator@7425 36 + if (gtk_widget_get_realized (widget))
slaxemulator@7425 37 {
slaxemulator@7425 38 GTK_GL_NOTE (MISC,
slaxemulator@7425 39 g_message (" - window->bg_pixmap = %p",
slaxemulator@7425 40 @@ -250,8 +250,8 @@
slaxemulator@7425 41 GTK_GL_NOTE_FUNC ();
slaxemulator@7425 42
slaxemulator@7425 43 g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
slaxemulator@7425 44 - g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
slaxemulator@7425 45 - g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
slaxemulator@7425 46 + g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
slaxemulator@7425 47 + g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
slaxemulator@7425 48 g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
slaxemulator@7425 49
slaxemulator@7425 50 /*
slaxemulator@7425 51 @@ -432,7 +432,7 @@
slaxemulator@7425 52 GTK_GL_NOTE_FUNC ();
slaxemulator@7425 53
slaxemulator@7425 54 g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
slaxemulator@7425 55 - g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
slaxemulator@7425 56 + g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
slaxemulator@7425 57
slaxemulator@7425 58 gldrawable = gdk_window_get_gl_drawable (widget->window);
slaxemulator@7425 59 if (gldrawable == NULL)
slaxemulator@7425 60 @@ -474,7 +474,7 @@
slaxemulator@7425 61 GLWidgetPrivate *private;
slaxemulator@7425 62
slaxemulator@7425 63 g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
slaxemulator@7425 64 - g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
slaxemulator@7425 65 + g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
slaxemulator@7425 66
slaxemulator@7425 67 private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
slaxemulator@7425 68 if (private == NULL)
slaxemulator@7425 69 @@ -501,7 +501,7 @@
slaxemulator@7425 70 gtk_widget_get_gl_window (GtkWidget *widget)
slaxemulator@7425 71 {
slaxemulator@7425 72 g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
slaxemulator@7425 73 - g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
slaxemulator@7425 74 + g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
slaxemulator@7425 75
slaxemulator@7425 76 return gdk_window_get_gl_window (widget->window);
slaxemulator@7425 77 }