Revert [14732]

diff --git a/modules/gui/wxwidgets/dialogs/updatevlc.cpp b/modules/gui/wxwidgets/dialogs/updatevlc.cpp
index 16b39c8d17d7d5623f81bee2709be8c271dd6fb7..c2f82f20a1209eadf36bc873bed62cf6b4bb5fb0 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/updatevlc.cpp
+++ b/modules/gui/wxwidgets/dialogs/updatevlc.cpp
@@ -71,21 +71,12 @@ UpdateVLC::UpdateVLC( intf_thread_t *_p_intf, wxWindow *p_parent ):
     SetIcon( *p_intf->p_sys->p_icon );
     SetAutoLayout( TRUE );
 
-    panel = new wxPanel( this, -1 );
-    panel->SetAutoLayout( TRUE );
-
-    main_sizer = new wxBoxSizer( wxVERTICAL );
-    panel_sizer = new wxBoxSizer( wxVERTICAL );
-
-    update_button =  new wxButton( panel, CheckForUpdate_Event,
-                      wxU(_("Check for updates")) );
-    panel_sizer->Add( update_button, 0, wxALL, 5 );
-    panel_sizer->Layout();
-    panel->SetSizerAndFit( panel_sizer );
-    main_sizer->Add( panel_sizer );
-    main_sizer->Layout();
-    SetSizer( main_sizer );
-    Fit( );
+    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
+    wxButton *update_button =
+        new wxButton( this, CheckForUpdate_Event,
+                      wxU(_("Check for updates now !")) );
+    main_sizer->Add( update_button );
+    SetSizerAndFit( main_sizer );
 
     p_u = update_New( p_intf );
 }
@@ -113,16 +104,16 @@ void UpdateVLC::OnCheckForUpdate( wxCommandEvent& event )
     update_iterator_t *p_uit = update_iterator_New( p_u );
     if( p_uit )
     {
-        panel_sizer->Remove( update_button );
-        panel->DestroyChildren();
+        wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
 
         p_uit->i_rs = UPDATE_RELEASE_STATUS_NEWER;
         p_uit->i_t = UPDATE_FILE_TYPE_ALL;
         update_iterator_Action( p_uit, UPDATE_MIRROR );
 
+        DestroyChildren();
 
         wxListCtrl *list =
-            new wxListCtrl( panel, ChooseItem_Event,
+            new wxListCtrl( this, ChooseItem_Event,
                             wxDefaultPosition, wxSize( 400, 300 ),
                             wxLC_AUTOARRANGE|wxLC_SINGLE_SEL );
         wxImageList *images = new wxImageList( 32, 32, TRUE );
@@ -159,13 +150,10 @@ void UpdateVLC::OnCheckForUpdate( wxCommandEvent& event )
                               i_image );
         }
 
-        panel_sizer->Add( new wxStaticText( panel, -1, wxU( _("\nAvailable updates and related downloads:\n(Double click on a file to download it)\n" ) ) ) );
-        panel_sizer->Add( list, 0, wxALL, 5 );
-        panel_sizer->Layout();
-        panel->SetSizerAndFit( panel_sizer );
-        main_sizer->Layout();
+        main_sizer->Add( new wxStaticText( this, -1, wxU( _("\nAvailable updates and related downloads:\n(Double click on a file to download it)\n" ) ) ) );
+        main_sizer->Add( list );
         SetSizerAndFit( main_sizer );
-
+        Layout();
         update_iterator_Delete( p_uit );
     }
 }

diff --git a/modules/gui/wxwidgets/dialogs/updatevlc.hpp b/modules/gui/wxwidgets/dialogs/updatevlc.hpp
index a32fbf529ea03854631cc67fcbfcfcb14e5ff3e0..cc069acd4e2c6842207532454e5f8170a1ea927a 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/updatevlc.hpp
+++ b/modules/gui/wxwidgets/dialogs/updatevlc.hpp
@@ -48,12 +48,6 @@ namespace wxvlc
 
         DECLARE_EVENT_TABLE();
 
-        wxPanel *panel;
-        wxBoxSizer *main_sizer;
-        wxBoxSizer *panel_sizer;
-
-        wxButton *update_button;
-
         intf_thread_t *p_intf;
         update_t *p_u;
     };