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
2cde647a
Commit
2cde647a
authored
Sep 02, 2007
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wxwidgets compilation
parent
8a0b8bd8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
modules/gui/wxwidgets/dialogs.cpp
modules/gui/wxwidgets/dialogs.cpp
+1
-1
modules/gui/wxwidgets/interface.cpp
modules/gui/wxwidgets/interface.cpp
+3
-3
No files found.
modules/gui/wxwidgets/dialogs.cpp
View file @
2cde647a
...
@@ -193,7 +193,7 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf, wxWindow *p_parent )
...
@@ -193,7 +193,7 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf, wxWindow *p_parent )
//p_vlm_dialog = NULL;
//p_vlm_dialog = NULL;
/* Give our interface a nice little icon */
/* Give our interface a nice little icon */
p_intf
->
p_sys
->
p_icon
=
new
wxIcon
(
vlc_xpm
);
p_intf
->
p_sys
->
p_icon
=
new
wxIcon
(
(
const
char
**
)
vlc_xpm
);
/* Create the messages dialog so it can begin storing logs */
/* Create the messages dialog so it can begin storing logs */
p_messages_dialog
=
new
Messages
(
p_intf
,
p_parent
?
p_parent
:
this
);
p_messages_dialog
=
new
Messages
(
p_intf
,
p_parent
?
p_parent
:
this
);
...
...
modules/gui/wxwidgets/interface.cpp
View file @
2cde647a
...
@@ -374,7 +374,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
...
@@ -374,7 +374,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
/* Give our interface a nice little icon */
/* Give our interface a nice little icon */
SetIcon
(
wxIcon
(
vlc_xpm
)
);
SetIcon
(
wxIcon
(
(
const
char
**
)
vlc_xpm
)
);
/* Create a splitter window that will fill in the interface window.
/* Create a splitter window that will fill in the interface window.
* We need a splitter bar in order to make the embedded playlist
* We need a splitter bar in order to make the embedded playlist
...
@@ -1468,7 +1468,7 @@ Systray::Systray( Interface *_p_main_interface, intf_thread_t *_p_intf )
...
@@ -1468,7 +1468,7 @@ Systray::Systray( Interface *_p_main_interface, intf_thread_t *_p_intf )
p_main_interface
=
_p_main_interface
;
p_main_interface
=
_p_main_interface
;
p_intf
=
_p_intf
;
p_intf
=
_p_intf
;
SetIcon
(
wxIcon
(
vlc16x16_xpm
),
wxT
(
"VLC media player"
)
);
SetIcon
(
wxIcon
(
(
const
char
**
)
vlc16x16_xpm
),
wxT
(
"VLC media player"
)
);
if
(
!
IsOk
()
||
!
IsIconInstalled
()
)
if
(
!
IsOk
()
||
!
IsIconInstalled
()
)
{
{
msg_Warn
(
p_intf
,
"cannot set systray icon, weird things may happen"
);
msg_Warn
(
p_intf
,
"cannot set systray icon, weird things may happen"
);
...
@@ -1536,7 +1536,7 @@ wxMenu* Systray::CreatePopupMenu()
...
@@ -1536,7 +1536,7 @@ wxMenu* Systray::CreatePopupMenu()
void
Systray
::
UpdateTooltip
(
const
wxChar
*
tooltip
)
void
Systray
::
UpdateTooltip
(
const
wxChar
*
tooltip
)
{
{
SetIcon
(
wxIcon
(
vlc16x16_xpm
),
tooltip
);
SetIcon
(
wxIcon
(
(
const
char
**
)
vlc16x16_xpm
),
tooltip
);
}
}
#endif
#endif
#endif
#endif
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