From 9b9482b96f844e25d0f6e0e1357a6eb5f5016a31 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 29 Sep 2011 04:38:15 +0000 Subject: [PATCH] Set the subs box's style and size correctly Originally committed to SVN as r5672. --- aegisub/src/scintilla_text_ctrl.cpp | 4 ++-- aegisub/src/scintilla_text_ctrl.h | 2 +- aegisub/src/subs_edit_ctrl.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aegisub/src/scintilla_text_ctrl.cpp b/aegisub/src/scintilla_text_ctrl.cpp index bd04f926f..a086fa5e8 100644 --- a/aegisub/src/scintilla_text_ctrl.cpp +++ b/aegisub/src/scintilla_text_ctrl.cpp @@ -39,8 +39,8 @@ #include "scintilla_text_ctrl.h" #include "utils.h" -ScintillaTextCtrl::ScintillaTextCtrl(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size) -: wxStyledTextCtrl(parent, id, pos, size, 0, value) +ScintillaTextCtrl::ScintillaTextCtrl(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style) +: wxStyledTextCtrl(parent, id, pos, size, style, value) { } diff --git a/aegisub/src/scintilla_text_ctrl.h b/aegisub/src/scintilla_text_ctrl.h index b37c4f87b..98159db21 100644 --- a/aegisub/src/scintilla_text_ctrl.h +++ b/aegisub/src/scintilla_text_ctrl.h @@ -55,5 +55,5 @@ public: void SetUnicodeStyling(int start,int length,int style); void SetSelectionU(int start,int end); - ScintillaTextCtrl(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize); + ScintillaTextCtrl(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0); }; diff --git a/aegisub/src/subs_edit_ctrl.cpp b/aegisub/src/subs_edit_ctrl.cpp index d0b0b0811..f8c39e59d 100644 --- a/aegisub/src/subs_edit_ctrl.cpp +++ b/aegisub/src/subs_edit_ctrl.cpp @@ -76,7 +76,7 @@ enum { }; SubsTextEditCtrl::SubsTextEditCtrl(wxWindow* parent, wxSize wsize, long style, SubtitlesGrid *grid) -: ScintillaTextCtrl(parent, wxID_ANY) +: ScintillaTextCtrl(parent, -1, "", wxDefaultPosition, wsize, style) , spellchecker(SpellCheckerFactory::GetSpellChecker()) , thesaurus(Thesaurus::GetThesaurus()) , grid(grid)