Changeset 2cde647ab66842989ccdc37f801bd912ce75d0ce

Show
Ignore:
Timestamp:
03/09/07 01:47:51 (1 year ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1188776871 +0000
git-parent:

[8a0b8bd8d22cf77b80e370fb018b45946002e2fe]

git-author:
Rafaël Carré <funman@videolan.org> 1188776871 +0000
Message:

Fix wxwidgets compilation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/wxwidgets/dialogs.cpp

    r9e595c9 r2cde647  
    194194 
    195195    /* Give our interface a nice little icon */ 
    196     p_intf->p_sys->p_icon = new wxIcon( vlc_xpm ); 
     196    p_intf->p_sys->p_icon = new wxIcon( (const char**) vlc_xpm ); 
    197197 
    198198    /* Create the messages dialog so it can begin storing logs */ 

  • modules/gui/wxwidgets/interface.cpp

    r909d63d r2cde647  
    375375 
    376376    /* Give our interface a nice little icon */ 
    377     SetIcon( wxIcon( vlc_xpm ) ); 
     377    SetIcon( wxIcon( (const char**) vlc_xpm ) ); 
    378378 
    379379    /* Create a splitter window that will fill in the interface window. 
    …… 
    14691469    p_intf = _p_intf; 
    14701470 
    1471     SetIcon( wxIcon( vlc16x16_xpm ), wxT("VLC media player") ); 
     1471    SetIcon( wxIcon( (const char**) vlc16x16_xpm ), wxT("VLC media player") ); 
    14721472    if( !IsOk() || !IsIconInstalled() ) 
    14731473    { 
    …… 
    15371537void Systray::UpdateTooltip( const wxChar* tooltip ) 
    15381538{ 
    1539     SetIcon( wxIcon( vlc16x16_xpm ), tooltip ); 
    1540 } 
    1541 #endif 
    1542 #endif 
     1539    SetIcon( wxIcon( (const char**) vlc16x16_xpm ), tooltip ); 
     1540} 
     1541#endif 
     1542#endif