* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: interface.cpp,v 1.35 2003/05/26 19:06:47 gbazin Exp $
+ * $Id: interface.cpp,v 1.36 2003/05/27 11:35:34 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
EVT_MENU_OPEN(Interface::OnMenuOpen)
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
- EVT_CONTEXT_MENU(Interface::OnContextMenu)
-#else
- EVT_RIGHT_UP(Interface::OnContextMenu)
+ EVT_CONTEXT_MENU(Interface::OnContextMenu2)
#endif
+ EVT_RIGHT_UP(Interface::OnContextMenu)
/* Toolbar events */
EVT_MENU(OpenFile_Event, Interface::OnOpenFile)
}
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
-void Interface::OnContextMenu(wxContextMenuEvent& event)
+void Interface::OnContextMenu2(wxContextMenuEvent& event)
{
::PopupMenu( p_intf, this, ScreenToClient(event.GetPosition()) );
}
-#else
+#endif
void Interface::OnContextMenu(wxMouseEvent& event)
{
::PopupMenu( p_intf, this, event.GetPosition() );
}
-#endif
void Interface::OnExit( wxCommandEvent& WXUNUSED(event) )
{
* timer.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: timer.cpp,v 1.19 2003/05/26 19:06:47 gbazin Exp $
+ * $Id: timer.cpp,v 1.20 2003/05/27 11:35:34 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
{
wxPoint mousepos = wxGetMousePosition();
-#if defined( __WXMSW__ ) || defined( __WXMAC__ )
- wxContextMenuEvent event =
- wxContextMenuEvent( wxEVT_NULL, 0, mousepos );
-#else
wxMouseEvent event = wxMouseEvent( wxEVT_RIGHT_UP );
event.m_x = p_main_interface->ScreenToClient(mousepos).x;
event.m_y = p_main_interface->ScreenToClient(mousepos).y;
-#endif
+
p_main_interface->AddPendingEvent(event);
p_main_interface->b_popup_change = VLC_FALSE;
* wxwindows.h: private wxWindows interface description
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: wxwindows.h,v 1.32 2003/05/26 19:06:47 gbazin Exp $
+ * $Id: wxwindows.h,v 1.33 2003/05/27 11:35:34 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
void OnMenuOpen( wxMenuEvent& event );
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
- void OnContextMenu(wxContextMenuEvent& event);
-#else
- void OnContextMenu(wxMouseEvent& event);
+ void OnContextMenu2(wxContextMenuEvent& event);
#endif
+ void OnContextMenu(wxMouseEvent& event);
DECLARE_EVENT_TABLE();