wok diff gtkglext/stuff/gtk2.20.patch @ rev 16898
libQtSql: del bdeps
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Tue Jul 15 00:59:32 2014 +0300 (2014-07-15) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/gtkglext/stuff/gtk2.20.patch Tue Jul 15 00:59:32 2014 +0300 1.3 @@ -0,0 +1,77 @@ 1.4 +diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c 1.5 +--- gtkglext-1.2.0.orig/gtk/gtkglwidget.c 2004-02-20 11:38:36.000000000 +0200 1.6 ++++ gtkglext-1.2.0/gtk/gtkglwidget.c 2010-04-20 19:29:42.941917275 +0300 1.7 +@@ -127,7 +127,7 @@ 1.8 + * Synchronize OpenGL and window resizing request streams. 1.9 + */ 1.10 + 1.11 +- if (GTK_WIDGET_REALIZED (widget) && private->is_realized) 1.12 ++ if (gtk_widget_get_realized (widget) && private->is_realized) 1.13 + { 1.14 + gldrawable = gdk_window_get_gl_drawable (widget->window); 1.15 + gdk_gl_drawable_wait_gdk (gldrawable); 1.16 +@@ -154,7 +154,7 @@ 1.17 + * Remove OpenGL-capability from widget->window. 1.18 + */ 1.19 + 1.20 +- if (GTK_WIDGET_REALIZED (widget)) 1.21 ++ if (gtk_widget_get_realized (widget)) 1.22 + gdk_window_unset_gl_capability (widget->window); 1.23 + 1.24 + private->is_realized = FALSE; 1.25 +@@ -174,7 +174,7 @@ 1.26 + */ 1.27 + 1.28 + toplevel = gtk_widget_get_toplevel (widget); 1.29 +- if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel)) 1.30 ++ if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel)) 1.31 + { 1.32 + GTK_GL_NOTE (MISC, 1.33 + g_message (" - Install colormap to the top-level window.")); 1.34 +@@ -194,7 +194,7 @@ 1.35 + * Set a background of "None" on window to avoid AIX X server crash. 1.36 + */ 1.37 + 1.38 +- if (GTK_WIDGET_REALIZED (widget)) 1.39 ++ if (gtk_widget_get_realized (widget)) 1.40 + { 1.41 + GTK_GL_NOTE (MISC, 1.42 + g_message (" - window->bg_pixmap = %p", 1.43 +@@ -250,8 +250,8 @@ 1.44 + GTK_GL_NOTE_FUNC (); 1.45 + 1.46 + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); 1.47 +- g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE); 1.48 +- g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE); 1.49 ++ g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE); 1.50 ++ g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE); 1.51 + g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE); 1.52 + 1.53 + /* 1.54 +@@ -432,7 +432,7 @@ 1.55 + GTK_GL_NOTE_FUNC (); 1.56 + 1.57 + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); 1.58 +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); 1.59 ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); 1.60 + 1.61 + gldrawable = gdk_window_get_gl_drawable (widget->window); 1.62 + if (gldrawable == NULL) 1.63 +@@ -474,7 +474,7 @@ 1.64 + GLWidgetPrivate *private; 1.65 + 1.66 + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); 1.67 +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); 1.68 ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); 1.69 + 1.70 + private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private); 1.71 + if (private == NULL) 1.72 +@@ -501,7 +501,7 @@ 1.73 + gtk_widget_get_gl_window (GtkWidget *widget) 1.74 + { 1.75 + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); 1.76 +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); 1.77 ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); 1.78 + 1.79 + return gdk_window_get_gl_window (widget->window); 1.80 + }