Applied patch [ 1736135 ] AUI: Clicking caption ignored on centered panel

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

diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index 6866709fb4be0b2f931c1d62ee2c89f76ac294fa..01a553416fef0641a8e85b3d0156f0aa13244baf 100644 (file)
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -145,8 +145,10 @@
 #      define DEBUG_MAIN_THREAD
 #   endif // Debug
 
 #      define DEBUG_MAIN_THREAD
 #   endif // Debug
 

+#ifndef __WXGTK20__

 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;

+#endif

 extern bool g_mainThreadLocked;
 #endif // wxGTK
 
 extern bool g_mainThreadLocked;
 #endif // wxGTK
 


@@ -166,7 +168,7 @@ class WXDLLIMPEXP_MEDIA
 public:
 
     wxGStreamerMediaBackend();
 public:
 
     wxGStreamerMediaBackend();

-    ~wxGStreamerMediaBackend();
+    virtual ~wxGStreamerMediaBackend();

 
     virtual bool CreateControl(wxControl* ctrl, wxWindow* parent,
                                      wxWindowID id,
 
     virtual bool CreateControl(wxControl* ctrl, wxWindow* parent,
                                      wxWindowID id,


@@ -323,8 +325,10 @@ static gint gtk_window_realize_callback(GtkWidget* theWidget,
 {
     DEBUG_MAIN_THREAD // TODO: Is this neccessary?
 
 {
     DEBUG_MAIN_THREAD // TODO: Is this neccessary?
 

+#ifndef __WXGTK20__

     if (g_isIdle)   // FIXME: Why is needed? For wxYield? ??
         wxapp_install_idle_handler();
     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?!?!??
 
     wxYield();    // FIXME: RN: X Server gets an error/crash if I don't do
                   //       this or a messagebox beforehand?!?!??


@@ -913,7 +917,7 @@ bool wxGStreamerMediaBackend::TryVideoSink(GstElement* videosink)
 //
 // Called when the media is about to stop
 //-----------------------------------------------------------------------------
 //
 // Called when the media is about to stop
 //-----------------------------------------------------------------------------

-void wxGStreamerMediaEventHandler::OnMediaFinish(wxMediaEvent& event)
+void wxGStreamerMediaEventHandler::OnMediaFinish(wxMediaEvent& WXUNUSED(event))

 {
     // (RN - I have no idea why I thought this was good behaviour....
     // maybe it made sense for streaming/nonseeking data but
 {
     // (RN - I have no idea why I thought this was good behaviour....
     // maybe it made sense for streaming/nonseeking data but


@@ -1236,6 +1240,9 @@ bool wxGStreamerMediaBackend::DoLoad(const wxString& locstring)
             return false;
     }
 
             return false;
     }
 

+    // free current media resources
+    gst_element_set_state (m_playbin, GST_STATE_NULL);
+

     // Make sure the passed URI is valid and tell playbin to load it
     // non-file uris are encoded
     wxASSERT(gst_uri_protocol_is_valid("file"));
     // Make sure the passed URI is valid and tell playbin to load it
     // non-file uris are encoded
     wxASSERT(gst_uri_protocol_is_valid("file"));