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
729821ec
Commit
729821ec
authored
May 26, 2007
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/gui/wxwidgets/*: fix a bunch of warnings.
parent
757962a0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
14 deletions
+14
-14
modules/gui/wxwidgets/dialogs/playlist.cpp
modules/gui/wxwidgets/dialogs/playlist.cpp
+1
-1
modules/gui/wxwidgets/dialogs/playlist.hpp
modules/gui/wxwidgets/dialogs/playlist.hpp
+1
-1
modules/gui/wxwidgets/dialogs/preferences.cpp
modules/gui/wxwidgets/dialogs/preferences.cpp
+3
-3
modules/gui/wxwidgets/dialogs/preferences_widgets.cpp
modules/gui/wxwidgets/dialogs/preferences_widgets.cpp
+3
-3
modules/gui/wxwidgets/dialogs/wizard.cpp
modules/gui/wxwidgets/dialogs/wizard.cpp
+4
-4
modules/gui/wxwidgets/wxwidgets.cpp
modules/gui/wxwidgets/wxwidgets.cpp
+2
-2
No files found.
modules/gui/wxwidgets/dialogs/playlist.cpp
View file @
729821ec
...
@@ -1442,7 +1442,7 @@ wxMenu *Playlist::SDMenu()
...
@@ -1442,7 +1442,7 @@ wxMenu *Playlist::SDMenu()
if
(
!
strcmp
(
p_parser
->
psz_capability
,
"services_discovery"
)
)
if
(
!
strcmp
(
p_parser
->
psz_capability
,
"services_discovery"
)
)
i_number
++
;
i_number
++
;
}
}
if
(
i_number
)
pp_sds
=
(
char
**
)
calloc
(
i_number
,
sizeof
(
void
*
)
);
if
(
i_number
)
pp_sds
=
(
c
onst
c
har
**
)
calloc
(
i_number
,
sizeof
(
void
*
)
);
i_number
=
0
;
i_number
=
0
;
for
(
int
i_index
=
0
;
i_index
<
p_list
->
i_count
;
i_index
++
)
for
(
int
i_index
=
0
;
i_index
<
p_list
->
i_count
;
i_index
++
)
...
...
modules/gui/wxwidgets/dialogs/playlist.hpp
View file @
729821ec
...
@@ -180,7 +180,7 @@ private:
...
@@ -180,7 +180,7 @@ private:
int
i_update_counter
;
int
i_update_counter
;
vlc_bool_t
b_changed_view
;
vlc_bool_t
b_changed_view
;
char
**
pp_sds
;
c
onst
c
har
**
pp_sds
;
protected:
protected:
intf_thread_t
*
p_intf
;
intf_thread_t
*
p_intf
;
...
...
modules/gui/wxwidgets/dialogs/preferences.cpp
View file @
729821ec
...
@@ -362,7 +362,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
...
@@ -362,7 +362,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
if
(
i_index
<
p_list
->
i_count
)
if
(
i_index
<
p_list
->
i_count
)
{
{
wxTreeItemId
current_item
;
wxTreeItemId
current_item
;
char
*
psz_help
;
c
onst
c
har
*
psz_help
;
/* We found the main module */
/* We found the main module */
/* Enumerate config categories and store a reference so we can
/* Enumerate config categories and store a reference so we can
...
@@ -434,7 +434,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
...
@@ -434,7 +434,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
cd
->
psz_name
=
strdup
(
config_CategoryNameGet
(
cd
->
psz_name
=
strdup
(
config_CategoryNameGet
(
p_item
->
value
.
i
)
);
p_item
->
value
.
i
)
);
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
);
c
onst
c
har
*
psz_help
=
config_CategoryHelpGet
(
p_item
->
value
.
i
);
if
(
psz_help
)
if
(
psz_help
)
{
{
cd
->
psz_help
=
wraptext
(
strdup
(
psz_help
),
72
);
cd
->
psz_help
=
wraptext
(
strdup
(
psz_help
),
72
);
...
@@ -953,7 +953,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
...
@@ -953,7 +953,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
}
}
/* Add a head title to the panel */
/* Add a head title to the panel */
char
*
psz_head
;
c
onst
c
har
*
psz_head
;
if
(
config_data
->
i_type
==
TYPE_SUBCATEGORY
||
if
(
config_data
->
i_type
==
TYPE_SUBCATEGORY
||
config_data
->
i_type
==
TYPE_CATSUBCAT
)
config_data
->
i_type
==
TYPE_CATSUBCAT
)
{
{
...
...
modules/gui/wxwidgets/dialogs/preferences_widgets.cpp
View file @
729821ec
...
@@ -281,7 +281,7 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *p_this,
...
@@ -281,7 +281,7 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *p_this,
if
(
!
strcmp
(
p_parser
->
psz_capability
,
p_item
->
psz_type
)
)
if
(
!
strcmp
(
p_parser
->
psz_capability
,
p_item
->
psz_type
)
)
{
{
combo
->
Append
(
wxU
(
p_parser
->
psz_longname
),
combo
->
Append
(
wxU
(
p_parser
->
psz_longname
),
p_parser
->
psz_object_name
);
(
char
*
)
p_parser
->
psz_object_name
);
if
(
p_item
->
value
.
psz
&&
!
strcmp
(
p_item
->
value
.
psz
,
if
(
p_item
->
value
.
psz
&&
!
strcmp
(
p_item
->
value
.
psz
,
p_parser
->
psz_object_name
)
)
p_parser
->
psz_object_name
)
)
combo
->
SetValue
(
wxU
(
p_parser
->
psz_longname
)
);
combo
->
SetValue
(
wxU
(
p_parser
->
psz_longname
)
);
...
@@ -344,7 +344,7 @@ ModuleCatConfigControl::ModuleCatConfigControl( vlc_object_t *p_this,
...
@@ -344,7 +344,7 @@ ModuleCatConfigControl::ModuleCatConfigControl( vlc_object_t *p_this,
p_config
->
value
.
i
==
p_item
->
min
.
i
)
p_config
->
value
.
i
==
p_item
->
min
.
i
)
{
{
combo
->
Append
(
wxU
(
p_parser
->
psz_longname
),
combo
->
Append
(
wxU
(
p_parser
->
psz_longname
),
p_parser
->
psz_object_name
);
(
char
*
)
p_parser
->
psz_object_name
);
if
(
p_item
->
value
.
psz
&&
!
strcmp
(
p_item
->
value
.
psz
,
if
(
p_item
->
value
.
psz
&&
!
strcmp
(
p_item
->
value
.
psz
,
p_parser
->
psz_object_name
)
)
p_parser
->
psz_object_name
)
)
combo
->
SetValue
(
wxU
(
p_parser
->
psz_longname
)
);
combo
->
SetValue
(
wxU
(
p_parser
->
psz_longname
)
);
...
@@ -559,7 +559,7 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *p_this,
...
@@ -559,7 +559,7 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *p_this,
wxWindow
*
parent
)
wxWindow
*
parent
)
:
ConfigControl
(
p_this
,
p_item
,
parent
)
:
ConfigControl
(
p_this
,
p_item
,
parent
)
{
{
psz_default_value
=
p_item
->
value
.
psz
;
psz_default_value
=
(
char
*
)
p_item
->
value
.
psz
;
if
(
psz_default_value
)
psz_default_value
=
strdup
(
psz_default_value
);
if
(
psz_default_value
)
psz_default_value
=
strdup
(
psz_default_value
);
label
=
new
wxStaticText
(
this
,
-
1
,
wxU
(
p_item
->
psz_text
));
label
=
new
wxStaticText
(
this
,
-
1
,
wxU
(
p_item
->
psz_text
));
...
...
modules/gui/wxwidgets/dialogs/wizard.cpp
View file @
729821ec
...
@@ -208,7 +208,7 @@ class wizInputPage : public wxWizardPage
...
@@ -208,7 +208,7 @@ class wizInputPage : public wxWizardPage
{
{
public:
public:
wizInputPage
(
wxWizard
*
,
wxWizardPage
*
,
intf_thread_t
*
);
wizInputPage
(
wxWizard
*
,
wxWizardPage
*
,
intf_thread_t
*
);
wizInputPage
::
~
wizInputPage
();
~
wizInputPage
();
void
OnWizardPageChanging
(
wxWizardEvent
&
event
);
void
OnWizardPageChanging
(
wxWizardEvent
&
event
);
void
OnInputChange
(
wxCommandEvent
&
event
);
void
OnInputChange
(
wxCommandEvent
&
event
);
void
OnEnablePartial
(
wxCommandEvent
&
event
);
void
OnEnablePartial
(
wxCommandEvent
&
event
);
...
@@ -262,7 +262,7 @@ class wizTranscodeCodecPage : public wxWizardPage
...
@@ -262,7 +262,7 @@ class wizTranscodeCodecPage : public wxWizardPage
public:
public:
wizTranscodeCodecPage
(
wxWizard
*
parent
,
wxWizardPage
*
next
);
wizTranscodeCodecPage
(
wxWizard
*
parent
,
wxWizardPage
*
next
);
~
wizTranscodeCodecPage
();
~
wizTranscodeCodecPage
();
void
wizTranscodeCodecPage
::
OnWizardPageChanging
(
wxWizardEvent
&
event
);
void
OnWizardPageChanging
(
wxWizardEvent
&
event
);
virtual
wxWizardPage
*
GetPrev
()
const
;
virtual
wxWizardPage
*
GetPrev
()
const
;
virtual
wxWizardPage
*
GetNext
()
const
;
virtual
wxWizardPage
*
GetNext
()
const
;
void
SetPrev
(
wxWizardPage
*
page
);
void
SetPrev
(
wxWizardPage
*
page
);
...
@@ -339,7 +339,7 @@ class wizEncapPage : public wxWizardPage
...
@@ -339,7 +339,7 @@ class wizEncapPage : public wxWizardPage
{
{
public:
public:
wizEncapPage
(
wxWizard
*
parent
);
wizEncapPage
(
wxWizard
*
parent
);
wizEncapPage
::
~
wizEncapPage
();
~
wizEncapPage
();
void
OnWizardPageChanging
(
wxWizardEvent
&
event
);
void
OnWizardPageChanging
(
wxWizardEvent
&
event
);
virtual
wxWizardPage
*
GetPrev
()
const
;
virtual
wxWizardPage
*
GetPrev
()
const
;
virtual
wxWizardPage
*
GetNext
()
const
;
virtual
wxWizardPage
*
GetNext
()
const
;
...
@@ -387,7 +387,7 @@ public:
...
@@ -387,7 +387,7 @@ public:
void
OnWizardPageChanging
(
wxWizardEvent
&
event
);
void
OnWizardPageChanging
(
wxWizardEvent
&
event
);
protected:
protected:
DECLARE_EVENT_TABLE
()
DECLARE_EVENT_TABLE
()
void
wizTranscodeExtraPage
::
OnSelectFile
(
wxCommandEvent
&
);
void
OnSelectFile
(
wxCommandEvent
&
);
wxTextCtrl
*
file_text
;
wxTextCtrl
*
file_text
;
WizardDialog
*
p_parent
;
WizardDialog
*
p_parent
;
wxWizardPage
*
p_prev
;
wxWizardPage
*
p_prev
;
...
...
modules/gui/wxwidgets/wxwidgets.cpp
View file @
729821ec
...
@@ -111,8 +111,8 @@ private:
...
@@ -111,8 +111,8 @@ private:
"on the toolbar (or both)." )
"on the toolbar (or both)." )
static
int
pi_playlist_views
[]
=
{
0
,
1
,
2
};
static
int
pi_playlist_views
[]
=
{
0
,
1
,
2
};
static
char
*
psz_playlist_views
[]
=
{
N_
(
"Normal"
),
N_
(
"Embedded"
)
,
static
c
onst
c
har
*
psz_playlist_views
[]
=
{
N_
(
"Normal"
),
N_
(
"Embedded"
)
,
N_
(
"Both"
)
};
N_
(
"Both"
)
};
vlc_module_begin
();
vlc_module_begin
();
int
i_score
=
150
;
int
i_score
=
150
;
...
...
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