* configure.ac.in: fixed the wx-config detection by the skins plugin.

[vlc] / modules / gui / wxwindows / fileinfo.cpp

diff --git a/modules/gui/wxwindows/fileinfo.cpp b/modules/gui/wxwindows/fileinfo.cpp
index ac0b8969709847d96445402e857bb0d5dc181f22..1b85330e84165029ff9f6d198372ba493c504c0d 100644 (file)
--- a/modules/gui/wxwindows/fileinfo.cpp
+++ b/modules/gui/wxwindows/fileinfo.cpp
@@ -2,7 +2,7 @@
  * fileinfo.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: fileinfo.cpp,v 1.10 2003/04/21 16:55:53 anil Exp $
+ * $Id: fileinfo.cpp,v 1.13 2003/05/11 13:45:21 gbazin Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -76,7 +76,7 @@ END_EVENT_TABLE()
  * Constructor.
  *****************************************************************************/
 FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ):
-    wxFrame( _p_main_interface, -1, "FileInfo", wxDefaultPosition,
+    wxFrame( _p_main_interface, -1, wxU(_("FileInfo")), wxDefaultPosition,
              wxDefaultSize, wxDEFAULT_FRAME_STYLE )
 {
     /* Initializations */
@@ -92,10 +92,10 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ):
         new wxTreeCtrl( panel, -1, wxDefaultPosition, wxSize( 350, 350 ),
                         wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT | wxSUNKEN_BORDER );
 
-    fileinfo_root_label = "";
+    fileinfo_root_label = wxT("");
 
     /* Create the OK button */
-    wxButton *ok_button = new wxButton( panel, wxID_OK, _("OK") );
+    wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
     ok_button->SetDefault();
 
     /* Place everything in sizers */
@@ -123,43 +123,43 @@ void FileInfo::UpdateFileInfo()
     {
         if( fileinfo_root )
         {
-            fileinfo_tree->SetItemText ( fileinfo_root , "");
-            fileinfo_root_label = "";
-            fileinfo_tree->DeleteChildren ( fileinfo_root );
+            fileinfo_root_label = wxT("");
+            fileinfo_tree->DeleteChildren( fileinfo_root );
         }
         return;
     }
 
-    wxString inputinfo = p_input->psz_name;
-
     if( !fileinfo_root )
     {
-        fileinfo_root = fileinfo_tree->AddRoot( p_input->psz_name );
-        fileinfo_root_label = p_input->psz_name;
+        /* On linux, the first argument of wxTreeCtrl::AddRoot() can be
+         * retrieved with the GetItemText() method, but it doesn't work on
+         * Windows when the wxTR_HIDE_ROOT style is set. That's why we need to
+         * use the fileinfo_root_label variable... */
+        fileinfo_root = fileinfo_tree->AddRoot( wxU(p_input->psz_name) );
+        fileinfo_root_label = wxU(p_input->psz_name);
     }
-    else if( fileinfo_root_label == inputinfo )
+    else if( fileinfo_root_label == wxU(p_input->psz_name) )
     {
         return;
     }
 
+    /* We rebuild the tree from scratch */
     fileinfo_tree->DeleteChildren( fileinfo_root );
+    fileinfo_root_label = wxU(p_input->psz_name);
 
     vlc_mutex_lock( &p_input->stream.stream_lock );
 
-    fileinfo_tree->SetItemText( fileinfo_root , p_input->psz_name );
-    fileinfo_root_label = p_input->psz_name;
-
     input_info_category_t *p_cat = p_input->stream.p_info;
 
-    while ( p_cat )
+    while( p_cat )
     {
         wxTreeItemId cat = fileinfo_tree->AppendItem( fileinfo_root,
-                                                      p_cat->psz_name );
+                                                      wxU(p_cat->psz_name) );
         input_info_t *p_info = p_cat->p_info;
-        while ( p_info )
+        while( p_info )
         {
-            fileinfo_tree->AppendItem( cat, wxString(p_info->psz_name) + ": "
-                                            + p_info->psz_value );
+            fileinfo_tree->AppendItem( cat, (wxString)wxU(p_info->psz_name) +
+                                       wxT(": ") + wxU(p_info->psz_value) );
             p_info = p_info->p_next;
         }
         p_cat = p_cat->p_next;