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
5e2efe13
Commit
5e2efe13
authored
May 01, 2006
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow intf-switch
* both ways in !Win32 * only wx->skins in Win32
parent
bbe98d26
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
modules/gui/wxwidgets/menus.cpp
modules/gui/wxwidgets/menus.cpp
+3
-3
src/interface/interface.c
src/interface/interface.c
+3
-0
No files found.
modules/gui/wxwidgets/menus.cpp
View file @
5e2efe13
...
@@ -259,7 +259,7 @@ void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
...
@@ -259,7 +259,7 @@ void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
FIND_PARENT
);
FIND_PARENT
);
if
(
p_object
!=
NULL
)
if
(
p_object
!=
NULL
)
{
{
#if
0
#if
ndef WIN32
#if (wxCHECK_VERSION(2,5,0))
#if (wxCHECK_VERSION(2,5,0))
ppsz_varnames
[
i
]
=
"intf-switch"
;
ppsz_varnames
[
i
]
=
"intf-switch"
;
pi_objects
[
i
++
]
=
p_object
->
i_object_id
;
pi_objects
[
i
++
]
=
p_object
->
i_object_id
;
...
@@ -512,11 +512,9 @@ wxMenu *SettingsMenu( intf_thread_t *_p_intf, wxWindow *p_parent,
...
@@ -512,11 +512,9 @@ wxMenu *SettingsMenu( intf_thread_t *_p_intf, wxWindow *p_parent,
FIND_PARENT
);
FIND_PARENT
);
if
(
p_object
!=
NULL
)
if
(
p_object
!=
NULL
)
{
{
#if 0
#if (wxCHECK_VERSION(2,5,0))
#if (wxCHECK_VERSION(2,5,0))
ppsz_varnames
[
i
]
=
"intf-switch"
;
ppsz_varnames
[
i
]
=
"intf-switch"
;
pi_objects
[
i
++
]
=
p_object
->
i_object_id
;
pi_objects
[
i
++
]
=
p_object
->
i_object_id
;
#endif
#endif
#endif
ppsz_varnames
[
i
]
=
"intf-add"
;
ppsz_varnames
[
i
]
=
"intf-add"
;
pi_objects
[
i
++
]
=
p_object
->
i_object_id
;
pi_objects
[
i
++
]
=
p_object
->
i_object_id
;
...
@@ -642,6 +640,8 @@ static bool IsMenuEmpty( char *psz_var, vlc_object_t *p_object,
...
@@ -642,6 +640,8 @@ static bool IsMenuEmpty( char *psz_var, vlc_object_t *p_object,
if
(
(
i_type
&
VLC_VAR_TYPE
)
!=
VLC_VAR_VARIABLE
)
if
(
(
i_type
&
VLC_VAR_TYPE
)
!=
VLC_VAR_VARIABLE
)
{
{
/* Very evil hack ! intf-switch can have only one value */
if
(
!
strcmp
(
psz_var
,
"intf-switch"
)
)
return
FALSE
;
if
(
val
.
i_int
==
1
&&
b_root
)
return
TRUE
;
if
(
val
.
i_int
==
1
&&
b_root
)
return
TRUE
;
else
return
FALSE
;
else
return
FALSE
;
}
}
...
...
src/interface/interface.c
View file @
5e2efe13
...
@@ -329,7 +329,9 @@ static void RunInterface( intf_thread_t *p_intf )
...
@@ -329,7 +329,9 @@ static void RunInterface( intf_thread_t *p_intf )
static
char
*
ppsz_interfaces
[]
=
static
char
*
ppsz_interfaces
[]
=
{
{
"skins2"
,
"Skins 2"
,
"skins2"
,
"Skins 2"
,
#ifndef WIN32
"wxwidgets"
,
"wxWidgets"
,
"wxwidgets"
,
"wxWidgets"
,
#endif
NULL
,
NULL
NULL
,
NULL
};
};
char
**
ppsz_parser
;
char
**
ppsz_parser
;
...
@@ -357,6 +359,7 @@ static void RunInterface( intf_thread_t *p_intf )
...
@@ -357,6 +359,7 @@ static void RunInterface( intf_thread_t *p_intf )
{
{
val
.
psz_string
=
ppsz_parser
[
0
];
val
.
psz_string
=
ppsz_parser
[
0
];
text
.
psz_string
=
ppsz_parser
[
1
];
text
.
psz_string
=
ppsz_parser
[
1
];
fprintf
(
stderr
,
"Adding %s
\n
"
,
val
.
psz_string
);
var_Change
(
p_intf
,
"intf-switch"
,
VLC_VAR_ADDCHOICE
,
var_Change
(
p_intf
,
"intf-switch"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
&
val
,
&
text
);
break
;
break
;
...
...
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