check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / unix / mediactrl.cpp

diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index c3e72b52d1cd827be9bf5c5301feb3c72a48a96d..2a333c38185f579c36c84bc9593c3e920968b441 100644 (file)
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -128,30 +128,6 @@
 // Max wait time for element state waiting - GST_CLOCK_TIME_NONE for inf
 #define wxGSTREAMER_TIMEOUT (100 * GST_MSECOND) // Max 100 milliseconds
 
 // Max wait time for element state waiting - GST_CLOCK_TIME_NONE for inf
 #define wxGSTREAMER_TIMEOUT (100 * GST_MSECOND) // Max 100 milliseconds
 

-//-----------------------------------------------------------------------------
-// wxGTK Debugging and idle stuff
-//-----------------------------------------------------------------------------
-#ifdef __WXGTK__
-
-#   ifdef __WXDEBUG__
-#       if wxUSE_THREADS
-#           define DEBUG_MAIN_THREAD \
-                if (wxThread::IsMain() && g_mainThreadLocked) \
-                    wxPrintf(wxT("gui reentrance"));
-#       else
-#           define DEBUG_MAIN_THREAD
-#       endif
-#   else
-#      define DEBUG_MAIN_THREAD
-#   endif // Debug
-
-#ifndef __WXGTK20__
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-#endif
-extern bool g_mainThreadLocked;
-#endif // wxGTK
-

 //-----------------------------------------------------------------------------
 //  wxLogTrace mask string
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  wxLogTrace mask string
 //-----------------------------------------------------------------------------


@@ -282,7 +258,7 @@ static gboolean gtk_window_expose_callback(GtkWidget *widget,
     if(event->count > 0)
         return FALSE;
 
     if(event->count > 0)
         return FALSE;
 

-    GdkWindow *window = be->GetControl()->GTKGetDrawingWindow();
+    GdkWindow *window = widget->window;

 
     // I've seen this reccommended somewhere...
     // TODO: Is this needed? Maybe it is just cruft...
 
     // I've seen this reccommended somewhere...
     // TODO: Is this needed? Maybe it is just cruft...


@@ -320,20 +296,12 @@ static gboolean gtk_window_expose_callback(GtkWidget *widget,
 //-----------------------------------------------------------------------------
 #ifdef __WXGTK__
 extern "C" {
 //-----------------------------------------------------------------------------
 #ifdef __WXGTK__
 extern "C" {

-static gint gtk_window_realize_callback(GtkWidget*,
+static gint gtk_window_realize_callback(GtkWidget* widget,

                                         wxGStreamerMediaBackend* be)
 {
                                         wxGStreamerMediaBackend* be)
 {

-    DEBUG_MAIN_THREAD // TODO: Is this neccessary?
-
-#ifndef __WXGTK20__
-    if (g_isIdle)   // FIXME: Why is needed? For wxYield? ??
-        wxapp_install_idle_handler();
-#endif
-
-    wxYield();    // FIXME: RN: X Server gets an error/crash if I don't do
-                  //       this or a messagebox beforehand?!?!??
-
-    GdkWindow *window = be->GetControl()->GTKGetDrawingWindow();
+    gdk_flush();
+    
+    GdkWindow *window = widget->window;

     wxASSERT(window);
 
     gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay),
     wxASSERT(window);
 
     gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay),


@@ -736,8 +704,9 @@ void wxGStreamerMediaBackend::SetupXOverlay()
     }
     else
     {
     }
     else
     {

-        wxYield(); // see realize callback...
-        GdkWindow *window = m_ctrl->m_wxwindow->GTKGetDrawingWindow();
+        gdk_flush();
+    
+        GdkWindow *window = m_ctrl->m_wxwindow->window;

         wxASSERT(window);
 #endif
 
         wxASSERT(window);
 #endif
 


@@ -1007,7 +976,11 @@ bool wxGStreamerMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
     char **argvGST = new char*[wxTheApp->argc + 1];
     for ( i = 0; i < wxTheApp->argc; i++ )
     {
     char **argvGST = new char*[wxTheApp->argc + 1];
     for ( i = 0; i < wxTheApp->argc; i++ )
     {

+#if wxUSE_UNICODE_WCHAR

         argvGST[i] = wxStrdupA(wxConvUTF8.cWX2MB(wxTheApp->argv[i]));
         argvGST[i] = wxStrdupA(wxConvUTF8.cWX2MB(wxTheApp->argv[i]));

+#else
+        argvGST[i] = wxStrdupA(wxTheApp->argv[i].utf8_str());
+#endif

     }
 
     argvGST[wxTheApp->argc] = NULL;
     }
 
     argvGST[wxTheApp->argc] = NULL;