mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Make a large chunk of FrameMain's members private

Browse source 
Originally committed to SVN as r5212.
This commit is contained in:
Thomas Goyne 2011-01-16 07:17:17 +00:00
parent d84b768171
commit 362e4c776b
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
aegisub/src/base_grid.cpp
View file

@ -1167,11 +1167,12 @@ void BaseGrid::OnKeyDown(wxKeyEvent &event) {
// Left/right, forward to seek bar if video is loaded // Left/right, forward to seek bar if video is loaded
if (key == WXK_LEFT || key == WXK_RIGHT) { if (key == WXK_LEFT || key == WXK_RIGHT) {
if (context->IsLoaded()) { if (context->IsLoaded()) {
parentFrame->videoBox->videoSlider->SetFocus(); /// todo: is this nessesary, or can left/right just be in the Subtitle Grid category?
parentFrame->videoBox->videoSlider->GetEventHandler()->ProcessEvent(event); hotkey::check("Video", event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers());
return;
} }
else {
event.Skip(); event.Skip();
}
return; return;
} }

22
aegisub/src/frame_main.h
View file

@ -137,6 +137,12 @@ private:
void InitContents(); void InitContents();
void DeInitContents(); void DeInitContents();
bool LoadList(wxArrayString list);
void UpdateTitle();
void InitMenu();
void SetUndoRedoDesc();
void OnKeyDown(wxKeyEvent &event); void OnKeyDown(wxKeyEvent &event);
void OnGridEvent (wxCommandEvent &event); void OnGridEvent (wxCommandEvent &event);
@ -163,7 +169,6 @@ private:
void OnSubtitlesOpen(); void OnSubtitlesOpen();
void OnSubtitlesSave(); void OnSubtitlesSave();
public:
/// The subtitle editing area /// The subtitle editing area
SubtitlesGrid *SubsGrid; SubtitlesGrid *SubsGrid;
@ -189,20 +194,13 @@ public:
/// Arranges audio and editing areas top to bottom /// Arranges audio and editing areas top to bottom
wxBoxSizer *ToolsSizer; wxBoxSizer *ToolsSizer;
public:
FrameMain(wxArrayString args);
~FrameMain();
FrameMain (wxArrayString args);
~FrameMain ();
bool LoadList(wxArrayString list);
static void OpenHelp(wxString page=_T(""));
void UpdateTitle();
void InitMenu();
void UpdateToolbar(); void UpdateToolbar();
static void OpenHelp(wxString page=_T(""));
void SetUndoRedoDesc();
bool HasASSDraw(); bool HasASSDraw();
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };