Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MOre wxSTC tweaks and a buffer overflow fix too.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-04-09 01:06:42 +00:00
parent 058eaf8285
commit fce40eebe3
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/src/stc/PlatWX.cpp
View File

@@ -603,8 +603,10 @@ Window::~Window() {
} }
void Window::Destroy() { void Window::Destroy() {
if (id) if (id) {
Show(FALSE);
GETWIN(id)->Destroy(); GETWIN(id)->Destroy();
}
id = 0; id = 0;
} }
@@ -736,7 +738,7 @@ public:
SetBackgroundColour(*wxBLUE); SetBackgroundColour(*wxBLUE);
lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize, lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER); wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER);
lv->SetCursor(wxCursor(wxCURSOR_ARROW)); lv->SetCursor(wxCursor(wxCURSOR_ARROW));
lv->InsertColumn(0, wxEmptyString); lv->InsertColumn(0, wxEmptyString);
lv->InsertColumn(1, wxEmptyString); lv->InsertColumn(1, wxEmptyString);
@@ -770,7 +772,7 @@ public:
wxSize sz = GetClientSize(); wxSize sz = GetClientSize();
lv->SetSize(1, 1, sz.x-2, sz.y-2); lv->SetSize(1, 1, sz.x-2, sz.y-2);
lv->SetColumnWidth(0, IconWidth()+4); lv->SetColumnWidth(0, IconWidth()+4);
lv->SetColumnWidth(1, sz.x - lv->GetColumnWidth(0) - lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) -
wxSystemSettings::GetMetric(wxSYS_VSCROLL_X)); wxSystemSettings::GetMetric(wxSYS_VSCROLL_X));
event.Skip(); event.Skip();
} }

4
contrib/src/stc/gen_iface.py
View File

@@ -191,7 +191,7 @@ methodOverrideMap = {
size_t len = strm.GetSize(); size_t len = strm.GetSize();
char* buff = new char[len+1]; char* buff = new char[len+1];
strm.CopyTo(buff, len); strm.CopyTo(buff, len);
buff[len+1] = 0; buff[len] = 0;
SendMsg(%s, markerNumber, (long)buff); SendMsg(%s, markerNumber, (long)buff);
delete [] buff; delete [] buff;
''', ''',
@@ -285,7 +285,7 @@ methodOverrideMap = {
size_t len = strm.GetSize(); size_t len = strm.GetSize();
char* buff = new char[len+1]; char* buff = new char[len+1];
strm.CopyTo(buff, len); strm.CopyTo(buff, len);
buff[len+1] = 0; buff[len] = 0;
SendMsg(%s, type, (long)buff); SendMsg(%s, type, (long)buff);
delete [] buff; delete [] buff;
''', ''',

4
contrib/src/stc/stc.cpp
View File

@@ -467,7 +467,7 @@ void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp)
size_t len = strm.GetSize(); size_t len = strm.GetSize();
char* buff = new char[len+1]; char* buff = new char[len+1];
strm.CopyTo(buff, len); strm.CopyTo(buff, len);
buff[len+1] = 0; buff[len] = 0;
SendMsg(2049, markerNumber, (long)buff); SendMsg(2049, markerNumber, (long)buff);
delete [] buff; delete [] buff;
@@ -845,7 +845,7 @@ void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
size_t len = strm.GetSize(); size_t len = strm.GetSize();
char* buff = new char[len+1]; char* buff = new char[len+1];
strm.CopyTo(buff, len); strm.CopyTo(buff, len);
buff[len+1] = 0; buff[len] = 0;
SendMsg(2405, type, (long)buff); SendMsg(2405, type, (long)buff);
delete [] buff; delete [] buff;