Apply online help patch from Vincent Dimar.

diff --git a/THANKS b/THANKS
index 6109dfb9303a52b4a7623854c2671cb2018db67a..2dfbbb769db1b659829a340cc4a23c32ba433d21 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -160,6 +160,7 @@ Tong Ka Man <kmtong at cwbase dot com> - playlist_Clear addition
 Udo Richter <udo underscore richter at gmx dot de> - Trancode padding / cropping
 Valek Filippov <frob at df.ru> - Russian translation
 Vicente Jimenez Aguilar <vice at v1ce.net> - Spanish translation
+Vincent Dimar - WxWidgets online help patch
 Vincent van den Heuvel <heuvel@mac.com> - OSX about window artwork (v0.8.4)
 Vitalijus Slavinskas <Vitalijus.Slavinskas at stud.ktu dot lt> - nsv patches
 Vitaly V. Bursov <vitalyvb at ukr dot net>

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 229fe0356dd4e61257e32f0c22da692cf127244b..0e700f45e2278158b7ee26d20a73687488fe84a1 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -40,6 +40,8 @@
 
 #include <wx/splitter.h>
 
+#include <wx/utils.h>                             /* wxLaunchDefaultBrowser() */
+
 /* include the toolbar graphics */
 #include "bitmaps/play.xpm"
 #include "bitmaps/pause.xpm"
@@ -296,6 +298,8 @@ enum
      * this standard value as otherwise it won't be handled properly under Mac
      * (where it is special and put into the "Apple" menu) */
     About_Event = wxID_ABOUT,
+    OnWebLink_Event,
+    OnWebHelp_Event,
     UpdateVLC_Event,
     VLM_Event,
 
@@ -308,6 +312,8 @@ BEGIN_EVENT_TABLE(Interface, wxFrame)
     /* Menu events */
     EVT_MENU(Exit_Event, Interface::OnExit)
     EVT_MENU(About_Event, Interface::OnAbout)
+    EVT_MENU(OnWebLink_Event, Interface::OnWebLink)
+    EVT_MENU(OnWebHelp_Event, Interface::OnWebHelp)
     EVT_MENU(UpdateVLC_Event, Interface::OnShowDialog)
     EVT_MENU(VLM_Event, Interface::OnShowDialog)
 
@@ -605,6 +611,9 @@ void Interface::CreateOurMenuBar()
 
     /* Create the "Help" menu */
     wxMenu *help_menu = new wxMenu;
+    help_menu->Append( OnWebLink_Event, wxU(_("VideoLAN's Website")) );
+    help_menu->Append( OnWebHelp_Event, wxU(_("Online Help")) );
+    help_menu->AppendSeparator();
     help_menu->Append( About_Event, wxU(_("About...")) );
     help_menu->AppendSeparator();
     help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
@@ -955,6 +964,16 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
                   wxT("VLC media player")), wxOK | wxICON_INFORMATION, this );
 }
 
+void Interface::OnWebLink( wxCommandEvent& WXUNUSED(event) )
+{
+    wxLaunchDefaultBrowser( wxU("http://videolan.org/") );
+}
+
+void Interface::OnWebHelp( wxCommandEvent& WXUNUSED(event) )
+{
+    wxLaunchDefaultBrowser( wxU("http://videolan.org/doc/") );
+}
+
 void Interface::OnShowDialog( wxCommandEvent& event )
 {
     if( p_intf->p_sys->pf_show_dialog )