bug #463146

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py
index c0c68381ebb59ae64837f0eb57440e9defadcf17..91734e84b808b9dafb2f4a2c378e1ebf636cb365 100644 (file)
--- a/wxPython/src/__version__.py
+++ b/wxPython/src/__version__.py
@@ -1 +1 @@
-ver = '2.3.2b3'
+ver = '2.3.2b4'

diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index 8474a1fa0160fd845ca28685685b19788b3c6b94..ffcb6744b3d1644d7ed605df6654fc97d74b328c 100644 (file)
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -655,7 +655,7 @@ public:
 };
 
 
-class wxBrushList {
+class wxBrushList : public wxObject {
 public:
 
     void AddBrush(wxBrush *brush);
@@ -917,7 +917,7 @@ extern wxColour wxNullColour;
 
 extern wxFontList*       wxTheFontList;
 extern wxPenList*        wxThePenList;
-extern wxBrushlist*      wxTheBrushList;
+extern wxBrushList*      wxTheBrushList;
 extern wxColourDatabase* wxTheColourDatabase;
 
 

diff --git a/wxPython/src/msw/gdi.cpp b/wxPython/src/msw/gdi.cpp
index f509e9d0fe829b302cd825d942a3dfa2a1024e96..49fc9bf85277c62cc2e5fff7c8f3538458c2928f 100644 (file)
--- a/wxPython/src/msw/gdi.cpp
+++ b/wxPython/src/msw/gdi.cpp
@@ -236,7 +236,7 @@ extern wxFont  wxNullFont;
 extern wxColour  wxNullColour; 
 extern wxFontList * wxTheFontList; 
 extern wxPenList * wxThePenList; 
-extern wxBrushlist * wxTheBrushList; 
+extern wxBrushList * wxTheBrushList; 
 extern wxColourDatabase * wxTheColourDatabase; 
 
 #endif
@@ -1240,7 +1240,7 @@ static PyObject *_wrap_wxTheBrushList_get() {
     PyObject * pyobj;
     char ptemp[128];
 
-    SWIG_MakePtr(ptemp, (char *) wxTheBrushList,"_wxBrushlist_p");
+    SWIG_MakePtr(ptemp, (char *) wxTheBrushList,"_wxBrushList_p");
     pyobj = PyString_FromString(ptemp);
     return pyobj;
 }
@@ -6051,6 +6051,14 @@ static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args, PyObject
     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))
 static PyObject *_wrap_wxBrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -11824,6 +11832,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxObject","_wxScreenDC",SwigwxScreenDCTowxObject},
     { "_wxObject","_wxMemoryDC",SwigwxMemoryDCTowxObject},
     { "_wxObject","_wxDC",SwigwxDCTowxObject},
+    { "_wxObject","_wxBrushList",SwigwxBrushListTowxObject},
     { "_wxObject","_wxBrush",SwigwxBrushTowxObject},
     { "_wxObject","_wxPenList",SwigwxPenListTowxObject},
     { "_wxObject","_wxPen",SwigwxPenTowxObject},

diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py
index c1624dfe479d5b9c35646a527bb910cb5cfce050..7beaa6536167bb6996d3659f5b87d6732caac7c6 100644 (file)
--- a/wxPython/src/msw/gdi.py
+++ b/wxPython/src/msw/gdi.py
@@ -598,7 +598,7 @@ class wxBrush(wxBrushPtr):
 
 
 
-class wxBrushListPtr :
+class wxBrushListPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -1366,6 +1366,7 @@ wxNullFont = wxFontPtr(gdic.cvar.wxNullFont)
 wxNullColour = wxColourPtr(gdic.cvar.wxNullColour)
 wxTheFontList = wxFontListPtr(gdic.cvar.wxTheFontList)
 wxThePenList = wxPenListPtr(gdic.cvar.wxThePenList)
+wxTheBrushList = wxBrushListPtr(gdic.cvar.wxTheBrushList)
 wxTheColourDatabase = wxColourDatabasePtr(gdic.cvar.wxTheColourDatabase)
 wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL
 wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT