iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert 50dfa1cd42 for wxGTK 

wxGTK has the opposite problem as OS X: GetValue returns the new value,
but the change event has the old value.
This commit is contained in:
Thomas Goyne 2014-06-08 07:39:41 -07:00
parent 056a775751
commit ac7161cd08
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/subs_edit_box.cpp
View File

@ -86,6 +86,14 @@ void change_value(wxTextCtrl *ctrl, wxString const& value) {
ctrl->ChangeValue(value); ctrl->ChangeValue(value);
} }
wxString new_value(wxComboBox *ctrl, wxCommandEvent &evt) {
#ifdef __WXGTK__
return ctrl->GetValue();
#else
return evt.GetString();
#endif
}
void time_edit_char_hook(wxKeyEvent &event) { void time_edit_char_hook(wxKeyEvent &event) {
// Force a modified event on Enter // Force a modified event on Enter
if (event.GetKeyCode() == WXK_RETURN) { if (event.GetKeyCode() == WXK_RETURN) {
@ -579,13 +587,13 @@ void SubsEditBox::OnSplit(wxCommandEvent&) {
} }
void SubsEditBox::OnStyleChange(wxCommandEvent &evt) { void SubsEditBox::OnStyleChange(wxCommandEvent &evt) {
SetSelectedRows(&AssDialogue::Style, evt.GetString(), _("style change"), AssFile::COMMIT_DIAG_META); SetSelectedRows(&AssDialogue::Style, new_value(style_box, evt), _("style change"), AssFile::COMMIT_DIAG_META);
active_style = c->ass->GetStyle(line->Style); active_style = c->ass->GetStyle(line->Style);
} }
void SubsEditBox::OnActorChange(wxCommandEvent &evt) { void SubsEditBox::OnActorChange(wxCommandEvent &evt) {
bool amend = evt.GetEventType() == wxEVT_TEXT; bool amend = evt.GetEventType() == wxEVT_TEXT;
SetSelectedRows(&AssDialogue::Actor, actor_box->GetValue(), _("actor change"), AssFile::COMMIT_DIAG_META, amend); SetSelectedRows(&AssDialogue::Actor, new_value(actor_box, evt), _("actor change"), AssFile::COMMIT_DIAG_META, amend);
PopulateList(actor_box, &AssDialogue::Actor); PopulateList(actor_box, &AssDialogue::Actor);
} }
@ -595,7 +603,7 @@ void SubsEditBox::OnLayerEnter(wxCommandEvent &evt) {
void SubsEditBox::OnEffectChange(wxCommandEvent &evt) { void SubsEditBox::OnEffectChange(wxCommandEvent &evt) {
bool amend = evt.GetEventType() == wxEVT_TEXT; bool amend = evt.GetEventType() == wxEVT_TEXT;
SetSelectedRows(&AssDialogue::Effect, evt.GetString(), _("effect change"), AssFile::COMMIT_DIAG_META, amend); SetSelectedRows(&AssDialogue::Effect, new_value(effect_box, evt), _("effect change"), AssFile::COMMIT_DIAG_META, amend);
PopulateList(effect_box, &AssDialogue::Effect); PopulateList(effect_box, &AssDialogue::Effect);
} }