Commit 28a6e8f5 authored by gbazin's avatar gbazin

* modules/gui/wxwindows: MSVC fixes for the wxwindows interface plugin. Patch...

* modules/gui/wxwindows: MSVC fixes for the wxwindows interface plugin. Patch by Steve Lhomme (steve dot lhomme at free dot fr) + modifications by me.
parent 89f29a2e
......@@ -296,7 +296,7 @@ BookmarksDialog::~BookmarksDialog()
*****************************************************************************/
wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent )
{
return new BookmarksDialog::BookmarksDialog( p_intf, p_parent );
return new class BookmarksDialog( p_intf, p_parent );
}
void BookmarksDialog::Update()
......@@ -545,8 +545,7 @@ void BookmarksDialog::OnUpdate( wxCommandEvent &event )
static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t oval, vlc_value_t nval, void *param )
{
BookmarksDialog::BookmarksDialog *p_dialog =
(BookmarksDialog::BookmarksDialog *)param;
class BookmarksDialog *p_dialog = (class BookmarksDialog *)param;
wxCommandEvent bookmarks_event( wxEVT_BOOKMARKS, 0 );
p_dialog->AddPendingEvent( bookmarks_event );
......
......@@ -251,7 +251,7 @@ Interface::Interface( intf_thread_t *_p_intf ):
/* Video window */
if( config_GetInt( p_intf, "wxwin-embed" ) )
{
VideoWindow( p_intf, this );
CreateVideoWindow( p_intf, this );
frame_sizer->Add( p_intf->p_sys->p_video_sizer, 1, wxEXPAND , 0 );
}
......@@ -606,7 +606,7 @@ void Interface::SetupHotkeys()
p_intf->p_sys->i_first_hotkey_event = wxID_HIGHEST + 7000;
p_intf->p_sys->i_hotkeys = i_hotkeys;
wxAcceleratorEntry p_entries[i_hotkeys];
wxAcceleratorEntry *p_entries = new wxAcceleratorEntry[i_hotkeys];
/* Setup the hotkeys as accelerators */
for( int i = 0; i < i_hotkeys; i++ )
......@@ -633,6 +633,8 @@ void Interface::SetupHotkeys()
SetAcceleratorTable( accel );
msg_Dbg( p_intf, "accelerator table loaded" );
}
delete [] p_entries;
}
/*****************************************************************************
......
......@@ -88,9 +88,9 @@ END_EVENT_TABLE()
/*****************************************************************************
* Public methods.
*****************************************************************************/
wxWindow *VideoWindow( intf_thread_t *p_intf, wxWindow *p_parent )
wxWindow *CreateVideoWindow( intf_thread_t *p_intf, wxWindow *p_parent )
{
return new VideoWindow::VideoWindow( p_intf, p_parent );
return new VideoWindow( p_intf, p_parent );
}
/*****************************************************************************
......
......@@ -148,7 +148,7 @@ struct intf_sys_t
* Prototypes
*****************************************************************************/
wxArrayString SeparateEntries( wxString );
wxWindow *VideoWindow( intf_thread_t *p_intf, wxWindow *p_parent );
wxWindow *CreateVideoWindow( intf_thread_t *p_intf, wxWindow *p_parent );
wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent );
wxWindow *CreateDialogsProvider( intf_thread_t *p_intf, wxWindow *p_parent );
......
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