mirror of https://github.com/odrling/Aegisub
Make a few of FrameMain's members local to InitContents
Originally committed to SVN as r5938.
This commit is contained in:
parent
dfc68a4db9
commit
500b8b66d8
|
@ -254,7 +254,7 @@ void FrameMain::InitToolbar () {
|
|||
|
||||
void FrameMain::InitContents() {
|
||||
StartupLog("Create background panel");
|
||||
Panel = new wxPanel(this,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL | wxCLIP_CHILDREN);
|
||||
wxPanel *Panel = new wxPanel(this,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL | wxCLIP_CHILDREN);
|
||||
|
||||
StartupLog("Create subtitles grid");
|
||||
context->subsGrid = SubsGrid = new SubtitlesGrid(Panel,context.get(),wxSize(600,100),wxWANTS_CHARS | wxSUNKEN_BORDER,"Subs grid");
|
||||
|
@ -268,7 +268,7 @@ void FrameMain::InitContents() {
|
|||
context->audioBox = audioBox = new AudioBox(Panel, context.get());
|
||||
|
||||
StartupLog("Create subtitle editing box");
|
||||
EditBox = new SubsEditBox(Panel, context.get());
|
||||
SubsEditBox *EditBox = new SubsEditBox(Panel, context.get());
|
||||
context->editBox = EditBox->TextEdit;
|
||||
|
||||
StartupLog("Arrange main sizers");
|
||||
|
|
|
@ -89,8 +89,6 @@ class FrameMain: public wxFrame {
|
|||
/// isn't loaded
|
||||
bool blockVideoLoad;
|
||||
|
||||
wxPanel *Panel;
|
||||
|
||||
void InitToolbar();
|
||||
void InitContents();
|
||||
|
||||
|
@ -120,7 +118,6 @@ class FrameMain: public wxFrame {
|
|||
void OnSubtitlesOpen();
|
||||
|
||||
SubtitlesGrid *SubsGrid; ///< The subtitle editing area
|
||||
SubsEditBox *EditBox; ///< The subtitle editing textbox
|
||||
AudioBox *audioBox; ///< The audio area
|
||||
VideoBox *videoBox; ///< The video area
|
||||
|
||||
|
|
Loading…
Reference in New Issue