122 lines
4.4 KiB
Diff
122 lines
4.4 KiB
Diff
From 07e4335078843354246112b93c818d88f4a3f7a8 Mon Sep 17 00:00:00 2001
|
||
Date: Wed, 16 Nov 2016 15:48:39 +0300
|
||
Subject: Патчи для совместимости с gtk+2.20
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
undefined reference to GTK_WIDGET_NO_WINDOW
|
||
---
|
||
examples/pixmap-mixed.c | 2 +-
|
||
examples/pixmap.c | 2 +-
|
||
gtk/gtkglwidget.c | 18 +++++++++---------
|
||
3 files changed, 11 insertions(+), 11 deletions(-)
|
||
|
||
diff --git a/examples/pixmap-mixed.c b/examples/pixmap-mixed.c
|
||
index 2346afd..3e53f14 100644
|
||
--- a/examples/pixmap-mixed.c
|
||
+++ b/examples/pixmap-mixed.c
|
||
@@ -154,7 +154,7 @@ expose_event (GtkWidget *widget,
|
||
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 --git a/examples/pixmap.c b/examples/pixmap.c
|
||
index 10e6fc1..a14a1b7 100644
|
||
--- a/examples/pixmap.c
|
||
+++ b/examples/pixmap.c
|
||
@@ -137,7 +137,7 @@ expose_event (GtkWidget *widget,
|
||
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 --git a/gtk/gtkglwidget.c b/gtk/gtkglwidget.c
|
||
index ecb41ef..401c453 100644
|
||
--- a/gtk/gtkglwidget.c
|
||
+++ b/gtk/gtkglwidget.c
|
||
@@ -127,7 +127,7 @@ gtk_gl_widget_size_allocate (GtkWidget *widget,
|
||
* 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 @@ gtk_gl_widget_unrealize (GtkWidget *widget,
|
||
* 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 @@ gtk_gl_widget_parent_set (GtkWidget *widget,
|
||
*/
|
||
|
||
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 @@ gtk_gl_widget_style_set (GtkWidget *widget,
|
||
* 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_widget_set_gl_capability (GtkWidget *widget,
|
||
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_widget_create_gl_context (GtkWidget *widget,
|
||
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 @@ gtk_widget_get_gl_context (GtkWidget *widget)
|
||
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 @@ GdkGLWindow *
|
||
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);
|
||
}
|
||
--
|
||
2.16.4
|
||
|