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

Scintilla's Point class no longer matches the structure of wxPoint, so we need to copy points to a wxPoint array instead of just typcasting Scintilla's array. Fixes #14687

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-09-25 23:53:14 +00:00
parent 7be2a7af39
commit 48d63da328
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/stc/stctest.cpp
View File

@@ -330,6 +330,7 @@ AppFrame::AppFrame (const wxString &title)
m_edit->SetFocus(); m_edit->SetFocus();
FileOpen (wxT("stctest.cpp")); FileOpen (wxT("stctest.cpp"));
m_edit->SetSelection(0,0);
} }
AppFrame::~AppFrame () { AppFrame::~AppFrame () {

9
src/stc/PlatWX.cpp
View File

@@ -277,7 +277,14 @@ void SurfaceImpl::LineTo(int x_, int y_) {
void SurfaceImpl::Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back) { void SurfaceImpl::Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back) {
PenColour(fore); PenColour(fore);
BrushColour(back); BrushColour(back);
hdc->DrawPolygon(npts, (wxPoint*)pts); wxPoint *p = new wxPoint[npts];
for (int i=0; i<npts; i++) {
p[i].x = pts[i].x;
p[i].y = pts[i].y;
}
hdc->DrawPolygon(npts, p);
delete [] p;
} }
void SurfaceImpl::RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) { void SurfaceImpl::RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) {