mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Make a few of FrameMain's members local to InitContents

Browse source 
Originally committed to SVN as r5938.
This commit is contained in:
Thomas Goyne 2011-11-29 23:18:42 +00:00
parent dfc68a4db9
commit 500b8b66d8
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/src/frame_main.cpp
View file

@ -254,7 +254,7 @@ void FrameMain::InitToolbar () {
void FrameMain::InitContents() { void FrameMain::InitContents() {
StartupLog("Create background panel"); 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"); StartupLog("Create subtitles grid");
context->subsGrid = SubsGrid = new SubtitlesGrid(Panel,context.get(),wxSize(600,100),wxWANTS_CHARS | wxSUNKEN_BORDER,"Subs 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()); context->audioBox = audioBox = new AudioBox(Panel, context.get());
StartupLog("Create subtitle editing box"); StartupLog("Create subtitle editing box");
EditBox = new SubsEditBox(Panel, context.get()); SubsEditBox *EditBox = new SubsEditBox(Panel, context.get());
context->editBox = EditBox->TextEdit; context->editBox = EditBox->TextEdit;
StartupLog("Arrange main sizers"); StartupLog("Arrange main sizers");

3
aegisub/src/frame_main.h
View file

@ -89,8 +89,6 @@ class FrameMain: public wxFrame {
/// isn't loaded /// isn't loaded
bool blockVideoLoad; bool blockVideoLoad;
wxPanel *Panel;
void InitToolbar(); void InitToolbar();
void InitContents(); void InitContents();
@ -120,7 +118,6 @@ class FrameMain: public wxFrame {
void OnSubtitlesOpen(); void OnSubtitlesOpen();
SubtitlesGrid *SubsGrid; ///< The subtitle editing area SubtitlesGrid *SubsGrid; ///< The subtitle editing area
SubsEditBox *EditBox; ///< The subtitle editing textbox
AudioBox *audioBox; ///< The audio area AudioBox *audioBox; ///< The audio area
VideoBox *videoBox; ///< The video area VideoBox *videoBox; ///< The video area