* minor core cleanup and WX compilation fix

diff --git a/modules/gui/wxwidgets/dialogs/interaction.cpp b/modules/gui/wxwidgets/dialogs/interaction.cpp
index b30e3e4b2e9f02343dadcb68808d13b23cf374f6..92dd5f4c521f8a652c6b9536a922e1a486931b69 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/interaction.cpp
+++ b/modules/gui/wxwidgets/dialogs/interaction.cpp
@@ -166,16 +166,7 @@ void InteractionDialog::Render()
     }
 
     //-------------- Buttons ------------------
-    if( p_dialog->i_flags & DIALOG_OK_CANCEL )
-    {
-        wxButton *ok = new wxButton( buttons_panel,
-                                     wxID_OK, wxU( _("&OK") ) );
-        wxButton *cancel = new wxButton( buttons_panel,
-                                         wxID_CANCEL, wxU( _("&Cancel") ) );
-        buttons_sizer->AddButton( ok );
-        buttons_sizer->AddButton( cancel );
-    }
-    else if( p_dialog->i_flags & DIALOG_YES_NO_CANCEL )
+    if( p_dialog->i_flags & DIALOG_YES_NO_CANCEL )
     {
         wxButton *yes = new wxButton( buttons_panel,
                                       wxID_YES, wxU( _("&Yes") ) );

diff --git a/src/interface/interaction.c b/src/interface/interaction.c
index 458d65f229de12a72c6d07c8bbb57813c6001cc8..6d79622bc400da43116a90896ae3db90290afc85 100644 (file)
--- a/src/interface/interaction.c
+++ b/src/interface/interaction.c
@@ -222,6 +222,11 @@ void intf_InteractionManage( playlist_t *p_playlist )
                         sizeof( interaction_dialog_t ) );               \
         new->psz_title = NULL;                                          \
         new->psz_description = NULL;                                    \
+        new->psz_defaultButton = NULL;                                  \
+        new->psz_alternateButton = NULL;                                \
+        new->psz_otherButton = NULL;                                    \
+        new->i_timeToGo = 0;                                            \
+        new->b_cancelled = VLC_FALSE;                                   \
         new->p_private = NULL;                                          \
         new->i_id = 0;                                                  \
         new->i_flags = 0;                                               \
@@ -739,13 +744,11 @@ static interaction_dialog_t *intf_InteractionGetById( vlc_object_t* p_this,
 
 static void intf_InteractionDialogDestroy( interaction_dialog_t *p_dialog )
 {
- /*   FREE( p_dialog->val.psz_string );
-
     FREE( p_dialog->psz_title );
     FREE( p_dialog->psz_description );
-    
-    FREE( p_dialog->psz_returned[0] );
-    FREE( p_dialog->psz_returned[1] ); */
+    FREE( p_dialog->psz_defaultButton );
+    FREE( p_dialog->psz_alternateButton );
+    FREE( p_dialog->psz_otherButton );
 
     free( p_dialog );
 }