[ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.

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

diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index 3edabd669f0c273e67c541e8adcadc68647fe9d8..21c2defa4086b3877c031333eae560c3d02cca0d 100644 (file)
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -12,10 +12,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/mediactrl.h"
-

 #if wxUSE_MEDIACTRL
 
 #if wxUSE_MEDIACTRL
 

+#include "wx/mediactrl.h"
+

 #if wxUSE_GSTREAMER
 
 #include <gst/gst.h>                // main gstreamer header
 #if wxUSE_GSTREAMER
 
 #include <gst/gst.h>                // main gstreamer header


@@ -28,10 +28,13 @@
 #   include <gst/gconf/gconf.h>        // gstreamer glib configuration
 #endif
 
 #   include <gst/gconf/gconf.h>        // gstreamer glib configuration
 #endif
 

-#include "wx/log.h"                 // wxLogDebug/wxLogSysError/wxLogTrace
-#include "wx/app.h"                 // wxTheApp->argc, wxTheApp->argv
+#ifndef  WX_PRECOMP
+    #include "wx/log.h"             // wxLogDebug/wxLogSysError/wxLogTrace
+    #include "wx/app.h"             // wxTheApp->argc, wxTheApp->argv
+    #include "wx/timer.h"           // wxTimer
+#endif
+

 #include "wx/thread.h"              // wxMutex/wxMutexLocker
 #include "wx/thread.h"              // wxMutex/wxMutexLocker

-#include "wx/timer.h"               // wxTimer

 
 #ifdef __WXGTK__
 #    include "wx/gtk/win_gtk.h"     // for <gdk/gdkx.h>/GDK_WINDOW_XWINDOW
 
 #ifdef __WXGTK__
 #    include "wx/gtk/win_gtk.h"     // for <gdk/gdkx.h>/GDK_WINDOW_XWINDOW


@@ -1033,7 +1036,7 @@ bool wxGStreamerMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
         if(error)
         {
             wxLogSysError(wxT("Could not initialize GStreamer\n")
         if(error)
         {
             wxLogSysError(wxT("Could not initialize GStreamer\n")

-                          wxT("Error Message:%s"), 
+                          wxT("Error Message:%s"),

                           (const wxChar*) wxConvUTF8.cMB2WX(error->message)
                          );
             g_error_free(error);
                           (const wxChar*) wxConvUTF8.cMB2WX(error->message)
                          );
             g_error_free(error);


@@ -1051,7 +1054,7 @@ bool wxGStreamerMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
 
 #ifdef __WXGTK__
     // We handle our own GTK expose events
 
 #ifdef __WXGTK__
     // We handle our own GTK expose events

-    m_ctrl->m_noExpose = TRUE;
+    m_ctrl->m_noExpose = true;

 #endif
 
     if( !m_ctrl->wxControl::Create(parent, id, pos, size,
 #endif
 
     if( !m_ctrl->wxControl::Create(parent, id, pos, size,


@@ -1196,11 +1199,11 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location)
 
         //Workaround GstURI leading "//" problem and make sure it leads
         //with that
 
         //Workaround GstURI leading "//" problem and make sure it leads
         //with that

-        return DoLoad(wxString(wxT("file://")) + 
-                      uristring.Right(uristring.Length() - 5)
+        return DoLoad(wxString(wxT("file://")) +
+                      uristring.Right(uristring.length() - 5)

                      );
     }
                      );
     }

-    else 
+    else

         return DoLoad(location.BuildURI());
 }
 
         return DoLoad(location.BuildURI());
 }
 


@@ -1357,7 +1360,7 @@ wxMediaState wxGStreamerMediaBackend::GetState()
 // NB: whether we have paused or not and keep track of the time after the
 // NB: pause and whenever the user seeks while paused
 // NB:
 // NB: whether we have paused or not and keep track of the time after the
 // NB: pause and whenever the user seeks while paused
 // NB:

-// 
+//

 // THREAD-UNSAFE, at least if not paused. Requires media to be at least paused.
 //-----------------------------------------------------------------------------
 wxLongLong wxGStreamerMediaBackend::GetPosition()
 // THREAD-UNSAFE, at least if not paused. Requires media to be at least paused.
 //-----------------------------------------------------------------------------
 wxLongLong wxGStreamerMediaBackend::GetPosition()