Skip to content

V
vlc-gpu
Commit c3ab7160 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/gui/wxwindows/*: small clean-up in included headers. 

   Got rid of the verbose checkbox in the messages window (too confusing apparently). Now warning, info and debug messages are only logged if the messages window is opened (errors are always logged).
parent 3bb0b134
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 192 deletions
modules/gui/wxwindows/dialogs.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* dialogs.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: dialogs.cpp,v 1.6 2003/07/25 22:50:12 gbazin Exp $
* $Id: dialogs.cpp,v 1.7 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -31,18 +31,6 @@
#include <vlc/vlc.h>
#include <vlc/aout.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <vlc/intf.h>
#include "stream_control.h"
......
modules/gui/wxwindows/fileinfo.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* fileinfo.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: fileinfo.cpp,v 1.17 2003/07/12 13:33:10 gbazin Exp $
* $Id: fileinfo.cpp,v 1.18 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -30,26 +30,10 @@
#include <stdio.h>
#include <vlc/vlc.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <wx/treectrl.h>
#include <vlc/intf.h>
#if defined MODULE_NAME_IS_skins
# include "../skins/src/skin_common.h"
#endif
#include "wxwindows.h"
#include <wx/treectrl.h>
/*****************************************************************************
* Event Table.
......
modules/gui/wxwindows/interface.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: interface.cpp,v 1.56 2003/08/22 08:06:25 asmax Exp $
* $Id: interface.cpp,v 1.57 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -31,18 +31,6 @@
#include <vlc/vlc.h>
#include <vlc/aout.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <vlc/intf.h>
#include "stream_control.h"
......
modules/gui/wxwindows/menus.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* menus.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: menus.cpp,v 1.18 2003/08/13 01:45:13 gbazin Exp $
* $Id: menus.cpp,v 1.19 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -30,26 +30,10 @@
#include <stdio.h>
#include <vlc/vlc.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <wx/listctrl.h>
#include <vlc/intf.h>
#if defined MODULE_NAME_IS_skins
# include "../skins/src/skin_common.h"
#endif
#include "wxwindows.h"
#include <wx/listctrl.h>
class wxMenuItemExt: public wxMenuItem
{
......
modules/gui/wxwindows/messages.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: messages.cpp,v 1.13 2003/07/20 10:38:49 gbazin Exp $
* $Id: messages.cpp,v 1.14 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
*
......@@ -30,26 +30,10 @@
#include <stdio.h>
#include <vlc/vlc.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <wx/textctrl.h>
#include <vlc/intf.h>
#if defined MODULE_NAME_IS_skins
# include "../skins/src/skin_common.h"
#endif
#include "wxwindows.h"
#include <wx/textctrl.h>
/*****************************************************************************
* Event Table.
......@@ -59,7 +43,6 @@
enum
{
Close_Event,
Verbose_Event,
Clear_Event,
Save_Log_Event
};
......@@ -67,7 +50,6 @@ enum
BEGIN_EVENT_TABLE(Messages, wxFrame)
/* Button events */
EVT_BUTTON(wxID_OK, Messages::OnClose)
EVT_CHECKBOX(Verbose_Event, Messages::OnVerbose)
EVT_BUTTON(wxID_CLEAR, Messages::OnClear)
EVT_BUTTON(wxID_SAVEAS, Messages::OnSaveLog)
......@@ -116,19 +98,12 @@ Messages::Messages( intf_thread_t *_p_intf, wxWindow *p_parent ):
wxU(_("Save As...")));
save_log_button->SetDefault();
/* Create the Verbose checkbox */
wxCheckBox *verbose_checkbox =
new wxCheckBox( messages_panel, Verbose_Event, wxU(_("Verbose")) );
b_verbose = p_intf->p_libvlc->i_verbose > 2;
verbose_checkbox->SetValue( b_verbose );
/* Place everything in sizers */
wxBoxSizer *buttons_sizer = new wxBoxSizer( wxHORIZONTAL );
buttons_sizer->Add( ok_button, 0, wxEXPAND |wxALIGN_LEFT| wxALL, 5 );
buttons_sizer->Add( clear_button, 0, wxEXPAND |wxALIGN_LEFT| wxALL, 5 );
buttons_sizer->Add( save_log_button, 0, wxEXPAND |wxALIGN_LEFT| wxALL, 5 );
buttons_sizer->Add( new wxPanel( this, -1 ), 1, wxALL, 5 );
buttons_sizer->Add( verbose_checkbox, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 );
buttons_sizer->Layout();
wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
......@@ -143,10 +118,16 @@ Messages::Messages( intf_thread_t *_p_intf, wxWindow *p_parent ):
Messages::~Messages()
{
/* Clean up */
/* Clean up */
if( save_log_dialog ) delete save_log_dialog;
}
bool Messages::Show( bool show )
{
b_verbose = show;
return wxFrame::Show( show );
}
void Messages::UpdateLog()
{
msg_subscription_t *p_sub = p_intf->p_sys->p_sub;
......@@ -230,8 +211,3 @@ void Messages::OnSaveLog( wxCommandEvent& WXUNUSED(event) )
}
}
}
void Messages::OnVerbose( wxCommandEvent& event )
{
b_verbose = event.IsChecked();
}
modules/gui/wxwindows/playlist.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: playlist.cpp,v 1.15 2003/08/16 21:05:14 zorglub Exp $
* $Id: playlist.cpp,v 1.16 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
*
......@@ -30,22 +30,10 @@
#include <stdio.h>
#include <vlc/vlc.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <wx/listctrl.h>
#include <vlc/intf.h>
#include "wxwindows.h"
#include <wx/listctrl.h>
/* Callback prototype */
int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
......
modules/gui/wxwindows/preferences.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* preferences.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: preferences.cpp,v 1.25 2003/08/14 19:25:56 sigmunau Exp $
* $Id: preferences.cpp,v 1.26 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -30,18 +30,9 @@
#include <stdio.h>
#include <vlc/vlc.h>
#include <vlc/intf.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <wx/window.h>
#include "wxwindows.h"
#include <wx/notebook.h>
#include <wx/textctrl.h>
#include <wx/combobox.h>
......@@ -51,14 +42,6 @@
#include <wx/clntdata.h>
#include <wx/dynarray.h>
#include <vlc/intf.h>
#if defined MODULE_NAME_IS_skins
# include "../skins/src/skin_common.h"
#endif
#include "wxwindows.h"
#ifndef wxRB_SINGLE
# define wxRB_SINGLE 0
#endif
......
modules/gui/wxwindows/streamout.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* streamout.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: streamout.cpp,v 1.28 2003/08/19 21:54:07 adn Exp $
* $Id: streamout.cpp,v 1.29 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -30,27 +30,15 @@
#include <stdio.h>
#include <vlc/vlc.h>
#include <vlc/intf.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include "wxwindows.h"
#include <wx/notebook.h>
#include <wx/textctrl.h>
#include <wx/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h>
#include <vlc/intf.h>
#include "wxwindows.h"
#ifndef wxRB_SINGLE
# define wxRB_SINGLE 0
#endif
......
modules/gui/wxwindows/subtitles.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* subtitles.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: subtitles.cpp,v 1.5 2003/08/20 21:59:01 asmax Exp $
* $Id: subtitles.cpp,v 1.6 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -30,30 +30,14 @@
#include <stdio.h>
#include <vlc/vlc.h>
#include <vlc/intf.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include "wxwindows.h"
#include <wx/textctrl.h>
#include <wx/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h>
#include <vlc/intf.h>
#if defined MODULE_NAME_IS_skins
# include "../skins/src/skin_common.h"
#endif
#include "wxwindows.h"
#ifndef wxRB_SINGLE
# define wxRB_SINGLE 0
#endif
......
modules/gui/wxwindows/timer.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* timer.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: timer.cpp,v 1.29 2003/07/20 10:38:49 gbazin Exp $
* $Id: timer.cpp,v 1.30 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -31,22 +31,10 @@
#include <vlc/vlc.h>
#include <vlc/aout.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <wx/timer.h>
#include <vlc/intf.h>
#include "wxwindows.h"
#include <wx/timer.h>
void DisplayStreamDate( wxControl *, intf_thread_t *, int );
......
modules/gui/wxwindows/wxwindows.cpp
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* wxwindows.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: wxwindows.cpp,v 1.30 2003/08/11 17:31:15 gbazin Exp $
* $Id: wxwindows.cpp,v 1.31 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -30,18 +30,6 @@
#include <stdio.h>
#include <vlc/vlc.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <vlc/intf.h>
#include "wxwindows.h"
......
modules/gui/wxwindows/wxwindows.h
View file @ c3ab7160
......@@ -2,7 +2,7 @@
* wxwindows.h: private wxWindows interface description
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: wxwindows.h,v 1.56 2003/08/22 08:06:25 asmax Exp $
* $Id: wxwindows.h,v 1.57 2003/08/27 11:53:26 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -21,6 +21,17 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <wx/listctrl.h>
#include <wx/textctrl.h>
#include <wx/notebook.h>
......@@ -572,12 +583,12 @@ public:
/* Constructor */
Messages( intf_thread_t *p_intf, wxWindow *p_parent );
virtual ~Messages();
bool Show( bool show = TRUE );
void UpdateLog();
private:
/* Event handlers (these functions should _not_ be virtual) */
void OnClose( wxCommandEvent& event );
void OnVerbose( wxCommandEvent& event );
void OnClear( wxCommandEvent& event );
void OnSaveLog( wxCommandEvent& event );
......
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