From 362e4c776b33909776180b9f4617aeb4967a112c Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 16 Jan 2011 07:17:17 +0000
Subject: [PATCH] Make a large chunk of FrameMain's members private

Originally committed to SVN as r5212.
---
 aegisub/src/base_grid.cpp |  9 +++++----
 aegisub/src/frame_main.h  | 22 ++++++++++------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index c66a8dfcf..ef60a51de 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -1167,11 +1167,12 @@ void BaseGrid::OnKeyDown(wxKeyEvent &event) {
 	// Left/right, forward to seek bar if video is loaded
 	if (key == WXK_LEFT || key == WXK_RIGHT) {
 		if (context->IsLoaded()) {
-			parentFrame->videoBox->videoSlider->SetFocus();
-			parentFrame->videoBox->videoSlider->GetEventHandler()->ProcessEvent(event);
-			return;
+			/// todo: is this nessesary, or can left/right just be in the Subtitle Grid category?
+			hotkey::check("Video", event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers());
+		}
+		else {
+			event.Skip();
 		}
-		event.Skip();
 		return;
 	}
 
diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h
index 14e3150cc..706d2b42c 100644
--- a/aegisub/src/frame_main.h
+++ b/aegisub/src/frame_main.h
@@ -137,6 +137,12 @@ private:
 	void InitContents();
 	void DeInitContents();
 
+	bool LoadList(wxArrayString list);
+	void UpdateTitle();
+
+	void InitMenu();
+
+	void SetUndoRedoDesc();
 
 	void OnKeyDown(wxKeyEvent &event);
 	void OnGridEvent (wxCommandEvent &event);
@@ -163,7 +169,6 @@ private:
 	void OnSubtitlesOpen();
 	void OnSubtitlesSave();
 
-public:
 
 	/// The subtitle editing area
 	SubtitlesGrid *SubsGrid;
@@ -189,20 +194,13 @@ public:
 	/// Arranges audio and editing areas top to bottom
 	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 SetUndoRedoDesc();
+	static void OpenHelp(wxString page=_T(""));
 	bool HasASSDraw();
 
 	DECLARE_EVENT_TABLE()
 };
-