From 500b8b66d8752d9f3cfe9cd386130157cea5c5f2 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 29 Nov 2011 23:18:42 +0000 Subject: [PATCH] Make a few of FrameMain's members local to InitContents Originally committed to SVN as r5938. --- aegisub/src/frame_main.cpp | 4 ++-- aegisub/src/frame_main.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 7a0c4bf55..1aaa06803 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -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"); diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h index 5bed86ba6..7eb76978e 100644 --- a/aegisub/src/frame_main.h +++ b/aegisub/src/frame_main.h @@ -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