Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
9992f342
Commit
9992f342
authored
Dec 15, 2005
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a wxDialog rather than a wxFrame
parent
6c79c8e6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
modules/gui/wxwidgets/dialogs/interaction.cpp
modules/gui/wxwidgets/dialogs/interaction.cpp
+11
-7
modules/gui/wxwidgets/dialogs/interaction.hpp
modules/gui/wxwidgets/dialogs/interaction.hpp
+1
-1
No files found.
modules/gui/wxwidgets/dialogs/interaction.cpp
View file @
9992f342
...
@@ -41,7 +41,7 @@ enum
...
@@ -41,7 +41,7 @@ enum
NoShow_Event
NoShow_Event
};
};
BEGIN_EVENT_TABLE
(
InteractionDialog
,
wx
Frame
)
BEGIN_EVENT_TABLE
(
InteractionDialog
,
wx
Dialog
)
EVT_CLOSE
(
InteractionDialog
::
OnClose
)
EVT_CLOSE
(
InteractionDialog
::
OnClose
)
EVT_BUTTON
(
wxID_OK
,
InteractionDialog
::
OnOkYes
)
EVT_BUTTON
(
wxID_OK
,
InteractionDialog
::
OnOkYes
)
EVT_BUTTON
(
wxID_YES
,
InteractionDialog
::
OnOkYes
)
EVT_BUTTON
(
wxID_YES
,
InteractionDialog
::
OnOkYes
)
...
@@ -57,7 +57,7 @@ END_EVENT_TABLE()
...
@@ -57,7 +57,7 @@ END_EVENT_TABLE()
InteractionDialog
::
InteractionDialog
(
intf_thread_t
*
_p_intf
,
InteractionDialog
::
InteractionDialog
(
intf_thread_t
*
_p_intf
,
wxWindow
*
p_parent
,
wxWindow
*
p_parent
,
interaction_dialog_t
*
_p_dialog
)
interaction_dialog_t
*
_p_dialog
)
:
wx
Frame
(
p_parent
,
-
1
,
wxU
(
_p_dialog
->
psz_title
)
)
:
wx
Dialog
(
p_parent
,
-
1
,
wxU
(
_p_dialog
->
psz_title
)
)
{
{
/* Initializations */
/* Initializations */
p_intf
=
_p_intf
;
p_intf
=
_p_intf
;
...
@@ -182,9 +182,12 @@ void InteractionDialog::Render()
...
@@ -182,9 +182,12 @@ void InteractionDialog::Render()
wxID_NO
,
wxU
(
_
(
"No"
)
)
);
wxID_NO
,
wxU
(
_
(
"No"
)
)
);
wxButton
*
cancel
=
new
wxButton
(
buttons_panel
,
wxButton
*
cancel
=
new
wxButton
(
buttons_panel
,
wxID_CANCEL
,
wxU
(
_
(
"Cancel"
)
)
);
wxID_CANCEL
,
wxU
(
_
(
"Cancel"
)
)
);
buttons_sizer
->
Add
(
yes
,
0
,
wxEXPAND
|
wxRIGHT
|
wxLEFT
|
wxALIGN_CENTER
,
5
);
buttons_sizer
->
Add
(
yes
,
0
,
wxEXPAND
|
wxRIGHT
|
wxLEFT
|
buttons_sizer
->
Add
(
no
,
0
,
wxEXPAND
|
wxRIGHT
|
wxLEFT
|
wxALIGN_CENTER
,
5
);
wxALIGN_CENTER
,
5
);
buttons_sizer
->
Add
(
cancel
,
0
,
wxEXPAND
|
wxRIGHT
|
wxLEFT
|
wxALIGN_CENTER
,
5
);
buttons_sizer
->
Add
(
no
,
0
,
wxEXPAND
|
wxRIGHT
|
wxLEFT
|
wxALIGN_CENTER
,
5
);
buttons_sizer
->
Add
(
cancel
,
0
,
wxEXPAND
|
wxRIGHT
|
wxLEFT
|
wxALIGN_CENTER
,
5
);
}
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_CLEAR_NOSHOW
)
else
if
(
p_dialog
->
i_flags
&
DIALOG_CLEAR_NOSHOW
)
{
{
...
@@ -243,7 +246,8 @@ void InteractionDialog::OnClear( wxCommandEvent& event )
...
@@ -243,7 +246,8 @@ void InteractionDialog::OnClear( wxCommandEvent& event )
}
}
widgets_panel
->
DestroyChildren
();
widgets_panel
->
DestroyChildren
();
/* FIXME: Needed for the spacer */
/* FIXME: Needed for the spacer */
buttons_sizer
->
Remove
(
1
);
buttons_sizer
->
Remove
(
2
);
buttons_sizer
->
Remove
(
3
);
buttons_sizer
->
Remove
(
1
);
buttons_sizer
->
Remove
(
2
);
buttons_sizer
->
Remove
(
3
);
buttons_panel
->
DestroyChildren
();
buttons_panel
->
DestroyChildren
();
input_widgets
.
clear
();
input_widgets
.
clear
();
vlc_mutex_unlock
(
&
p_dialog
->
p_interaction
->
object_lock
);
vlc_mutex_unlock
(
&
p_dialog
->
p_interaction
->
object_lock
);
...
@@ -262,7 +266,7 @@ void InteractionDialog::Finish( int i_ret )
...
@@ -262,7 +266,7 @@ void InteractionDialog::Finish( int i_ret )
while
(
it
<
input_widgets
.
end
()
)
while
(
it
<
input_widgets
.
end
()
)
{
{
if
(
(
*
it
).
i_type
==
WIDGET_INPUT_TEXT
)
if
(
(
*
it
).
i_type
==
WIDGET_INPUT_TEXT
)
(
*
it
).
val
->
psz_string
=
strdup
(
(
*
it
).
control
->
GetValue
().
mb_str
()
);
(
*
it
).
val
->
psz_string
=
strdup
(
(
*
it
).
control
->
GetValue
().
mb_str
());
it
++
;
it
++
;
}
}
Hide
();
Hide
();
...
...
modules/gui/wxwidgets/dialogs/interaction.hpp
View file @
9992f342
...
@@ -41,7 +41,7 @@ namespace wxvlc
...
@@ -41,7 +41,7 @@ namespace wxvlc
int
i_type
;
int
i_type
;
};
};
class
InteractionDialog
:
public
wx
Frame
class
InteractionDialog
:
public
wx
Dialog
{
{
public:
public:
/* Constructor */
/* Constructor */
...
...
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