Commit 14e5cb30 authored by Antoine Cellerier's avatar Antoine Cellerier

Fix update dialog layout in Windows

parent 5681d3be
...@@ -64,7 +64,8 @@ END_EVENT_TABLE() ...@@ -64,7 +64,8 @@ END_EVENT_TABLE()
UpdateVLC::UpdateVLC( intf_thread_t *_p_intf, wxWindow *p_parent ): UpdateVLC::UpdateVLC( intf_thread_t *_p_intf, wxWindow *p_parent ):
wxFrame( p_parent, -1, wxU(_("VLC media player - Updates")), wxFrame( p_parent, -1, wxU(_("VLC media player - Updates")),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxSYSTEM_MENU|wxCLOSE_BOX|wxFRAME_FLOAT_ON_PARENT|wxFRAME_TOOL_WINDOW) wxSYSTEM_MENU|wxCLOSE_BOX|wxFRAME_FLOAT_ON_PARENT
|wxFRAME_TOOL_WINDOW|wxCAPTION )
{ {
/* Initializations */ /* Initializations */
p_intf = _p_intf; p_intf = _p_intf;
...@@ -115,7 +116,7 @@ void UpdateVLC::OnCheckForUpdate( wxCommandEvent& event ) ...@@ -115,7 +116,7 @@ void UpdateVLC::OnCheckForUpdate( wxCommandEvent& event )
wxListCtrl *list = wxListCtrl *list =
new wxListCtrl( this, ChooseItem_Event, new wxListCtrl( this, ChooseItem_Event,
wxDefaultPosition, wxSize( 400, 300 ), wxDefaultPosition, wxSize( 400, 300 ),
wxLC_AUTOARRANGE|wxLC_SINGLE_SEL ); wxLC_SINGLE_SEL|wxLC_LIST );
wxImageList *images = new wxImageList( 32, 32, TRUE ); wxImageList *images = new wxImageList( 32, 32, TRUE );
images->Add( wxIcon( update_ascii_xpm ) ); images->Add( wxIcon( update_ascii_xpm ) );
images->Add( wxIcon( update_info_xpm ) ); images->Add( wxIcon( update_info_xpm ) );
......
...@@ -603,10 +603,8 @@ void Interface::CreateOurMenuBar() ...@@ -603,10 +603,8 @@ void Interface::CreateOurMenuBar()
/* Create the "Help" menu */ /* Create the "Help" menu */
wxMenu *help_menu = new wxMenu; wxMenu *help_menu = new wxMenu;
help_menu->Append( About_Event, wxU(_("About VLC media player")) ); help_menu->Append( About_Event, wxU(_("About VLC media player")) );
#ifndef WIN32
help_menu->AppendSeparator(); help_menu->AppendSeparator();
help_menu->Append( UpdateVLC_Event, wxU(_("Check for updates ...")) ); help_menu->Append( UpdateVLC_Event, wxU(_("Check for updates ...")) );
#endif
/* Append the freshly created menus to the menu bar... */ /* Append the freshly created menus to the menu bar... */
wxMenuBar *menubar = new wxMenuBar(); wxMenuBar *menubar = new wxMenuBar();
......
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