X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c42b1de68a5d4b48c00092d9996574bfb8d8a542..d1a6e2b7a103d761fbc15e0e9c1c20ab53a849d9:/contrib/src/mmedia/vidxanm.cpp

diff --git a/contrib/src/mmedia/vidxanm.cpp b/contrib/src/mmedia/vidxanm.cpp
index 3b499eaf6c..e2bb35a3b2 100644
--- a/contrib/src/mmedia/vidxanm.cpp
+++ b/contrib/src/mmedia/vidxanm.cpp
@@ -12,14 +12,16 @@
 #pragma implementation "vidxanm.h"
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 #endif
 
+#ifdef __WXGTK__
 // Pizza !
 #include <wx/gtk/win_gtk.h>
+#endif
 
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
@@ -106,7 +108,7 @@ wxVideoXANIM::wxVideoXANIM()
     m_xanim_detector = new wxVideoXANIMProcess(this);
     m_xanim_started  = FALSE;
     m_paused         = FALSE;
-    m_filename       = "";
+    m_filename       = wxEmptyString;
     m_remove_file    = FALSE;
 }
 
@@ -120,7 +122,7 @@ wxVideoXANIM::wxVideoXANIM(wxInputStream& str)
     m_size[0]        = 0;
     m_size[1]        = 0;
     
-    m_filename       = wxGetTempFileName("vidxa");
+    m_filename       = wxGetTempFileName(_T("vidxa"));
     m_remove_file    = TRUE;
     wxFileOutputStream fout(m_filename);
     
@@ -370,7 +372,7 @@ bool wxVideoXANIM::CollectInfo()
     wxInputStream *infoStream = xanimProcess->GetInputStream();
     wxString totalOutput;
         
-    while (infoStream->LastError() == wxSTREAM_NOERROR) {
+    while (infoStream->GetLastError() == wxSTREAM_NO_ERROR) {
         char line[100];
 
         infoStream->Read(line, sizeof(line)-1);
@@ -379,7 +381,7 @@ bool wxVideoXANIM::CollectInfo()
         
         line[infoStream->LastRead()] = 0;
        
-        totalOutput += line;        
+        totalOutput += wxString::FromAscii(line); 
     }
 
     // This is good for everything ... :-)
@@ -391,7 +393,7 @@ bool wxVideoXANIM::CollectInfo()
     m_movieCodec = totalOutput(0, position);
 
     totalOutput.Remove(0, position);
-    tokenizer.SetString(totalOutput, "\n\r");
+    tokenizer.SetString(totalOutput, wxT("\n\r"));
 
     // the rest of the line
     wxString token = tokenizer.GetNextToken();
@@ -466,8 +468,7 @@ bool wxVideoXANIM::RestartXANIM()
     GtkPizza *pizza = GTK_PIZZA( m_video_output->m_wxwindow );
     GdkWindow *window = pizza->bin_window;
     
-    m_internal->xanim_window =
-        ((GdkWindowPrivate *)window)->xwindow;
+    m_internal->xanim_window = GDK_WINDOW_XWINDOW(window);
 #endif
     // Get the XANIM atom
     m_internal->xanim_atom = XInternAtom(m_internal->xanim_dpy,