Mercurial > mxe-octave

annotate src/gtkglext-3-dont-use-deprecated-functions.patch @ 968:a8381b9df70c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix patch for package gtkglext
author Volker Grabsch <vog@notjusthosting.com>
date Fri, 14 May 2010 11:36:21 +0200
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
968
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
1 This file is part of mingw-cross-env.
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
2 See doc/index.html for further information.
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
4 This patch has been taken from:
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
5 https://bugzilla.gnome.org/show_bug.cgi?id=618601
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
6
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
7 diff -r f0659740c61a gtk/gtkglwidget.c
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
8 --- a/gtk/gtkglwidget.c Fri May 14 10:57:43 2010 +0200
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9 +++ b/gtk/gtkglwidget.c Fri May 14 11:18:06 2010 +0200
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
10 @@ -127,7 +127,7 @@
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
11 * Synchronize OpenGL and window resizing request streams.
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12 */
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 - if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
15 + if (gtk_widget_get_realized (widget) && private->is_realized)
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16 {
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 gldrawable = gdk_window_get_gl_drawable (widget->window);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 gdk_gl_drawable_wait_gdk (gldrawable);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
19 @@ -154,7 +154,7 @@
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
20 * Remove OpenGL-capability from widget->window.
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21 */
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
22
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
23 - if (GTK_WIDGET_REALIZED (widget))
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
24 + if (gtk_widget_get_realized (widget))
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
25 gdk_window_unset_gl_capability (widget->window);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
26
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
27 private->is_realized = FALSE;
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
28 @@ -174,7 +174,7 @@
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
29 */
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
30
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
31 toplevel = gtk_widget_get_toplevel (widget);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
32 - if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
33 + if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
34 {
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
35 GTK_GL_NOTE (MISC,
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
36 g_message (" - Install colormap to the top-level window."));
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
37 @@ -194,7 +194,7 @@
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
38 * Set a background of "None" on window to avoid AIX X server crash.
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
39 */
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
40
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
41 - if (GTK_WIDGET_REALIZED (widget))
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
42 + if (gtk_widget_get_realized (widget))
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
43 {
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
44 GTK_GL_NOTE (MISC,
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
45 g_message (" - window->bg_pixmap = %p",
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
46 @@ -250,8 +250,8 @@
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
47 GTK_GL_NOTE_FUNC ();
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
48
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
49 g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
50 - g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
51 - g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
52 + g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
53 + g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
54 g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
55
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
56 /*
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
57 @@ -432,7 +432,7 @@
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
58 GTK_GL_NOTE_FUNC ();
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
59
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
60 g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
61 - g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
62 + g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
63
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
64 gldrawable = gdk_window_get_gl_drawable (widget->window);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
65 if (gldrawable == NULL)
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
66 @@ -474,7 +474,7 @@
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
67 GLWidgetPrivate *private;
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
68
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
69 g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
70 - g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
71 + g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
72
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
73 private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
74 if (private == NULL)
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
75 @@ -501,7 +501,7 @@
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
76 gtk_widget_get_gl_window (GtkWidget *widget)
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
77 {
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
78 g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
79 - g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
80 + g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
81
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
82 return gdk_window_get_gl_window (widget->window);
a8381b9df70c bugfix patch for package gtkglext
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
83 }