Changeset 7c20b517bbf78fc03104b7032e588eed72b0f2e8

Show
Ignore:
Timestamp:
12/27/03 15:36:30 (5 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1072535790 +0000
git-parent:

[cf8bbfcd1e2869fafc7d1c420f19d4859831218c]

git-author:
Gildas Bazin <gbazin@videolan.org> 1072535790 +0000
Message:

* modules/gui/wxwindows/*: use the wxL2U macro when necessary.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/wxwindows/fileinfo.cpp

    r4219568 r7c20b51  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001,2003 VideoLAN 
    5  * $Id: fileinfo.cpp,v 1.21 2003/12/22 02:24:52 sam Exp $ 
     5 * $Id: fileinfo.cpp,v 1.22 2003/12/27 14:36:30 gbazin Exp $ 
    66 * 
    77 * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> 
    …… 
    105105         * Windows when the wxTR_HIDE_ROOT style is set. That's why we need to 
    106106         * use the fileinfo_root_label variable... */ 
    107         fileinfo_root = fileinfo_tree->AddRoot( wxU(p_input->psz_name) ); 
    108         fileinfo_root_label = wxU(p_input->psz_name); 
     107        fileinfo_root = fileinfo_tree->AddRoot( wxL2U(p_input->psz_name) ); 
     108        fileinfo_root_label = wxL2U(p_input->psz_name); 
    109109    } 
    110     else if( fileinfo_root_label == wxU(p_input->psz_name) ) 
     110    else if( fileinfo_root_label == wxL2U(p_input->psz_name) ) 
    111111    { 
    112112        return; 
    …… 
    115115    /* We rebuild the tree from scratch */ 
    116116    fileinfo_tree->DeleteChildren( fileinfo_root ); 
    117     fileinfo_root_label = wxU(p_input->psz_name); 
     117    fileinfo_root_label = wxL2U(p_input->psz_name); 
    118118 
    119119    vlc_mutex_lock( &p_input->stream.stream_lock ); 
    …… 
    124124    { 
    125125        wxTreeItemId cat = fileinfo_tree->AppendItem( fileinfo_root, 
    126                                                       wxU(p_cat->psz_name) ); 
     126                                                      wxL2U(p_cat->psz_name) ); 
    127127        input_info_t *p_info = p_cat->p_info; 
    128128        while( p_info ) 
    129129        { 
    130             fileinfo_tree->AppendItem( cat, (wxString)wxU(p_info->psz_name) + 
    131                                        wxT(": ") + wxU(p_info->psz_value) ); 
     130            fileinfo_tree->AppendItem( cat, (wxString)wxL2U(p_info->psz_name) + 
     131                                       wxT(": ") + wxL2U(p_info->psz_value) ); 
    132132            p_info = p_info->p_next; 
    133133        } 

  • modules/gui/wxwindows/messages.cpp

    r4219568 r7c20b51  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: messages.cpp,v 1.18 2003/12/22 02:24:52 sam Exp $ 
     5 * $Id: messages.cpp,v 1.19 2003/12/27 14:36:30 gbazin Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    158158            /* Append all messages to log window */ 
    159159            textctrl->SetDefaultStyle( *dbg_attr ); 
    160             (*textctrl) << wxU(p_sub->p_msg[i_start].psz_module); 
     160            (*textctrl) << wxL2U(p_sub->p_msg[i_start].psz_module); 
    161161 
    162162            switch( p_sub->p_msg[i_start].i_type ) 
    …… 
    181181 
    182182            /* Add message */ 
    183             (*textctrl) << wxU(p_sub->p_msg[i_start].psz_msg) << wxT("\n"); 
     183            (*textctrl) << wxL2U(p_sub->p_msg[i_start].psz_msg) << wxT("\n"); 
    184184        } 
    185185