package/gnome/gtkglext/deprecatedmacros.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../gtkglext/deprecatedmacros.patch
   5 # Copyright (C) 2010 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 diff -ur gtkglext-1.2.0_orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c
  18 --- gtkglext-1.2.0_orig/gtk/gtkglwidget.c       2010-08-09 23:58:06.000000000 +0000
  19 +++ gtkglext-1.2.0/gtk/gtkglwidget.c    2010-08-10 00:14:37.000000000 +0000
  20 @@ -127,7 +127,7 @@
  21     * Synchronize OpenGL and window resizing request streams.
  22     */
  23
  24 -  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
  25 +  if (gtk_widget_get_realized (widget) && private->is_realized)
  26      {
  27        gldrawable = gdk_window_get_gl_drawable (widget->window);
  28        gdk_gl_drawable_wait_gdk (gldrawable);
  29 @@ -154,7 +154,7 @@
  30     * Remove OpenGL-capability from widget->window.
  31     */
  32
  33 -  if (GTK_WIDGET_REALIZED (widget))
  34 +  if (gtk_widget_get_realized (widget))
  35      gdk_window_unset_gl_capability (widget->window);
  36
  37    private->is_realized = FALSE;
  38 @@ -174,7 +174,7 @@
  39     */
  40
  41    toplevel = gtk_widget_get_toplevel (widget);
  42 -  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
  43 +  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
  44      {
  45        GTK_GL_NOTE (MISC,
  46          g_message (" - Install colormap to the top-level window."));
  47 @@ -194,7 +194,7 @@
  48     * Set a background of "None" on window to avoid AIX X server crash.
  49     */
  50
  51 -  if (GTK_WIDGET_REALIZED (widget))
  52 +  if (gtk_widget_get_realized (widget))
  53      {
  54        GTK_GL_NOTE (MISC,
  55          g_message (" - window->bg_pixmap = %p",
  56 @@ -250,8 +250,8 @@
  57    GTK_GL_NOTE_FUNC ();
  58
  59    g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
  60 -  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
  61 -  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
  62 +  g_return_val_if_fail (gtk_widget_has_window (widget), FALSE);
  63 +  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
  64    g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
  65
  66    /*
  67 @@ -432,7 +432,7 @@
  68    GTK_GL_NOTE_FUNC ();
  69
  70    g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
  71 -  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
  72 +  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
  73
  74    gldrawable = gdk_window_get_gl_drawable (widget->window);
  75    if (gldrawable == NULL)
  76 @@ -474,7 +474,7 @@
  77    GLWidgetPrivate *private;
  78
  79    g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
  80 -  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
  81 +  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
  82
  83    private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
  84    if (private == NULL)
  85 @@ -501,7 +501,7 @@
  86  gtk_widget_get_gl_window (GtkWidget *widget)
  87  {
  88    g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
  89 -  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
  90 +  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
  91
  92    return gdk_window_get_gl_window (widget->window);
  93  }
  94 Only in gtkglext-1.2.0_orig: gtkglext-1.2.0