Commit 2cde647a authored by Rafaël Carré's avatar Rafaël Carré
Browse files

Fix wxwidgets compilation

parent 8a0b8bd8
...@@ -193,7 +193,7 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf, wxWindow *p_parent ) ...@@ -193,7 +193,7 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf, wxWindow *p_parent )
//p_vlm_dialog = NULL; //p_vlm_dialog = NULL;
/* Give our interface a nice little icon */ /* Give our interface a nice little icon */
p_intf->p_sys->p_icon = new wxIcon( vlc_xpm ); p_intf->p_sys->p_icon = new wxIcon( (const char**) vlc_xpm );
/* Create the messages dialog so it can begin storing logs */ /* Create the messages dialog so it can begin storing logs */
p_messages_dialog = new Messages( p_intf, p_parent ? p_parent : this ); p_messages_dialog = new Messages( p_intf, p_parent ? p_parent : this );
......
...@@ -374,7 +374,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ): ...@@ -374,7 +374,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
/* Give our interface a nice little icon */ /* Give our interface a nice little icon */
SetIcon( wxIcon( vlc_xpm ) ); SetIcon( wxIcon( (const char**) vlc_xpm ) );
/* Create a splitter window that will fill in the interface window. /* Create a splitter window that will fill in the interface window.
* We need a splitter bar in order to make the embedded playlist * We need a splitter bar in order to make the embedded playlist
...@@ -1468,7 +1468,7 @@ Systray::Systray( Interface *_p_main_interface, intf_thread_t *_p_intf ) ...@@ -1468,7 +1468,7 @@ Systray::Systray( Interface *_p_main_interface, intf_thread_t *_p_intf )
p_main_interface = _p_main_interface; p_main_interface = _p_main_interface;
p_intf = _p_intf; p_intf = _p_intf;
SetIcon( wxIcon( vlc16x16_xpm ), wxT("VLC media player") ); SetIcon( wxIcon( (const char**) vlc16x16_xpm ), wxT("VLC media player") );
if( !IsOk() || !IsIconInstalled() ) if( !IsOk() || !IsIconInstalled() )
{ {
msg_Warn(p_intf, "cannot set systray icon, weird things may happen"); msg_Warn(p_intf, "cannot set systray icon, weird things may happen");
...@@ -1536,7 +1536,7 @@ wxMenu* Systray::CreatePopupMenu() ...@@ -1536,7 +1536,7 @@ wxMenu* Systray::CreatePopupMenu()
void Systray::UpdateTooltip( const wxChar* tooltip ) void Systray::UpdateTooltip( const wxChar* tooltip )
{ {
SetIcon( wxIcon( vlc16x16_xpm ), tooltip ); SetIcon( wxIcon( (const char**) vlc16x16_xpm ), tooltip );
} }
#endif #endif
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment