gtk2.20.patch 2.7 KB

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