From: Sam Hocevar <sam@videolan.org>
Date: Fri, 30 Jul 2004 20:57:56 +0000 (+0000)
Subject:   * modules/gui/wxwindows/video.cpp modules/gui/wxwindows/bookmarks.cpp:
X-Git-Tag: 0.8.0~784
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=71b20c32ac1d44b139c0c2e6ec95f965e3dfd74c;p=vlc

  * modules/gui/wxwindows/video.cpp modules/gui/wxwindows/bookmarks.cpp:
    + Fixed compiler warnings due to bad argument types.
---

diff --git a/modules/gui/wxwindows/bookmarks.cpp b/modules/gui/wxwindows/bookmarks.cpp
index 4548457021..0415668b31 100644
--- a/modules/gui/wxwindows/bookmarks.cpp
+++ b/modules/gui/wxwindows/bookmarks.cpp
@@ -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 );
diff --git a/modules/gui/wxwindows/video.cpp b/modules/gui/wxwindows/video.cpp
index fcf317d60a..950f549809 100644
--- a/modules/gui/wxwindows/video.cpp
+++ b/modules/gui/wxwindows/video.cpp
@@ -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 );