Rework modal dialog code to not depend on now obsolete wxDIALOG_MODAL flag.

[wxWidgets.git] / contrib / src / mmedia / vidxanm.cpp

diff --git a/contrib/src/mmedia/vidxanm.cpp b/contrib/src/mmedia/vidxanm.cpp
index 9da2da3403d103e1418e2a37f7c8b7e5035b91c0..e2bb35a3b2c43a8df3b692cda075636a4e541697 100644 (file)
--- a/contrib/src/mmedia/vidxanm.cpp
+++ b/contrib/src/mmedia/vidxanm.cpp
@@ -108,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;
 }
 
@@ -122,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);
     
@@ -372,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);
@@ -381,7 +381,7 @@ bool wxVideoXANIM::CollectInfo()
         
         line[infoStream->LastRead()] = 0;
        
-        totalOutput += line;        
+        totalOutput += wxString::FromAscii(line); 
     }
 
     // This is good for everything ... :-)
@@ -393,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();
@@ -468,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,