Another jab at fixing scintilla control border on posix. Also changed how it looks on Windows XP/Vista.
Originally committed to SVN as r2019.
This commit is contained in:
parent
722c1c6dc8
commit
ae67877863
2 changed files with 12 additions and 1 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue