Merge r3733 for jfs, fixes #977

Originally committed to SVN as r3735.
This commit is contained in:
Amar Takhar 2009-10-26 23:44:16 +00:00
parent 002a5dd980
commit 7de7dba807

View file

@ -835,6 +835,8 @@ DialogKanjiTimer::DialogKanjiTimer(wxWindow *parent, SubtitlesGrid *_grid)
// Variables // Variables
subs = AssFile::top; subs = AssFile::top;
grid = _grid; grid = _grid;
currentSourceLine = subs->Line.begin();
currentDestinationLine = subs->Line.begin();
//Sizers //Sizers
wxSizer *DisplayBoxSizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Text")); wxSizer *DisplayBoxSizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Text"));
@ -846,7 +848,6 @@ DialogKanjiTimer::DialogKanjiTimer(wxWindow *parent, SubtitlesGrid *_grid)
wxSizer *BottomShelfSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *BottomShelfSizer = new wxBoxSizer(wxHORIZONTAL);
wxSizer *BottomLeftStackSizer = new wxBoxSizer(wxVERTICAL); wxSizer *BottomLeftStackSizer = new wxBoxSizer(wxVERTICAL);
display = new KaraokeLineMatchDisplay(this); display = new KaraokeLineMatchDisplay(this);
//Checkbox //Checkbox