Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
f5aff5de
Commit
f5aff5de
authored
Jan 17, 2007
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the preferences under wx
parent
26e16d73
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
12 deletions
+1
-12
modules/gui/wxwidgets/dialogs/preferences.cpp
modules/gui/wxwidgets/dialogs/preferences.cpp
+1
-12
No files found.
modules/gui/wxwidgets/dialogs/preferences.cpp
View file @
f5aff5de
...
@@ -433,7 +433,6 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
...
@@ -433,7 +433,6 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
if
(
cd
->
psz_name
)
free
(
cd
->
psz_name
);
if
(
cd
->
psz_name
)
free
(
cd
->
psz_name
);
cd
->
psz_name
=
strdup
(
config_CategoryNameGet
(
cd
->
psz_name
=
strdup
(
config_CategoryNameGet
(
p_item
->
value
.
i
)
);
p_item
->
value
.
i
)
);
msg_Err
(
p_intf
,
"found a subcategory %s"
,
cd
->
psz_name
);
if
(
cd
->
psz_help
)
free
(
cd
->
psz_help
);
if
(
cd
->
psz_help
)
free
(
cd
->
psz_help
);
char
*
psz_help
=
config_CategoryHelpGet
(
p_item
->
value
.
i
);
char
*
psz_help
=
config_CategoryHelpGet
(
p_item
->
value
.
i
);
if
(
psz_help
)
if
(
psz_help
)
...
@@ -507,18 +506,15 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
...
@@ -507,18 +506,15 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
/* Exclude the main module */
/* Exclude the main module */
if
(
!
strcmp
(
p_module
->
psz_object_name
,
"main"
)
)
if
(
!
strcmp
(
p_module
->
psz_object_name
,
"main"
)
)
continue
;
continue
;
msg_Err
(
p_intf
,
"processing %s"
,
p_module
->
psz_object_name
);
/* Exclude empty plugins (submodules don't have config options, they
/* Exclude empty plugins (submodules don't have config options, they
* are stored in the parent module) */
* are stored in the parent module) */
if
(
p_module
->
b_submodule
)
if
(
p_module
->
b_submodule
)
continue
;
continue
;
// p_item = ((module_t *)p_module->p_parent)->p_config;
// p_item = ((module_t *)p_module->p_parent)->p_config;
else
else
//msg_Err(p_intf,"1p_item=0x%x, p_end=0x%x, i_optoin=%i", p_item, p_end, i_options);
for
(
size_t
i
=
0
;
i
<
p_module
->
confsize
;
i
++
)
for
(
size_t
i
=
0
;
i
<
p_module
->
confsize
;
i
++
)
{
{
module_config_t
*
p_item
=
p_module
->
p_config
+
i
;
module_config_t
*
p_item
=
p_module
->
p_config
+
i
;
msg_Err
(
p_intf
,
"i_type=0x%x, value=%i"
,
p_item
->
i_type
,
p_item
->
value
.
i
);
if
(
p_item
->
i_type
==
CONFIG_CATEGORY
)
if
(
p_item
->
i_type
==
CONFIG_CATEGORY
)
{
{
i_category
=
p_item
->
value
.
i
;
i_category
=
p_item
->
value
.
i
;
...
@@ -531,11 +527,9 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
...
@@ -531,11 +527,9 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
i_options
++
;
i_options
++
;
if
(
i_options
>
0
&&
i_category
>=
0
&&
i_subcategory
>=
0
)
if
(
i_options
>
0
&&
i_category
>=
0
&&
i_subcategory
>=
0
)
{
{
msg_Err
(
p_intf
,
"break"
);
break
;
break
;
}
}
}
}
msg_Err
(
p_intf
,
"p_item=0x%x, p_end=0x%x, i_optoin=%i, i_category=%i"
,
p_item
,
p_end
,
i_options
,
i_category
);
if
(
!
i_options
)
continue
;
if
(
!
i_options
)
continue
;
...
@@ -548,7 +542,6 @@ msg_Err(p_intf,"p_item=0x%x, p_end=0x%x, i_optoin=%i, i_category=%i", p_item, p_
...
@@ -548,7 +542,6 @@ msg_Err(p_intf,"p_item=0x%x, p_end=0x%x, i_optoin=%i, i_category=%i", p_item, p_
{
{
ConfigTreeData
*
config_data
=
ConfigTreeData
*
config_data
=
(
ConfigTreeData
*
)
GetItemData
(
category_item
);
(
ConfigTreeData
*
)
GetItemData
(
category_item
);
// msg_Err(p_intf,"%i, %i", config_data->i_object_id, i_category);
if
(
config_data
->
i_object_id
==
i_category
)
if
(
config_data
->
i_object_id
==
i_category
)
{
{
b_found
=
VLC_TRUE
;
b_found
=
VLC_TRUE
;
...
@@ -556,7 +549,6 @@ msg_Err(p_intf,"p_item=0x%x, p_end=0x%x, i_optoin=%i, i_category=%i", p_item, p_
...
@@ -556,7 +549,6 @@ msg_Err(p_intf,"p_item=0x%x, p_end=0x%x, i_optoin=%i, i_category=%i", p_item, p_
}
}
category_item
=
GetNextChild
(
root_item
,
cookie
);
category_item
=
GetNextChild
(
root_item
,
cookie
);
}
}
msg_Err
(
p_intf
,
"found=%i"
,
b_found
);
if
(
!
b_found
)
continue
;
if
(
!
b_found
)
continue
;
/* Find subcategory item */
/* Find subcategory item */
...
@@ -610,7 +602,6 @@ msg_Err(p_intf, "found=%i", b_found);
...
@@ -610,7 +602,6 @@ msg_Err(p_intf, "found=%i", b_found);
#else
#else
i_image
=
-
1
;
i_image
=
-
1
;
#endif
#endif
msg_Err
(
p_intf
,
"adding %s with image %i "
,
p_module
->
psz_shortname
?
p_module
->
psz_shortname
:
p_module
->
psz_object_name
,
i_image
);
AppendItem
(
subcategory_item
,
wxU
(
p_module
->
psz_shortname
?
AppendItem
(
subcategory_item
,
wxU
(
p_module
->
psz_shortname
?
p_module
->
psz_shortname
:
p_module
->
psz_object_name
)
p_module
->
psz_shortname
:
p_module
->
psz_object_name
)
,
i_image
,
-
1
,
,
i_image
,
-
1
,
...
@@ -958,9 +949,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
...
@@ -958,9 +949,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
{
{
break
;
break
;
}
}
if
(
p_item
<
p_end
)
}
while
(
p_item
++
<=
p_end
);
break
;
}
while
(
p_item
++
);
}
}
/* Add a head title to the panel */
/* Add a head title to the panel */
...
...
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