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

avoid preprocessor directives inside macro invocation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-04-04 16:55:28 +00:00
parent 09419dbd52
commit 4da2b51526
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/unix/mediactrl.cpp
View File

@@ -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
}