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
ba24a824
Commit
ba24a824
authored
Nov 06, 2006
by
Marian Durkovic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Forwardport Unicode wxWidgets fixes - [17434], [17436], [17452]
parent
833af67f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
15 deletions
+13
-15
modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
+5
-5
modules/gui/wxwidgets/dialogs/wizard.cpp
modules/gui/wxwidgets/dialogs/wizard.cpp
+4
-4
modules/gui/wxwidgets/dialogs/wizard.hpp
modules/gui/wxwidgets/dialogs/wizard.hpp
+1
-1
modules/gui/wxwidgets/wxwidgets.hpp
modules/gui/wxwidgets/wxwidgets.hpp
+3
-5
No files found.
modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
View file @
ba24a824
...
...
@@ -441,9 +441,9 @@ void VLMAddStreamPanel::Load( VLMStream *p_stream )
void
VLMAddStreamPanel
::
OnCreate
(
wxCommandEvent
&
event
)
{
char
*
psz_name
=
FromLocale
(
name_text
->
GetValue
().
mb_str
()
);
char
*
psz_input
=
FromLocale
(
input_text
->
GetValue
().
mb_str
()
);
char
*
psz_output
=
FromLocale
(
output_text
->
GetValue
().
mb_str
()
);
char
*
psz_name
=
wxFromLocale
(
name_text
->
GetValue
()
);
char
*
psz_input
=
wxFromLocale
(
input_text
->
GetValue
()
);
char
*
psz_output
=
wxFromLocale
(
output_text
->
GetValue
()
);
if
(
b_broadcast
&&
!
b_edit
)
{
p_vlm
->
AddBroadcast
(
psz_name
,
psz_input
,
psz_output
,
...
...
@@ -468,8 +468,8 @@ void VLMAddStreamPanel::OnCreate( wxCommandEvent &event )
enabled_checkbox
->
IsChecked
()
?
VLC_TRUE
:
VLC_FALSE
,
loop_checkbox
->
IsChecked
()
?
VLC_TRUE
:
VLC_FALSE
);
}
LocaleFree
(
psz_name
)
;
LocaleFree
(
psz_input
)
;
LocaleFree
(
psz_output
);
wxLocaleFree
(
psz_name
)
;
wx
LocaleFree
(
psz_input
)
;
wx
LocaleFree
(
psz_output
);
if
(
!
b_edit
)
OnClear
(
event
);
if
(
b_edit
)
...
...
modules/gui/wxwidgets/dialogs/wizard.cpp
View file @
ba24a824
...
...
@@ -1297,7 +1297,7 @@ void wizTranscodeExtraPage::OnWizardPageChanging( wxWizardEvent& event )
}
if
(
event
.
GetDirection
()
)
{
p_parent
->
SetTranscodeOut
(
file_text
->
GetValue
()
.
mb_str
()
);
p_parent
->
SetTranscodeOut
(
file_text
->
GetValue
()
);
}
}
...
...
@@ -1510,11 +1510,11 @@ void WizardDialog::SetStream( char const *method, char const *address )
this
->
address
=
strdup
(
address
);
}
void
WizardDialog
::
SetTranscodeOut
(
char
const
*
address
)
void
WizardDialog
::
SetTranscodeOut
(
wxString
address
)
{
char
*
psz_utf8
=
FromLocale
(
address
);
char
*
psz_utf8
=
wx
FromLocale
(
address
);
this
->
address
=
strdup
(
psz_utf8
);
LocaleFree
(
psz_utf8
);
wx
LocaleFree
(
psz_utf8
);
}
void
WizardDialog
::
SetMux
(
char
const
*
mux
)
...
...
modules/gui/wxwidgets/dialogs/wizard.hpp
View file @
ba24a824
...
...
@@ -42,7 +42,7 @@ namespace wxvlc
void
SetTTL
(
int
i_ttl
);
void
SetPartial
(
int
,
int
);
void
SetStream
(
char
const
*
method
,
char
const
*
address
);
void
SetTranscodeOut
(
char
const
*
address
);
void
SetTranscodeOut
(
wxString
address
);
void
SetAction
(
int
i_action
);
int
GetAction
();
void
SetSAP
(
bool
b_enabled
,
const
char
*
psz_name
);
...
...
modules/gui/wxwidgets/wxwidgets.hpp
View file @
ba24a824
...
...
@@ -95,10 +95,8 @@ DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 );
* But heh, that's wxWidgets; you can't really expect it to actually
* work, let alone work like its documentation says.
*
* Did it work, we would be able to catch non-ANSI characters on Windows
* through wxString::wc_str(); while they are lost when using mb_str().
* This would be particularly useful to open files whose names contain
* non-ACP characters.
* Unicode needs to be enabled to catch non-ANSI characters on Windows
* through wxString::wc_str(); they are lost when using mb_str().
*/
#if wxUSE_UNICODE
# define wxFromLocale(wxstring) FromWide(wxstring.wc_str())
...
...
@@ -109,7 +107,7 @@ DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 );
#endif
/* From Locale functions to use for File Drop targets ... go figure */
#if
def wxUSE_UNICODE
#if
defined( wxUSE_UNICODE ) && !defined( WIN32 )
static
inline
char
*
wxDnDFromLocale
(
const
wxChar
*
stupid
)
{
/*
...
...
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