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

Merged 2337

Browse Source
This commit is contained in:
Moritz Bunkus 2004-10-09 17:50:24 +00:00
parent 6897f8825f
commit 26ac3fe66f
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.mingw
View File

@ -199,7 +199,8 @@ src/output/libmtxoutput.a: $(libmtxoutput_OBJECTS)
mkvmerge_SOURCES = src/mkvmerge.cpp \
src/cluster_helper.cpp \
src/pr_generic.cpp
src/pr_generic.cpp \
src/timecode_factory.cpp
mkvmerge_OBJECTS := $(patsubst %.cpp,%.o,$(mkvmerge_SOURCES))
mkvmerge_DEPENDENCIES += $(DEP_COMMON) \
$(DEP_COMP) $(DEP_INPUT) $(DEP_OUTPUT) $(DEP_AVI) $(DEP_RMFF)

8
src/mmg/mmg.cpp
View File

@ -669,8 +669,10 @@ mmg_dialog::mmg_dialog():
wxGROW, 5);
tc_output = new wxTextCtrl(panel, ID_TC_OUTPUT, wxT(""));
sbs_low->Add(tc_output, 1, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT |
wxGROW, 5);
sbs_low->Add(0, 5, 0, 0, 0);
sbs_low->Add(tc_output, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM |
wxGROW, 2);
sbs_low->Add(0, 5, 0, 0, 0);
b_browse_output = new wxButton(panel, ID_B_BROWSEOUTPUT, wxT("Browse"));
sbs_low->Add(b_browse_output, 0, wxALIGN_CENTER_VERTICAL | wxALL, 3);
@ -710,8 +712,10 @@ mmg_dialog::mmg_dialog():
#ifdef SYS_WINDOWS
SetSizeHints(520, 740);
SetSize(520, 740);
#else
SetSizeHints(520, 718);
SetSize(520, 718);
#endif
last_open_dir = wxT("");

4
src/mmg/tab_global.cpp
View File

@ -279,8 +279,10 @@ tab_global::tab_global(wxWindow *parent):
0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
tc_global_tags = new wxTextCtrl(this, ID_TC_GLOBALTAGS, wxT(""));
siz_gl_tags->Add(0, 5, 0, 0, 0);
siz_gl_tags->Add(tc_global_tags, 1, wxALIGN_CENTER_VERTICAL | wxGROW |
wxLEFT | wxRIGHT, 5);
wxTOP | wxBOTTOM, 2);
siz_gl_tags->Add(0, 5, 0, 0, 0);
b_browse_global_tags = new wxButton(this, ID_B_BROWSEGLOBALTAGS,
wxT("Browse"));
b_browse_global_tags->SetToolTip(TIP("The difference between tags associated"