From ae67877863cbfcfab2e4c69a32e83bf175e4ff70 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Tue, 11 Mar 2008 07:05:19 +0000
Subject: [PATCH] Another jab at fixing scintilla control border on posix. Also
 changed how it looks on Windows XP/Vista.

Originally committed to SVN as r2019.
---
 aegisub/scintilla_text_ctrl.cpp |  1 +
 aegisub/subs_edit_box.cpp       | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/aegisub/scintilla_text_ctrl.cpp b/aegisub/scintilla_text_ctrl.cpp
index a346477e7..33675fde9 100644
--- a/aegisub/scintilla_text_ctrl.cpp
+++ b/aegisub/scintilla_text_ctrl.cpp
@@ -45,6 +45,7 @@
 ScintillaTextCtrl::ScintillaTextCtrl(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name)
 : wxStyledTextCtrl(parent, id, pos, size, 0, value)
 {
+	SetWindowStyle(style);
 }
 
 
diff --git a/aegisub/subs_edit_box.cpp b/aegisub/subs_edit_box.cpp
index dfd3eb468..78a5a072f 100644
--- a/aegisub/subs_edit_box.cpp
+++ b/aegisub/subs_edit_box.cpp
@@ -183,7 +183,17 @@ SubsEditBox::SubsEditBox (wxWindow *parent,SubtitlesGrid *gridp) : wxPanel(paren
 	MiddleBotSizer->Add(ByFrame,0,wxRIGHT | wxALIGN_CENTER | wxEXPAND,5);
 
 	// Text editor
-	TextEdit = new SubsTextEditCtrl(this,EDIT_BOX,_T(""),wxDefaultPosition,wxSize(300,50),wxSUNKEN_BORDER);
+	int textStyle = 0;
+#if wxCHECK_VERSION(2,9,0)
+	textStyle = wxBORDER_SUNKEN;
+#else
+#ifdef _WIN32
+	textStyle = wxWindow::GetThemedBorderStyle();
+#else
+	textStyle = wxBORDER_SUNKEN;
+#endif
+#endif
+	TextEdit = new SubsTextEditCtrl(this,EDIT_BOX,_T(""),wxDefaultPosition,wxSize(300,50),textStyle);
 	TextEdit->PushEventHandler(new SubsEditBoxEvent(this));
 	TextEdit->control = this;
 	BottomSizer = new wxBoxSizer(wxHORIZONTAL);