From ab9f9bc492b9e5f0bcd9f5c0ccbcfd21b553b97b Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 4 Apr 2014 16:55:28 +0000 Subject: [PATCH] avoid preprocessor directives inside macro invocation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/mediactrl.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index 9e9616373a..04e56382cc 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -337,13 +337,12 @@ static gint gtk_window_realize_callback(GtkWidget* widget, gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay), GDK_WINDOW_XID(window) ); - g_signal_connect (be->GetControl()->m_wxwindow, + GtkWidget* w = be->GetControl()->m_wxwindow; #ifdef __WXGTK3__ - "draw", G_CALLBACK(draw), + g_signal_connect(w, "draw", G_CALLBACK(draw), be); #else - "expose_event", G_CALLBACK(expose_event), + g_signal_connect(w, "expose_event", G_CALLBACK(expose_event), be); #endif - be); return 0; } } @@ -748,13 +747,12 @@ void wxGStreamerMediaBackend::SetupXOverlay() #endif ); #ifdef __WXGTK__ - g_signal_connect(m_ctrl->m_wxwindow, + GtkWidget* w = m_ctrl->m_wxwindow; #ifdef __WXGTK3__ - "draw", G_CALLBACK(draw), + g_signal_connect(w, "draw", G_CALLBACK(draw), this); #else - "expose_event", G_CALLBACK(expose_event), + g_signal_connect(w, "expose_event", G_CALLBACK(expose_event), this); #endif - this); } // end if GtkPizza realized #endif }