Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
41409dfc
Commit
41409dfc
authored
May 07, 2003
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/gui/wxwindows/*: Fix (use different id numbers for each menus).
parent
666800bc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
modules/gui/wxwindows/menus.cpp
modules/gui/wxwindows/menus.cpp
+11
-7
modules/gui/wxwindows/wxwindows.h
modules/gui/wxwindows/wxwindows.h
+2
-2
No files found.
modules/gui/wxwindows/menus.cpp
View file @
41409dfc
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* menus.cpp : wxWindows plugin for vlc
* menus.cpp : wxWindows plugin for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* Copyright (C) 2000-2001 VideoLAN
* $Id: menus.cpp,v 1.
3 2003/05/07 12:23:06
gbazin Exp $
* $Id: menus.cpp,v 1.
4 2003/05/07 15:54:49
gbazin Exp $
*
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
*
...
@@ -77,7 +77,9 @@ enum
...
@@ -77,7 +77,9 @@ enum
/* menu items */
/* menu items */
FirstAutoGenerated_Event
=
wxID_HIGHEST
+
1000
,
FirstAutoGenerated_Event
=
wxID_HIGHEST
+
1000
,
MenuDummy_Event
,
MenuDummy_Event
,
MenuLast_Event
,
AudioMenu_Events
,
VideoMenu_Events
=
wxID_HIGHEST
+
1100
,
PopupMenu_Events
=
wxID_HIGHEST
+
1200
,
};
};
BEGIN_EVENT_TABLE
(
Menu
,
wxMenu
)
BEGIN_EVENT_TABLE
(
Menu
,
wxMenu
)
...
@@ -161,7 +163,8 @@ void PopupMenu( intf_thread_t *_p_intf, Interface *_p_main_interface,
...
@@ -161,7 +163,8 @@ void PopupMenu( intf_thread_t *_p_intf, Interface *_p_main_interface,
/* Build menu */
/* Build menu */
wxMenu
*
popupmenu
=
new
Menu
(
_p_intf
,
_p_main_interface
,
i
,
wxMenu
*
popupmenu
=
new
Menu
(
_p_intf
,
_p_main_interface
,
i
,
ppsz_varnames
,
pi_objects
);
ppsz_varnames
,
pi_objects
,
PopupMenu_Events
);
_p_main_interface
->
p_popup_menu
=
popupmenu
;
_p_main_interface
->
p_popup_menu
=
popupmenu
;
_p_main_interface
->
PopupMenu
(
popupmenu
,
pos
.
x
,
pos
.
y
);
_p_main_interface
->
PopupMenu
(
popupmenu
,
pos
.
x
,
pos
.
y
);
...
@@ -203,7 +206,7 @@ wxMenu *AudioMenu( intf_thread_t *_p_intf, Interface *_p_main_interface )
...
@@ -203,7 +206,7 @@ wxMenu *AudioMenu( intf_thread_t *_p_intf, Interface *_p_main_interface )
/* Build menu */
/* Build menu */
return
new
Menu
(
_p_intf
,
_p_main_interface
,
i
,
return
new
Menu
(
_p_intf
,
_p_main_interface
,
i
,
ppsz_varnames
,
pi_objects
);
ppsz_varnames
,
pi_objects
,
AudioMenu_Events
);
}
}
wxMenu
*
VideoMenu
(
intf_thread_t
*
_p_intf
,
Interface
*
_p_main_interface
)
wxMenu
*
VideoMenu
(
intf_thread_t
*
_p_intf
,
Interface
*
_p_main_interface
)
...
@@ -240,14 +243,15 @@ wxMenu *VideoMenu( intf_thread_t *_p_intf, Interface *_p_main_interface )
...
@@ -240,14 +243,15 @@ wxMenu *VideoMenu( intf_thread_t *_p_intf, Interface *_p_main_interface )
/* Build menu */
/* Build menu */
return
new
Menu
(
_p_intf
,
_p_main_interface
,
i
,
return
new
Menu
(
_p_intf
,
_p_main_interface
,
i
,
ppsz_varnames
,
pi_objects
);
ppsz_varnames
,
pi_objects
,
VideoMenu_Events
);
}
}
/*****************************************************************************
/*****************************************************************************
* Constructor.
* Constructor.
*****************************************************************************/
*****************************************************************************/
Menu
::
Menu
(
intf_thread_t
*
_p_intf
,
Interface
*
_p_main_interface
,
Menu
::
Menu
(
intf_thread_t
*
_p_intf
,
Interface
*
_p_main_interface
,
int
i_count
,
char
**
ppsz_varnames
,
int
*
pi_objects
)
:
int
i_count
,
char
**
ppsz_varnames
,
int
*
pi_objects
,
int
i_start_id
)
:
wxMenu
(
)
wxMenu
(
)
{
{
vlc_object_t
*
p_object
;
vlc_object_t
*
p_object
;
...
@@ -257,7 +261,7 @@ Menu::Menu( intf_thread_t *_p_intf, Interface *_p_main_interface,
...
@@ -257,7 +261,7 @@ Menu::Menu( intf_thread_t *_p_intf, Interface *_p_main_interface,
p_intf
=
_p_intf
;
p_intf
=
_p_intf
;
p_main_interface
=
_p_main_interface
;
p_main_interface
=
_p_main_interface
;
i_item_id
=
MenuLast_Event
;
i_item_id
=
i_start_id
;
for
(
i
=
0
;
i
<
i_count
;
i
++
)
for
(
i
=
0
;
i
<
i_count
;
i
++
)
{
{
...
...
modules/gui/wxwindows/wxwindows.h
View file @
41409dfc
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* wxwindows.h: private wxWindows interface description
* wxwindows.h: private wxWindows interface description
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* Copyright (C) 1999, 2000 VideoLAN
* $Id: wxwindows.h,v 1.2
0 2003/05/07 12:23:06
gbazin Exp $
* $Id: wxwindows.h,v 1.2
1 2003/05/07 15:54:49
gbazin Exp $
*
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
*
...
@@ -473,7 +473,7 @@ class Menu: public wxMenu
...
@@ -473,7 +473,7 @@ class Menu: public wxMenu
public:
public:
/* Constructor */
/* Constructor */
Menu
(
intf_thread_t
*
p_intf
,
Interface
*
p_main_interface
,
int
i_count
,
Menu
(
intf_thread_t
*
p_intf
,
Interface
*
p_main_interface
,
int
i_count
,
char
**
ppsz_names
,
int
*
pi_objects
);
char
**
ppsz_names
,
int
*
pi_objects
,
int
i_start_id
);
virtual
~
Menu
();
virtual
~
Menu
();
private:
private:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment