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

bug #463146

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-09-20 16:32:33 +00:00
parent b9f2926155
commit 6ee2116be1
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/src/__version__.py
View File

@@ -1 +1 @@
ver = '2.3.2b3' ver = '2.3.2b4'

4
wxPython/src/gdi.i
View File

@@ -655,7 +655,7 @@ public:
}; };
class wxBrushList { class wxBrushList : public wxObject {
public: public:
void AddBrush(wxBrush *brush); void AddBrush(wxBrush *brush);
@@ -917,7 +917,7 @@ extern wxColour wxNullColour;
extern wxFontList* wxTheFontList; extern wxFontList* wxTheFontList;
extern wxPenList* wxThePenList; extern wxPenList* wxThePenList;
extern wxBrushlist* wxTheBrushList; extern wxBrushList* wxTheBrushList;
extern wxColourDatabase* wxTheColourDatabase; extern wxColourDatabase* wxTheColourDatabase;

13
wxPython/src/msw/gdi.cpp
View File

@@ -236,7 +236,7 @@ extern wxFont wxNullFont;
extern wxColour wxNullColour; extern wxColour wxNullColour;
extern wxFontList * wxTheFontList; extern wxFontList * wxTheFontList;
extern wxPenList * wxThePenList; extern wxPenList * wxThePenList;
extern wxBrushlist * wxTheBrushList; extern wxBrushList * wxTheBrushList;
extern wxColourDatabase * wxTheColourDatabase; extern wxColourDatabase * wxTheColourDatabase;
#endif #endif
@@ -1240,7 +1240,7 @@ static PyObject *_wrap_wxTheBrushList_get() {
PyObject * pyobj; PyObject * pyobj;
char ptemp[128]; char ptemp[128];
SWIG_MakePtr(ptemp, (char *) wxTheBrushList,"_wxBrushlist_p"); SWIG_MakePtr(ptemp, (char *) wxTheBrushList,"_wxBrushList_p");
pyobj = PyString_FromString(ptemp); pyobj = PyString_FromString(ptemp);
return pyobj; return pyobj;
} }
@@ -6051,6 +6051,14 @@ static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args, PyObject
return _resultobj; return _resultobj;
} }
static void *SwigwxBrushListTowxObject(void *ptr) {
wxBrushList *src;
wxObject *dest;
src = (wxBrushList *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxBrushList_AddBrush(_swigobj,_swigarg0) (_swigobj->AddBrush(_swigarg0)) #define wxBrushList_AddBrush(_swigobj,_swigarg0) (_swigobj->AddBrush(_swigarg0))
static PyObject *_wrap_wxBrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxBrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
@@ -11824,6 +11832,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxScreenDC",SwigwxScreenDCTowxObject}, { "_wxObject","_wxScreenDC",SwigwxScreenDCTowxObject},
{ "_wxObject","_wxMemoryDC",SwigwxMemoryDCTowxObject}, { "_wxObject","_wxMemoryDC",SwigwxMemoryDCTowxObject},
{ "_wxObject","_wxDC",SwigwxDCTowxObject}, { "_wxObject","_wxDC",SwigwxDCTowxObject},
{ "_wxObject","_wxBrushList",SwigwxBrushListTowxObject},
{ "_wxObject","_wxBrush",SwigwxBrushTowxObject}, { "_wxObject","_wxBrush",SwigwxBrushTowxObject},
{ "_wxObject","_wxPenList",SwigwxPenListTowxObject}, { "_wxObject","_wxPenList",SwigwxPenListTowxObject},
{ "_wxObject","_wxPen",SwigwxPenTowxObject}, { "_wxObject","_wxPen",SwigwxPenTowxObject},

3
wxPython/src/msw/gdi.py
View File

@@ -598,7 +598,7 @@ class wxBrush(wxBrushPtr):
class wxBrushListPtr : class wxBrushListPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
@@ -1366,6 +1366,7 @@ wxNullFont = wxFontPtr(gdic.cvar.wxNullFont)
wxNullColour = wxColourPtr(gdic.cvar.wxNullColour) wxNullColour = wxColourPtr(gdic.cvar.wxNullColour)
wxTheFontList = wxFontListPtr(gdic.cvar.wxTheFontList) wxTheFontList = wxFontListPtr(gdic.cvar.wxTheFontList)
wxThePenList = wxPenListPtr(gdic.cvar.wxThePenList) wxThePenList = wxPenListPtr(gdic.cvar.wxThePenList)
wxTheBrushList = wxBrushListPtr(gdic.cvar.wxTheBrushList)
wxTheColourDatabase = wxColourDatabasePtr(gdic.cvar.wxTheColourDatabase) wxTheColourDatabase = wxColourDatabasePtr(gdic.cvar.wxTheColourDatabase)
wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL
wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT