You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
121 lines
4.6 KiB
121 lines
4.6 KiB
14 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../gtkglext/gtk2_20.patch
|
||
|
|
# Copyright (C) 2010 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
https://bugzilla.gnome.org/attachment.cgi?id=159249&action=edit
|
||
|
|
|
||
|
|
diff -Nur gtkglext-1.2.0.orig//examples/pixmap.c gtkglext-1.2.0/examples/pixmap.c
|
||
|
|
--- gtkglext-1.2.0.orig//examples/pixmap.c 2003-09-14 12:23:33.000000000 +0300
|
||
|
|
+++ gtkglext-1.2.0/examples/pixmap.c 2010-04-21 15:20:56.693815346 +0300
|
||
|
|
@@ -137,7 +137,7 @@
|
||
|
|
gpointer data)
|
||
|
|
{
|
||
|
|
gdk_draw_drawable (widget->window,
|
||
|
|
- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
|
||
|
|
+ widget->style->fg_gc[gtk_widget_get_state (widget)],
|
||
|
|
pixmap,
|
||
|
|
event->area.x, event->area.y,
|
||
|
|
event->area.x, event->area.y,
|
||
|
|
diff -Nur gtkglext-1.2.0.orig//examples/pixmap-mixed.c gtkglext-1.2.0/examples/pixmap-mixed.c
|
||
|
|
--- gtkglext-1.2.0.orig//examples/pixmap-mixed.c 2003-09-14 12:23:33.000000000 +0300
|
||
|
|
+++ gtkglext-1.2.0/examples/pixmap-mixed.c 2010-04-21 15:20:35.793817658 +0300
|
||
|
|
@@ -154,7 +154,7 @@
|
||
|
|
gpointer data)
|
||
|
|
{
|
||
|
|
gdk_draw_drawable (widget->window,
|
||
|
|
- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
|
||
|
|
+ widget->style->fg_gc[gtk_widget_get_state (widget)],
|
||
|
|
pixmap,
|
||
|
|
event->area.x, event->area.y,
|
||
|
|
event->area.x, event->area.y,
|
||
|
|
diff -Nur gtkglext-1.2.0.orig//gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c
|
||
|
|
--- gtkglext-1.2.0.orig//gtk/gtkglwidget.c 2004-02-20 11:38:36.000000000 +0200
|
||
|
|
+++ gtkglext-1.2.0/gtk/gtkglwidget.c 2010-04-21 15:18:19.007204931 +0300
|
||
|
|
@@ -127,7 +127,7 @@
|
||
|
|
* Synchronize OpenGL and window resizing request streams.
|
||
|
|
*/
|
||
|
|
|
||
|
|
- if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
|
||
|
|
+ if (gtk_widget_get_realized (widget) && private->is_realized)
|
||
|
|
{
|
||
|
|
gldrawable = gdk_window_get_gl_drawable (widget->window);
|
||
|
|
gdk_gl_drawable_wait_gdk (gldrawable);
|
||
|
|
@@ -154,7 +154,7 @@
|
||
|
|
* Remove OpenGL-capability from widget->window.
|
||
|
|
*/
|
||
|
|
|
||
|
|
- if (GTK_WIDGET_REALIZED (widget))
|
||
|
|
+ if (gtk_widget_get_realized (widget))
|
||
|
|
gdk_window_unset_gl_capability (widget->window);
|
||
|
|
|
||
|
|
private->is_realized = FALSE;
|
||
|
|
@@ -174,7 +174,7 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
toplevel = gtk_widget_get_toplevel (widget);
|
||
|
|
- if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
|
||
|
|
+ if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
|
||
|
|
{
|
||
|
|
GTK_GL_NOTE (MISC,
|
||
|
|
g_message (" - Install colormap to the top-level window."));
|
||
|
|
@@ -194,7 +194,7 @@
|
||
|
|
* Set a background of "None" on window to avoid AIX X server crash.
|
||
|
|
*/
|
||
|
|
|
||
|
|
- if (GTK_WIDGET_REALIZED (widget))
|
||
|
|
+ if (gtk_widget_get_realized (widget))
|
||
|
|
{
|
||
|
|
GTK_GL_NOTE (MISC,
|
||
|
|
g_message (" - window->bg_pixmap = %p",
|
||
|
|
@@ -250,8 +250,8 @@
|
||
|
|
GTK_GL_NOTE_FUNC ();
|
||
|
|
|
||
|
|
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
|
||
|
|
- g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
|
||
|
|
- g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
|
||
|
|
+ g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
|
||
|
|
+ g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
|
||
|
|
g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -432,7 +432,7 @@
|
||
|
|
GTK_GL_NOTE_FUNC ();
|
||
|
|
|
||
|
|
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
|
||
|
|
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
|
||
|
|
+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
|
||
|
|
|
||
|
|
gldrawable = gdk_window_get_gl_drawable (widget->window);
|
||
|
|
if (gldrawable == NULL)
|
||
|
|
@@ -474,7 +474,7 @@
|
||
|
|
GLWidgetPrivate *private;
|
||
|
|
|
||
|
|
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
|
||
|
|
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
|
||
|
|
+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
|
||
|
|
|
||
|
|
private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
|
||
|
|
if (private == NULL)
|
||
|
|
@@ -501,7 +501,7 @@
|
||
|
|
gtk_widget_get_gl_window (GtkWidget *widget)
|
||
|
|
{
|
||
|
|
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
|
||
|
|
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
|
||
|
|
+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
|
||
|
|
|
||
|
|
return gdk_window_get_gl_window (widget->window);
|
||
|
|
}
|
||
|
|
|