* modules/gui/wxwindows/interface.cpp: update the checkbox of the extended gui menu...

[vlc] / modules / gui / wxwindows / messages.cpp

diff --git a/modules/gui/wxwindows/messages.cpp b/modules/gui/wxwindows/messages.cpp
index 9328275cc89f6638e80ec34101eb67614bc7a76b..28ac9d9cf253600655b74961f21fb427eea7be5a 100644 (file)
--- a/modules/gui/wxwindows/messages.cpp
+++ b/modules/gui/wxwindows/messages.cpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * playlist.cpp : wxWindows plugin for vlc
+ * messages.cpp : wxWindows plugin for vlc
  *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
- * $Id: messages.cpp,v 1.16 2003/09/07 22:53:09 fenrir Exp $
+ * Copyright (C) 2000-2004 VideoLAN
+ * $Id: messages.cpp,v 1.20 2004/01/25 03:29:01 hartman Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *
@@ -33,7 +33,6 @@
 #include <vlc/intf.h>
 
 #include "wxwindows.h"
-#include <wx/textctrl.h>
 
 /*****************************************************************************
  * Event Table.
@@ -122,6 +121,11 @@ Messages::~Messages()
 {
     /* Clean up */
     if( save_log_dialog ) delete save_log_dialog;
+
+    delete info_attr;
+    delete err_attr;
+    delete warn_attr;
+    delete dbg_attr;
 }
 
 bool Messages::Show( bool show )
@@ -152,7 +156,7 @@ void Messages::UpdateLog()
 
             /* Append all messages to log window */
             textctrl->SetDefaultStyle( *dbg_attr );
-            (*textctrl) << wxU(p_sub->p_msg[i_start].psz_module);
+            (*textctrl) << wxL2U(p_sub->p_msg[i_start].psz_module);
 
             switch( p_sub->p_msg[i_start].i_type )
             {
@@ -175,7 +179,7 @@ void Messages::UpdateLog()
             }
 
             /* Add message */
-            (*textctrl) << wxU(p_sub->p_msg[i_start].psz_msg) << wxT("\n");
+            (*textctrl) << wxL2U(p_sub->p_msg[i_start].psz_msg) << wxT("\n");
         }
 
         vlc_mutex_lock( p_sub->p_lock );
@@ -201,9 +205,9 @@ void Messages::OnSaveLog( wxCommandEvent& WXUNUSED(event) )
 {
     if( save_log_dialog == NULL )
         save_log_dialog = new wxFileDialog( this,
-            wxU(_("Save Messages As a file...")),
+            wxU(_("Save Messages As...")),
             wxT(""), wxT("messages"), wxT("*"), wxSAVE | wxOVERWRITE_PROMPT );
-    
+
     if( save_log_dialog && save_log_dialog->ShowModal() == wxID_OK )
     {
         if( !textctrl->SaveFile( save_log_dialog->GetPath() ) )