Commit 71b20c32 authored by Sam Hocevar's avatar Sam Hocevar
Browse files

* modules/gui/wxwindows/video.cpp modules/gui/wxwindows/bookmarks.cpp:

    + Fixed compiler warnings due to bad argument types.
parent 3c4a7fc5
......@@ -145,10 +145,10 @@ BookmarkEditDialog::BookmarkEditDialog( intf_thread_t *_p_intf,
p_seekpoint->psz_name : "" ),
wxDefaultPosition, wxSize( 100, 20) );
time_text = new wxTextCtrl( this, -1, wxString::Format(wxT("%d"),
p_seekpoint->i_time_offset/1000000 ),
(int)(p_seekpoint->i_time_offset / 1000000) ),
wxDefaultPosition, wxSize( 100, 20) );
bytes_text = new wxTextCtrl( this, -1, wxString::Format(wxT("%d"),
p_seekpoint->i_byte_offset ),
(int)p_seekpoint->i_byte_offset ),
wxDefaultPosition, wxSize( 100, 20) );
sizer->Add( new wxStaticText( this, -1, wxU(_("Name") ) ), 0, wxLEFT, 5 );
......@@ -311,10 +311,11 @@ void BookmarksDialog::Update()
for( int i = 0; i < i_bookmarks; i++ )
{
list_ctrl->InsertItem( i, wxL2U( pp_bookmarks[i]->psz_name ) );
/* FIXME: see if we can use the 64 bits integer format string */
list_ctrl->SetItem( i, 1, wxString::Format(wxT("%d"),
pp_bookmarks[i]->i_byte_offset ) );
(int)(pp_bookmarks[i]->i_byte_offset) ) );
list_ctrl->SetItem( i, 2, wxString::Format(wxT("%d"),
pp_bookmarks[i]->i_time_offset/1000000 ) );
(int)(pp_bookmarks[i]->i_time_offset / 1000000) ) );
}
vlc_object_release( p_input );
......
......@@ -292,8 +292,8 @@ int VideoWindow::ControlWindow( void *p_window, int i_query, va_list args )
double f_arg = va_arg( args, double );
/* Update dimensions */
wxSizeEvent event( wxSize(p_vout->i_window_width * f_arg,
p_vout->i_window_height * f_arg),
wxSizeEvent event( wxSize((int)(p_vout->i_window_width * f_arg),
(int)(p_vout->i_window_height * f_arg)),
UpdateSize_Event );
AddPendingEvent( event );
......
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