From 3c46ab72acdc78694464cc677676f509434c4ba9 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Wed, 24 Jan 2007 02:25:45 +0000
Subject: [PATCH] More Linux fixes.

Originally committed to SVN as r888.
---
 aegisub/ass_style.cpp     | 8 ++++----
 aegisub/subs_edit_box.cpp | 4 ++--
 aegisub/subs_edit_box.h   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/aegisub/ass_style.cpp b/aegisub/ass_style.cpp
index c73085b63..c505d3366 100644
--- a/aegisub/ass_style.cpp
+++ b/aegisub/ass_style.cpp
@@ -463,10 +463,10 @@ wxString AssStyle::GetSSAText() {
 	font.Replace(_T(","),_T(";"));
 
 	output = wxString::Format(_T("Style: %s,%s,%.0f,%s,%s,0,%s,%d,%d,%d,%.0f,%.0f,%d,%d,%d,%d,0,%i"),
-				  name, font, fontsize,
-				  primary.GetSSAFormatted(),
-				  secondary.GetSSAFormatted(),
-				  shadow.GetSSAFormatted(),
+				  name.c_str(), font.c_str(), fontsize,
+				  primary.GetSSAFormatted().c_str(),
+				  secondary.GetSSAFormatted().c_str(),
+				  shadow.GetSSAFormatted().c_str(),
 				  (bold? -1 : 0), (italic ? -1 : 0),
 				  borderstyle,outline_w,shadow_w,align,
 				  Margin[0],Margin[1],Margin[2],encoding);
diff --git a/aegisub/subs_edit_box.cpp b/aegisub/subs_edit_box.cpp
index 6ecfb1e4f..e49e3d386 100644
--- a/aegisub/subs_edit_box.cpp
+++ b/aegisub/subs_edit_box.cpp
@@ -810,13 +810,13 @@ BEGIN_EVENT_TABLE(SubsEditBoxEvent, wxEvtHandler)
 END_EVENT_TABLE()
 
 void SubsEditBoxEvent::OnKeyPress(wxKeyEvent &event) {
-	control->KeyPress(event);
+	control->DoKeyPress(event);
 }
 
 
 ///////////////////////
 // Actual text changed
-void SubsEditBox::KeyPress(wxKeyEvent &event) {
+void SubsEditBox::DoKeyPress(wxKeyEvent &event) {
 	int key = event.GetKeyCode();
 
 	if (key == WXK_RETURN || key == WXK_NUMPAD_ENTER) {
diff --git a/aegisub/subs_edit_box.h b/aegisub/subs_edit_box.h
index f9c21cdba..fd7d97ddb 100644
--- a/aegisub/subs_edit_box.h
+++ b/aegisub/subs_edit_box.h
@@ -155,7 +155,7 @@ public:
 	void UpdateGlobals();
 	void SetToLine(int n,bool weak=false);
 	void UpdateFrameTiming();
-	void KeyPress(wxKeyEvent &event);
+	void DoKeyPress(wxKeyEvent &event);
 
 	DECLARE_EVENT_TABLE()
 };