From 9579070b94d9aaad1bdd3638163cb94e48d5508b Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 7 Jun 2011 16:24:26 +0000 Subject: [PATCH] avoid direct struct access for GTK3 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/mediactrl.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index 0fbf87aa14..2703497bfa 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -38,7 +38,8 @@ #ifdef __WXGTK__ #include -# include // for GDK_WINDOW_XWINDOW + #include + #include "wx/gtk/private/gtk2-compat.h" #endif //----------------------------------------------------------------------------- @@ -262,7 +263,7 @@ static gboolean gtk_window_expose_callback(GtkWidget *widget, if(event->count > 0) return FALSE; - GdkWindow *window = widget->window; + GdkWindow* window = gtk_widget_get_window(widget); // I've seen this reccommended somewhere... // TODO: Is this needed? Maybe it is just cruft... @@ -305,7 +306,7 @@ static gint gtk_window_realize_callback(GtkWidget* widget, { gdk_flush(); - GdkWindow *window = widget->window; + GdkWindow* window = gtk_widget_get_window(widget); wxASSERT(window); gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay), @@ -698,7 +699,7 @@ void wxGStreamerMediaBackend::SetupXOverlay() { // Use the xoverlay extension to tell gstreamer to play in our window #ifdef __WXGTK__ - if(!GTK_WIDGET_REALIZED(m_ctrl->m_wxwindow)) + if (!gtk_widget_get_realized(m_ctrl->m_wxwindow)) { // Not realized yet - set to connect at realization time g_signal_connect (m_ctrl->m_wxwindow, @@ -710,20 +711,18 @@ void wxGStreamerMediaBackend::SetupXOverlay() { gdk_flush(); - GdkWindow *window = m_ctrl->m_wxwindow->window; + GdkWindow* window = gtk_widget_get_window(m_ctrl->m_wxwindow); wxASSERT(window); #endif - - gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(m_xoverlay), + gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(m_xoverlay), #ifdef __WXGTK__ GDK_WINDOW_XWINDOW( window ) #else ctrl->GetHandle() #endif ); - #ifdef __WXGTK__ - g_signal_connect (m_ctrl->m_wxwindow, + g_signal_connect(m_ctrl->m_wxwindow, // m_ctrl->m_wxwindow/*m_ctrl->m_widget*/, "expose_event", G_CALLBACK(gtk_window_expose_callback), this); -- 2.45.2