cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid direct struct access for GTK3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2011-06-07 16:24:26 +00:00
parent 80e2b03182
commit 9579070b94
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/unix/mediactrl.cpp
View File

@ -38,7 +38,8 @@
#ifdef __WXGTK__ #ifdef __WXGTK__
#include <gtk/gtk.h> #include <gtk/gtk.h>
# include <gdk/gdkx.h> // for GDK_WINDOW_XWINDOW #include <gdk/gdkx.h>
#include "wx/gtk/private/gtk2-compat.h"
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -262,7 +263,7 @@ static gboolean gtk_window_expose_callback(GtkWidget *widget,
if(event->count > 0) if(event->count > 0)
return FALSE; return FALSE;
GdkWindow *window = widget->window; GdkWindow* window = gtk_widget_get_window(widget);
// I've seen this reccommended somewhere... // I've seen this reccommended somewhere...
// TODO: Is this needed? Maybe it is just cruft... // TODO: Is this needed? Maybe it is just cruft...
@ -305,7 +306,7 @@ static gint gtk_window_realize_callback(GtkWidget* widget,
{ {
gdk_flush(); gdk_flush();
GdkWindow *window = widget->window; GdkWindow* window = gtk_widget_get_window(widget);
wxASSERT(window); wxASSERT(window);
gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay), 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 // Use the xoverlay extension to tell gstreamer to play in our window
#ifdef __WXGTK__ #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 // Not realized yet - set to connect at realization time
g_signal_connect (m_ctrl->m_wxwindow, g_signal_connect (m_ctrl->m_wxwindow,
@ -710,20 +711,18 @@ void wxGStreamerMediaBackend::SetupXOverlay()
{ {
gdk_flush(); gdk_flush();
GdkWindow *window = m_ctrl->m_wxwindow->window; GdkWindow* window = gtk_widget_get_window(m_ctrl->m_wxwindow);
wxASSERT(window); wxASSERT(window);
#endif #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__ #ifdef __WXGTK__
GDK_WINDOW_XWINDOW( window ) GDK_WINDOW_XWINDOW( window )
#else #else
ctrl->GetHandle() ctrl->GetHandle()
#endif #endif
); );
#ifdef __WXGTK__ #ifdef __WXGTK__
g_signal_connect (m_ctrl->m_wxwindow, g_signal_connect(m_ctrl->m_wxwindow,
// m_ctrl->m_wxwindow/*m_ctrl->m_widget*/, // m_ctrl->m_wxwindow/*m_ctrl->m_widget*/,
"expose_event", "expose_event",
G_CALLBACK(gtk_window_expose_callback), this); G_CALLBACK(gtk_window_expose_callback), this);