* modules/gui/wxwindows/*: misc fixes.

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

diff --git a/modules/gui/wxwindows/fileinfo.cpp b/modules/gui/wxwindows/fileinfo.cpp
index 8f716fdd3c2a8587ee06df87c411424a70a79892..ebf95f9a00b1a29b6d3cfcd726f5d9b825a84bcb 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.9 2003/04/21 00:54:26 ipkiss Exp $
+ * $Id: fileinfo.cpp,v 1.11 2003/04/22 18:21:15 ipkiss Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -92,6 +92,8 @@ 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 = "";
+
     /* Create the OK button */
     wxButton *ok_button = new wxButton( panel, wxID_OK, _("OK") );
     ok_button->SetDefault();
@@ -121,34 +123,40 @@ void FileInfo::UpdateFileInfo()
     {
         if( fileinfo_root )
         {
-            fileinfo_tree->SetItemText ( fileinfo_root , "" );
-            fileinfo_tree->DeleteChildren ( fileinfo_root );
+            fileinfo_root_label = "";
+            fileinfo_tree->DeleteChildren( fileinfo_root );
         }
         return;
     }
 
     if( !fileinfo_root )
     {
+        /* 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( p_input->psz_name );
+        fileinfo_root_label = p_input->psz_name;
     }
-    else if( fileinfo_tree->GetItemText( fileinfo_root ) == p_input->psz_name )
+    else if( fileinfo_root_label == (wxString)p_input->psz_name )
     {
         return;
     }
 
+    /* We rebuild the tree from scratch */
     fileinfo_tree->DeleteChildren( fileinfo_root );
+    fileinfo_root_label = p_input->psz_name;
 
     vlc_mutex_lock( &p_input->stream.stream_lock );
 
-    fileinfo_tree->SetItemText( fileinfo_root , 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 );
         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 );