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

Lots of bup fixes, API updates, etc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-11-21 07:39:05 +00:00
parent fbd5dd1dfa
commit 7722248d75
36 changed files with 462 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
wxPython/src/drawlist.cpp
View File

@@ -17,18 +17,21 @@
#include "wx/wxPython/pydrawxxx.h"
//----------------------------------------------------------------------
//---------------------------------------------------------------------------
// Called from _gdiinit so we can do the API import while the GIL is held
void wxPyDrawList_SetAPIPtr()
{
wxPyCoreAPI_IMPORT();
}
PyObject* wxPyDrawXXXList(wxDC& dc, wxPyDrawListOp_t doDraw,
PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes) {
PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
{
wxPyBeginBlockThreads();
if ( !wxPyCoreAPIPtr)
wxPyCoreAPI_IMPORT();
bool isFastSeq = PyList_Check(pyCoords) || PyTuple_Check(pyCoords);
bool isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens);
bool isFastBrushes = PyList_Check(pyBrushes) || PyTuple_Check(pyBrushes);
@@ -141,7 +144,8 @@ PyObject* wxPyDrawXXXList(wxDC& dc, wxPyDrawListOp_t doDraw,
bool wxPyDrawXXXPoint(wxDC& dc, PyObject* coords) {
bool wxPyDrawXXXPoint(wxDC& dc, PyObject* coords)
{
int x, y;
if (! wxPy2int_seq_helper(coords, &x, &y)) {
@@ -152,7 +156,8 @@ bool wxPyDrawXXXPoint(wxDC& dc, PyObject* coords) {
return True;
}
bool wxPyDrawXXXLine(wxDC& dc, PyObject* coords) {
bool wxPyDrawXXXLine(wxDC& dc, PyObject* coords)
{
int x1, y1, x2, y2;
if (! wxPy4int_seq_helper(coords, &x1, &y1, &x2, &y2)) {
@@ -163,7 +168,8 @@ bool wxPyDrawXXXLine(wxDC& dc, PyObject* coords) {
return True;
}
bool wxPyDrawXXXRectangle(wxDC& dc, PyObject* coords) {
bool wxPyDrawXXXRectangle(wxDC& dc, PyObject* coords)
{
int x, y, w, h;
if (! wxPy4int_seq_helper(coords, &x, &y, &w, &h)) {
@@ -174,7 +180,8 @@ bool wxPyDrawXXXRectangle(wxDC& dc, PyObject* coords) {
return True;
}
bool wxPyDrawXXXEllipse(wxDC& dc, PyObject* coords) {
bool wxPyDrawXXXEllipse(wxDC& dc, PyObject* coords)
{
int x, y, w, h;
if (! wxPy4int_seq_helper(coords, &x, &y, &w, &h)) {
@@ -186,7 +193,8 @@ bool wxPyDrawXXXEllipse(wxDC& dc, PyObject* coords) {
}
bool wxPyDrawXXXPolygon(wxDC& dc, PyObject* coords) {
bool wxPyDrawXXXPolygon(wxDC& dc, PyObject* coords)
{
wxPoint* points;
int numPoints;
@@ -200,16 +208,14 @@ bool wxPyDrawXXXPolygon(wxDC& dc, PyObject* coords) {
}
//----------------------------------------------------------------------
//---------------------------------------------------------------------------
PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyObject* foregroundList, PyObject* backgroundList) {
PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyObject* foregroundList, PyObject* backgroundList)
{
wxPyBeginBlockThreads();
if ( !wxPyCoreAPIPtr)
wxPyCoreAPI_IMPORT();
bool isFastSeq = PyList_Check(pyPoints) || PyTuple_Check(pyPoints);
bool isFastText = PyList_Check(textList) || PyTuple_Check(textList);
bool isFastForeground = PyList_Check(foregroundList) || PyTuple_Check(foregroundList);
@@ -353,4 +359,4 @@ PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyO
//----------------------------------------------------------------------
//---------------------------------------------------------------------------