More Linux fixes.
Originally committed to SVN as r888.
This commit is contained in:
parent
6d84bde8da
commit
3c46ab72ac
3 changed files with 7 additions and 7 deletions
|
@ -463,10 +463,10 @@ wxString AssStyle::GetSSAText() {
|
|||
font.Replace(_T(","),_T(";"));
|
||||
|
||||
output = wxString::Format(_T("Style: %s,%s,%.0f,%s,%s,0,%s,%d,%d,%d,%.0f,%.0f,%d,%d,%d,%d,0,%i"),
|
||||
name, font, fontsize,
|
||||
primary.GetSSAFormatted(),
|
||||
secondary.GetSSAFormatted(),
|
||||
shadow.GetSSAFormatted(),
|
||||
name.c_str(), font.c_str(), fontsize,
|
||||
primary.GetSSAFormatted().c_str(),
|
||||
secondary.GetSSAFormatted().c_str(),
|
||||
shadow.GetSSAFormatted().c_str(),
|
||||
(bold? -1 : 0), (italic ? -1 : 0),
|
||||
borderstyle,outline_w,shadow_w,align,
|
||||
Margin[0],Margin[1],Margin[2],encoding);
|
||||
|
|
|
@ -810,13 +810,13 @@ BEGIN_EVENT_TABLE(SubsEditBoxEvent, wxEvtHandler)
|
|||
END_EVENT_TABLE()
|
||||
|
||||
void SubsEditBoxEvent::OnKeyPress(wxKeyEvent &event) {
|
||||
control->KeyPress(event);
|
||||
control->DoKeyPress(event);
|
||||
}
|
||||
|
||||
|
||||
///////////////////////
|
||||
// Actual text changed
|
||||
void SubsEditBox::KeyPress(wxKeyEvent &event) {
|
||||
void SubsEditBox::DoKeyPress(wxKeyEvent &event) {
|
||||
int key = event.GetKeyCode();
|
||||
|
||||
if (key == WXK_RETURN || key == WXK_NUMPAD_ENTER) {
|
||||
|
|
|
@ -155,7 +155,7 @@ public:
|
|||
void UpdateGlobals();
|
||||
void SetToLine(int n,bool weak=false);
|
||||
void UpdateFrameTiming();
|
||||
void KeyPress(wxKeyEvent &event);
|
||||
void DoKeyPress(wxKeyEvent &event);
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue