From 0e0a43d70816d879926ae97b52fb433a9b846677 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 26 Feb 2005 22:44:59 +0000 Subject: [PATCH] wxWidgets 2.5.3 compatibility fix: "split by time" was not selectable. --- ChangeLog | 3 +++ src/mmg/tab_global.cpp | 21 ++++++++++++++------- src/mmg/tab_global.h | 3 ++- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c01becefa..ff0e4e15f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-02-26 Moritz Bunkus + * mmg: bug fix: "Splitting by time" was not selectable on Windows + Unicode builds (problem with wxWidgets 2.5.3). + * mmg: bug fix: mkvmerge's output during muxing was not converted from UTF-8. diff --git a/src/mmg/tab_global.cpp b/src/mmg/tab_global.cpp index a83bab25e..8e2b02bf6 100644 --- a/src/mmg/tab_global.cpp +++ b/src/mmg/tab_global.cpp @@ -339,12 +339,19 @@ tab_global::on_split_clicked(wxCommandEvent &evt) { } void -tab_global::on_splitby_clicked(wxCommandEvent &evt) { - bool er; +tab_global::on_splitby_time_clicked(wxCommandEvent &evt) { + cob_split_by_size->Enable(false); + cob_split_by_time->Enable(true); + rb_split_by_size->SetValue(false); + rb_split_by_time->SetValue(true); +} - er = rb_split_by_size->GetValue(); - cob_split_by_size->Enable(er); - cob_split_by_time->Enable(!er); +void +tab_global::on_splitby_size_clicked(wxCommandEvent &evt) { + cob_split_by_size->Enable(true); + cob_split_by_time->Enable(false); + rb_split_by_size->SetValue(true); + rb_split_by_time->SetValue(false); } void @@ -536,6 +543,6 @@ BEGIN_EVENT_TABLE(tab_global, wxPanel) EVT_BUTTON(ID_B_BROWSEGLOBALTAGS, tab_global::on_browse_global_tags) EVT_BUTTON(ID_B_BROWSECHAPTERS, tab_global::on_browse_chapters) EVT_CHECKBOX(ID_CB_SPLIT, tab_global::on_split_clicked) - EVT_RADIOBUTTON(ID_RB_SPLITBYSIZE, tab_global::on_splitby_clicked) - EVT_RADIOBUTTON(ID_RB_SPLITBYTIME, tab_global::on_splitby_clicked) + EVT_RADIOBUTTON(ID_RB_SPLITBYSIZE, tab_global::on_splitby_size_clicked) + EVT_RADIOBUTTON(ID_RB_SPLITBYTIME, tab_global::on_splitby_time_clicked) END_EVENT_TABLE(); diff --git a/src/mmg/tab_global.h b/src/mmg/tab_global.h index bb6bbb128..3a02cba4b 100644 --- a/src/mmg/tab_global.h +++ b/src/mmg/tab_global.h @@ -58,7 +58,8 @@ public: void on_browse_chapters(wxCommandEvent &evt); void on_browse_global_tags(wxCommandEvent &evt); void on_split_clicked(wxCommandEvent &evt); - void on_splitby_clicked(wxCommandEvent &evt); + void on_splitby_size_clicked(wxCommandEvent &evt); + void on_splitby_time_clicked(wxCommandEvent &evt); void save(wxConfigBase *cfg); void load(wxConfigBase *cfg);