Patch #826420, and also adapted to new SWIG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -136,11 +136,24 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxString& name) :
|
||||
wxControl(parent, id, pos, size,
|
||||
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
|
||||
wxDefaultValidator, name)
|
||||
const wxString& name)
|
||||
{
|
||||
m_swx = NULL;
|
||||
Create(parent, id, pos, size, style, name);
|
||||
}
|
||||
|
||||
|
||||
void wxStyledTextCtrl::Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxString& name)
|
||||
{
|
||||
wxControl::Create(parent, id, pos, size,
|
||||
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
|
||||
wxDefaultValidator, name);
|
||||
|
||||
#ifdef LINK_LEXERS
|
||||
Scintilla_LinkLexers();
|
||||
#endif
|
||||
@@ -2201,8 +2214,10 @@ void wxStyledTextCtrl::OnScroll(wxScrollEvent& evt) {
|
||||
}
|
||||
|
||||
void wxStyledTextCtrl::OnSize(wxSizeEvent& WXUNUSED(evt)) {
|
||||
wxSize sz = GetClientSize();
|
||||
m_swx->DoSize(sz.x, sz.y);
|
||||
if (m_swx) {
|
||||
wxSize sz = GetClientSize();
|
||||
m_swx->DoSize(sz.x, sz.y);
|
||||
}
|
||||
}
|
||||
|
||||
void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) {
|
||||
|
Reference in New Issue
Block a user