Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-29 06:15:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Couple of fixes for wxWidgets 2.9.3 on Mac OS

Browse Source
This commit is contained in:
Moritz Bunkus 2012-04-08 13:18:04 +02:00
parent 7112c1771c
commit bea433084d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mmg/mux_dialog.cpp
View File

@ -35,7 +35,7 @@ mux_dialog::mux_dialog(wxWindow *parent):
#ifdef SYS_WINDOWS
wxSize(700, 560),
#else
wxSize(700, 520),
wxSize(720, 520),
#endif
wxDEFAULT_FRAME_STYLE)
#if defined(SYS_WINDOWS)
@ -76,13 +76,13 @@ mux_dialog::mux_dialog(wxWindow *parent):
siz_output = new wxStaticBoxSizer(new wxStaticBox(this, -1, Z("Output")), wxVERTICAL);
siz_output->Add(new wxStaticText(this, -1, Z("mkvmerge output:")), 0, wxALIGN_LEFT | wxALL, 5);
tc_output = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY | wxTE_BESTWRAP | wxTE_MULTILINE);
tc_output = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 100), wxTE_READONLY | wxTE_BESTWRAP | wxTE_MULTILINE);
siz_output->Add(tc_output, 2, wxGROW | wxALL, 5);
siz_output->Add(new wxStaticText(this, -1, Z("Warnings:")), 0, wxALIGN_LEFT | wxALL, 5);
tc_warnings = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY | wxTE_BESTWRAP | wxTE_MULTILINE);
tc_warnings = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 50), wxTE_READONLY | wxTE_BESTWRAP | wxTE_MULTILINE);
siz_output->Add(tc_warnings, 1, wxGROW | wxALL, 5);
siz_output->Add(new wxStaticText(this, -1, Z("Errors:")), 0, wxALIGN_LEFT | wxALL, 5);
tc_errors = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY | wxTE_BESTWRAP | wxTE_MULTILINE);
tc_errors = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 50), wxTE_READONLY | wxTE_BESTWRAP | wxTE_MULTILINE);
siz_output->Add(tc_errors, 1, wxGROW | wxALL, 5);
siz_buttons = new wxBoxSizer(wxHORIZONTAL);
@ -104,6 +104,8 @@ mux_dialog::mux_dialog(wxWindow *parent):
siz_all->Add(siz_buttons, 0, wxGROW | wxALL, 10);
SetSizer(siz_all);
Layout();
update_window(Z("Muxing in progress."));
Show(true);
@ -214,6 +216,7 @@ mux_dialog::~mux_dialog() {
void
mux_dialog::update_window(wxString text) {
st_label->SetLabel(text);
Layout();
}
void