wxPython version 2.0b5

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

utils/wxPython/.cvsignore

@@ -1,3 +1,4 @@
+docs
 *.zip
 .cvsignore
 .emacs.desktop

utils/wxPython/README.txt

@@ -82,7 +82,6 @@ Added wxImageList, wxToolTip.
 Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
 wxRegConfig class.
 
-
 As usual, some bug fixes, tweaks, etc.
 
 
@@ -187,11 +186,11 @@ there, make sure wxUSE_OWNER_DRAWN is also set to 1.
 
 2. Change into the $(WXWIN)/utils/wxPython/src directory.
 
-3. Edit makefile.nt and specify where your python installation is at.
+3. Edit makefile.vc and specify where your python installation is at.
 You may also want to fiddle with the TARGETDIR variable as described
 above.
 
-4. Run nmake -f makefile.nt
+4. Run nmake -f makefile.vc
 
 5. If it builds successfully, congratulations!  Move on to the next
 step.  If not then you can try mailing me for help.  Also, I will

utils/wxPython/distrib/wxPython.wse

@@ -760,21 +760,21 @@ item: Custom Dialog Set
       Variable=COMPONENTS
       Create Flags=01010000101000010000000101010001
       Flags=0000010001000111
-      Text=wxPython package
+      Text=wxPython package  (you need this one!)
       Text=wxPython documentation
       Text=
-      Text French=wxPython package
+      Text French=wxPython package  (you need this one!)
       Text French=wxPython documentation
       Text French=
-      Text German=wxPython package
+      Text German=wxPython package  (you need this one!)
       Text German=wxPython documentation
       Text German=
       Text Portuguese=%1%
       Text Portuguese=
-      Text Spanish=wxPython package
+      Text Spanish=wxPython package  (you need this one!)
       Text Spanish=wxPython documentation
       Text Spanish=
-      Text Italian=wxPython package
+      Text Italian=wxPython package  (you need this one!)
       Text Italian=wxPython documentation
       Text Italian=
       Text Danish=%1%

utils/wxPython/distrib/zipit.bat

@@ -4,3 +4,12 @@
 
 zip -@ -r wxPython\wxPython-src-%1.zip < wxPython\distrib\wxPython.rsp
 
+mkdir wxPython\docs
+copy %WXWIN%\docs\html\wx\*.* wxPython\docs
+copy wxPython\docs\wx.htm wxPython\docs\index.htm
+
+zip -r wxPython\wxPython-docs-%1.zip wxPython\docs
+
+del /y wxPython\docs\*.*
+
+move /R wxPython\*.zip wxPython\distrib

utils/wxPython/src/controls.i

@@ -404,19 +404,19 @@ public:
 
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
-    %name(EnableBox)void Enable(bool enable);
+    void Enable(bool enable);
-    void Enable(int n, bool enable);
+    %name(EnableItem)void Enable(int n, bool enable);
     int FindString(const wxString& string);
 #ifdef __WXMSW__
-    %name(GetBoxLabel)wxString GetLabel();
+    wxString GetLabel();
 #endif
-    wxString GetLabel(int n);
+    %name(GetItemLabel)wxString GetLabel(int n);
     int GetSelection();
     wxString GetString(int n);
     wxString GetStringSelection();
     int Number();
-    %name(SetBoxLabel)void SetLabel(const wxString& label);
+    void SetLabel(const wxString& label);
-    void SetLabel(int n, const wxString& label);
+    %name(SetItemLabel)void SetLabel(int n, const wxString& label);
     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
     void Show(bool show);
@@ -483,7 +483,11 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.11  1999/02/25 07:08:30  RD
+// wxPython version 2.0b5
+//
 // Revision 1.10  1998/12/17 17:52:19  RD
+//
 // wxPython 0.5.2
 // Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
 // versions are much closer now!

utils/wxPython/src/controls2.i

@@ -155,8 +155,9 @@ public:
     long GetItemData(long item);
 
     %addmethods {
-        %new wxListItem* GetItem() {
+        %new wxListItem* GetItem(long itemId) {
             wxListItem* info = new wxListItem;
+            info->m_itemId = itemId;
             self->GetItem(*info);
             return info;
         }
@@ -186,7 +187,7 @@ public:
 #endif
     long GetTopItem();
     long HitTest(const wxPoint& point, int& OUTPUT);
-    %name(InsertColumnWithInfo)long InsertColumn(long col, wxListItem& info);
+    %name(InsertColumnWith)long InsertColumn(long col, wxListItem& info);
     long InsertColumn(long col, const wxString& heading,
                       int format = wxLIST_FORMAT_LEFT,
                       int width = -1);
@@ -228,9 +229,6 @@ public:
     ~wxTreeItemId();
     bool IsOk() const { return m_itemId != 0; }
 
-//    %addmethods {
-//        long GetId() { return (long)(*self); }
-//    }
 };
 
 
@@ -419,6 +417,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.16  1999/02/25 07:08:32  RD
+// wxPython version 2.0b5
+//
 // Revision 1.15  1999/02/20 09:02:56  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,

utils/wxPython/src/makefile.vc

@@ -45,10 +45,10 @@ THISDIR=$(WXDIR)\utils\wxPython
 EXTRALIBS=$(PYTHONDIR)\libs\python15.lib
 EXTRAINC=-I$(PYTHONDIR)\include -I.
 EXTRAFLAGS=/Fpwxp.pch /YXhelpers.h -DSWIG_GLOBAL -DHAVE_CONFIG_H
-OVERRIDEFLAGS=/GX- /DwxUSE_GLOBAL_MEMORY_OPERATORS=0
+OVERRIDEFLAGS=/GX- /DwxUSE_GLOBAL_MEMORY_OPERATORS=0 $(OTHERCFLAGS)
 
 
-SWIGFLAGS=-c++ -shadow -python -dnone -D__WXMSW__
+SWIGFLAGS=-c++ -shadow -python -dnone -D__WXMSW__ $(OTHERSWIGFLAGS)
 GENCODEDIR=msw
 
 
@@ -66,6 +66,8 @@ OBJECTS = wx.obj         helpers.obj    windows.obj    events.obj     \
 	  utils.obj
 !else
 
+OTHERCFLAGS=-DSEPARATE=1
+OTHERSWIGFLAGS=-DSEPARATE
 TARGET2 = utilsc
 OBJECTS2 = utils.obj
 target2=$(TARGETDIR)\$(TARGET2).pyd
@@ -274,6 +276,9 @@ dist:
 #------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.3  1999/02/25 07:08:33  RD
+# wxPython version 2.0b5
+#
 # Revision 1.2  1999/02/20 09:03:00  RD
 # Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 # window handle.  If you can get the window handle into the python code,

utils/wxPython/src/mdi.i

@@ -48,7 +48,6 @@ public:
     void ActivatePrevious();
     void ArrangeIcons();
     void Cascade();
-    void GetClientSize(int* OUTPUT, int* OUTPUT);
     wxMDIChildFrame* GetActiveChild();
     wxMDIClientWindow* GetClientWindow();
     wxWindow* GetToolBar();
@@ -80,10 +79,6 @@ public:
     void Maximize();
     void Restore();
 
-    void SetMenuBar(wxMenuBar *menu_bar);
-    void SetClientSize(int width, int height);
-    void GetPosition(int* OUTPUT, int* OUTPUT) const ;
-
 };
 
 
@@ -100,6 +95,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.6  1999/02/25 07:08:34  RD
+// wxPython version 2.0b5
+//
 // Revision 1.5  1998/12/15 20:41:21  RD
 // Changed the import semantics from "from wxPython import *" to "from
 // wxPython.wx import *"  This is for people who are worried about

utils/wxPython/src/misc.i

@@ -388,9 +388,7 @@ public:
 
     void SetTip(const wxString& tip);
     wxString GetTip();
-#ifndef __WXGTK__
+    // *** Not in the "public" interface void SetWindow(wxWindow *win);
-    void SetWindow(wxWindow *win);
-#endif
     wxWindow *GetWindow();
 };
 
@@ -409,7 +407,11 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.13  1999/02/25 07:08:34  RD
+// wxPython version 2.0b5
+//
 // Revision 1.12  1999/02/20 10:02:37  RD
+//
 // Changes needed to enable wxGTK compatibility.
 //
 // Revision 1.11  1999/02/20 09:03:01  RD

utils/wxPython/src/msw/controls.cpp

@@ -4244,8 +4244,8 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxRadioBox_EnableBox(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
+#define wxRadioBox_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
-static PyObject *_wrap_wxRadioBox_EnableBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     bool  _arg1;
@@ -4253,23 +4253,23 @@ static PyObject *_wrap_wxRadioBox_EnableBox(PyObject *self, PyObject *args) {
     int tempbool1;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxRadioBox_EnableBox",&_argc0,&tempbool1)) 
+    if(!PyArg_ParseTuple(args,"si:wxRadioBox_Enable",&_argc0,&tempbool1)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_EnableBox. Expected _wxRadioBox_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_Enable. Expected _wxRadioBox_p.");
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
-    wxRadioBox_EnableBox(_arg0,_arg1);
+    wxRadioBox_Enable(_arg0,_arg1);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
 
-#define wxRadioBox_Enable(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))
+#define wxRadioBox_EnableItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_EnableItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
@@ -4278,16 +4278,16 @@ static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args) {
     int tempbool2;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sii:wxRadioBox_Enable",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"sii:wxRadioBox_EnableItem",&_argc0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_Enable. Expected _wxRadioBox_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_EnableItem. Expected _wxRadioBox_p.");
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;
-    wxRadioBox_Enable(_arg0,_arg1,_arg2);
+    wxRadioBox_EnableItem(_arg0,_arg1,_arg2);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
@@ -4327,23 +4327,23 @@ static PyObject *_wrap_wxRadioBox_FindString(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxRadioBox_GetBoxLabel(_swigobj)  (_swigobj->GetLabel())
+#define wxRadioBox_GetLabel(_swigobj)  (_swigobj->GetLabel())
-static PyObject *_wrap_wxRadioBox_GetBoxLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_GetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;
     char * _argc0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxRadioBox_GetBoxLabel",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxRadioBox_GetLabel",&_argc0)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetBoxLabel. Expected _wxRadioBox_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetLabel. Expected _wxRadioBox_p.");
         return NULL;
         }
     }
-    _result = new wxString (wxRadioBox_GetBoxLabel(_arg0));
+    _result = new wxString (wxRadioBox_GetLabel(_arg0));
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
@@ -4353,8 +4353,8 @@ static PyObject *_wrap_wxRadioBox_GetBoxLabel(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxRadioBox_GetLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))
+#define wxRadioBox_GetItemLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))
-static PyObject *_wrap_wxRadioBox_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;
@@ -4362,15 +4362,15 @@ static PyObject *_wrap_wxRadioBox_GetLabel(PyObject *self, PyObject *args) {
     char * _argc0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxRadioBox_GetLabel",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"si:wxRadioBox_GetItemLabel",&_argc0,&_arg1)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetLabel. Expected _wxRadioBox_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetItemLabel. Expected _wxRadioBox_p.");
         return NULL;
         }
     }
-    _result = new wxString (wxRadioBox_GetLabel(_arg0,_arg1));
+    _result = new wxString (wxRadioBox_GetItemLabel(_arg0,_arg1));
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
@@ -4475,8 +4475,8 @@ static PyObject *_wrap_wxRadioBox_Number(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxRadioBox_SetBoxLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
+#define wxRadioBox_SetLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
-static PyObject *_wrap_wxRadioBox_SetBoxLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_SetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     wxString * _arg1;
@@ -4484,11 +4484,11 @@ static PyObject *_wrap_wxRadioBox_SetBoxLabel(PyObject *self, PyObject *args) {
     PyObject * _obj1 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxRadioBox_SetBoxLabel",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"sO:wxRadioBox_SetLabel",&_argc0,&_obj1)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetBoxLabel. Expected _wxRadioBox_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetLabel. Expected _wxRadioBox_p.");
         return NULL;
         }
     }
@@ -4499,7 +4499,7 @@ static PyObject *_wrap_wxRadioBox_SetBoxLabel(PyObject *self, PyObject *args) {
     }
     _arg1 = new wxString(PyString_AsString(_obj1));
 }
-    wxRadioBox_SetBoxLabel(_arg0,*_arg1);
+    wxRadioBox_SetLabel(_arg0,*_arg1);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
@@ -4509,8 +4509,8 @@ static PyObject *_wrap_wxRadioBox_SetBoxLabel(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxRadioBox_SetLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))
+#define wxRadioBox_SetItemLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxRadioBox_SetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_SetItemLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
@@ -4519,11 +4519,11 @@ static PyObject *_wrap_wxRadioBox_SetLabel(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"siO:wxRadioBox_SetLabel",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"siO:wxRadioBox_SetItemLabel",&_argc0,&_arg1,&_obj2)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetLabel. Expected _wxRadioBox_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetItemLabel. Expected _wxRadioBox_p.");
         return NULL;
         }
     }
@@ -4534,7 +4534,7 @@ static PyObject *_wrap_wxRadioBox_SetLabel(PyObject *self, PyObject *args) {
     }
     _arg2 = new wxString(PyString_AsString(_obj2));
 }
-    wxRadioBox_SetLabel(_arg0,_arg1,*_arg2);
+    wxRadioBox_SetItemLabel(_arg0,_arg1,*_arg2);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
@@ -5296,17 +5296,17 @@ static PyMethodDef controlscMethods[] = {
 	 { "wxRadioBox_Show", _wrap_wxRadioBox_Show, 1 },
 	 { "wxRadioBox_SetStringSelection", _wrap_wxRadioBox_SetStringSelection, 1 },
 	 { "wxRadioBox_SetSelection", _wrap_wxRadioBox_SetSelection, 1 },
+	 { "wxRadioBox_SetItemLabel", _wrap_wxRadioBox_SetItemLabel, 1 },
 	 { "wxRadioBox_SetLabel", _wrap_wxRadioBox_SetLabel, 1 },
-	 { "wxRadioBox_SetBoxLabel", _wrap_wxRadioBox_SetBoxLabel, 1 },
 	 { "wxRadioBox_Number", _wrap_wxRadioBox_Number, 1 },
 	 { "wxRadioBox_GetStringSelection", _wrap_wxRadioBox_GetStringSelection, 1 },
 	 { "wxRadioBox_GetString", _wrap_wxRadioBox_GetString, 1 },
 	 { "wxRadioBox_GetSelection", _wrap_wxRadioBox_GetSelection, 1 },
+	 { "wxRadioBox_GetItemLabel", _wrap_wxRadioBox_GetItemLabel, 1 },
 	 { "wxRadioBox_GetLabel", _wrap_wxRadioBox_GetLabel, 1 },
-	 { "wxRadioBox_GetBoxLabel", _wrap_wxRadioBox_GetBoxLabel, 1 },
 	 { "wxRadioBox_FindString", _wrap_wxRadioBox_FindString, 1 },
+	 { "wxRadioBox_EnableItem", _wrap_wxRadioBox_EnableItem, 1 },
 	 { "wxRadioBox_Enable", _wrap_wxRadioBox_Enable, 1 },
-	 { "wxRadioBox_EnableBox", _wrap_wxRadioBox_EnableBox, 1 },
 	 { "new_wxRadioBox", _wrap_new_wxRadioBox, 1 },
 	 { "wxStaticBitmap_SetBitmap", _wrap_wxStaticBitmap_SetBitmap, 1 },
 	 { "wxStaticBitmap_GetBitmap", _wrap_wxStaticBitmap_GetBitmap, 1 },

utils/wxPython/src/msw/controls.py

@@ -662,20 +662,20 @@ class wxRadioBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def EnableBox(self,arg0):
+    def Enable(self,arg0):
-        val = controlsc.wxRadioBox_EnableBox(self.this,arg0)
+        val = controlsc.wxRadioBox_Enable(self.this,arg0)
         return val
-    def Enable(self,arg0,arg1):
+    def EnableItem(self,arg0,arg1):
-        val = controlsc.wxRadioBox_Enable(self.this,arg0,arg1)
+        val = controlsc.wxRadioBox_EnableItem(self.this,arg0,arg1)
         return val
     def FindString(self,arg0):
         val = controlsc.wxRadioBox_FindString(self.this,arg0)
         return val
-    def GetBoxLabel(self):
+    def GetLabel(self):
-        val = controlsc.wxRadioBox_GetBoxLabel(self.this)
+        val = controlsc.wxRadioBox_GetLabel(self.this)
         return val
-    def GetLabel(self,arg0):
+    def GetItemLabel(self,arg0):
-        val = controlsc.wxRadioBox_GetLabel(self.this,arg0)
+        val = controlsc.wxRadioBox_GetItemLabel(self.this,arg0)
         return val
     def GetSelection(self):
         val = controlsc.wxRadioBox_GetSelection(self.this)
@@ -689,11 +689,11 @@ class wxRadioBoxPtr(wxControlPtr):
     def Number(self):
         val = controlsc.wxRadioBox_Number(self.this)
         return val
-    def SetBoxLabel(self,arg0):
+    def SetLabel(self,arg0):
-        val = controlsc.wxRadioBox_SetBoxLabel(self.this,arg0)
+        val = controlsc.wxRadioBox_SetLabel(self.this,arg0)
         return val
-    def SetLabel(self,arg0,arg1):
+    def SetItemLabel(self,arg0,arg1):
-        val = controlsc.wxRadioBox_SetLabel(self.this,arg0,arg1)
+        val = controlsc.wxRadioBox_SetItemLabel(self.this,arg0,arg1)
         return val
     def SetSelection(self,arg0):
         val = controlsc.wxRadioBox_SetSelection(self.this,arg0)

utils/wxPython/src/msw/controls2.cpp

@@ -1447,8 +1447,9 @@ static PyObject *_wrap_wxListCtrl_GetItemData(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static wxListItem * wxListCtrl_GetItem(wxListCtrl *self) {
+static wxListItem * wxListCtrl_GetItem(wxListCtrl *self,long  itemId) {
             wxListItem* info = new wxListItem;
+            info->m_itemId = itemId;
             self->GetItem(*info);
             return info;
         }
@@ -1456,11 +1457,12 @@ static PyObject *_wrap_wxListCtrl_GetItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxListItem * _result;
     wxListCtrl * _arg0;
+    long  _arg1;
     char * _argc0 = 0;
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxListCtrl_GetItem",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"sl:wxListCtrl_GetItem",&_argc0,&_arg1)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
@@ -1468,7 +1470,7 @@ static PyObject *_wrap_wxListCtrl_GetItem(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (wxListItem *)wxListCtrl_GetItem(_arg0);
+    _result = (wxListItem *)wxListCtrl_GetItem(_arg0,_arg1);
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
@@ -1783,8 +1785,8 @@ static PyObject *_wrap_wxListCtrl_HitTest(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxListCtrl_InsertColumnWithInfo(_swigobj,_swigarg0,_swigarg1)  (_swigobj->InsertColumn(_swigarg0,_swigarg1))
+#define wxListCtrl_InsertColumnWith(_swigobj,_swigarg0,_swigarg1)  (_swigobj->InsertColumn(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_InsertColumnWithInfo(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_InsertColumnWith(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -1794,21 +1796,21 @@ static PyObject *_wrap_wxListCtrl_InsertColumnWithInfo(PyObject *self, PyObject
     char * _argc2 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"sls:wxListCtrl_InsertColumnWithInfo",&_argc0,&_arg1,&_argc2)) 
+    if(!PyArg_ParseTuple(args,"sls:wxListCtrl_InsertColumnWith",&_argc0,&_arg1,&_argc2)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertColumnWithInfo. Expected _wxListCtrl_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_InsertColumnWith. Expected _wxListCtrl_p.");
         return NULL;
         }
     }
     if (_argc2) {
         if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxListItem_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_InsertColumnWithInfo. Expected _wxListItem_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_InsertColumnWith. Expected _wxListItem_p.");
         return NULL;
         }
     }
-    _result = (long )wxListCtrl_InsertColumnWithInfo(_arg0,_arg1,*_arg2);
+    _result = (long )wxListCtrl_InsertColumnWith(_arg0,_arg1,*_arg2);
     _resultobj = Py_BuildValue("l",_result);
     return _resultobj;
 }
@@ -4375,7 +4377,7 @@ static PyMethodDef controls2cMethods[] = {
 	 { "wxListCtrl_InsertStringItem", _wrap_wxListCtrl_InsertStringItem, 1 },
 	 { "wxListCtrl_InsertItem", _wrap_wxListCtrl_InsertItem, 1 },
 	 { "wxListCtrl_InsertColumn", _wrap_wxListCtrl_InsertColumn, 1 },
-	 { "wxListCtrl_InsertColumnWithInfo", _wrap_wxListCtrl_InsertColumnWithInfo, 1 },
+	 { "wxListCtrl_InsertColumnWith", _wrap_wxListCtrl_InsertColumnWith, 1 },
 	 { "wxListCtrl_HitTest", _wrap_wxListCtrl_HitTest, 1 },
 	 { "wxListCtrl_GetTopItem", _wrap_wxListCtrl_GetTopItem, 1 },
 	 { "wxListCtrl_SetTextColour", _wrap_wxListCtrl_SetTextColour, 1 },

utils/wxPython/src/msw/controls2.py

@@ -195,8 +195,8 @@ class wxListCtrlPtr(wxControlPtr):
     def GetItemData(self,arg0):
         val = controls2c.wxListCtrl_GetItemData(self.this,arg0)
         return val
-    def GetItem(self):
+    def GetItem(self,arg0):
-        val = controls2c.wxListCtrl_GetItem(self.this)
+        val = controls2c.wxListCtrl_GetItem(self.this,arg0)
         val = wxListItemPtr(val)
         val.thisown = 1
         return val
@@ -242,8 +242,8 @@ class wxListCtrlPtr(wxControlPtr):
     def HitTest(self,arg0):
         val = controls2c.wxListCtrl_HitTest(self.this,arg0.this)
         return val
-    def InsertColumnWithInfo(self,arg0,arg1):
+    def InsertColumnWith(self,arg0,arg1):
-        val = controls2c.wxListCtrl_InsertColumnWithInfo(self.this,arg0,arg1.this)
+        val = controls2c.wxListCtrl_InsertColumnWith(self.this,arg0,arg1.this)
         return val
     def InsertColumn(self,arg0,arg1,*args):
         val = apply(controls2c.wxListCtrl_InsertColumn,(self.this,arg0,arg1,)+args)

utils/wxPython/src/msw/mdi.cpp

@@ -276,47 +276,6 @@ static PyObject *_wrap_wxMDIParentFrame_Cascade(PyObject *self, PyObject *args)
     return _resultobj;
 }
 
-#define wxMDIParentFrame_GetClientSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetClientSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMDIParentFrame_GetClientSize(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxMDIParentFrame * _arg0;
-    int * _arg1;
-    int  temp;
-    int * _arg2;
-    int  temp0;
-    char * _argc0 = 0;
-
-    self = self;
-{
-  _arg1 = &temp;
-}
-{
-  _arg2 = &temp0;
-}
-    if(!PyArg_ParseTuple(args,"s:wxMDIParentFrame_GetClientSize",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_GetClientSize. Expected _wxMDIParentFrame_p.");
-        return NULL;
-        }
-    }
-    wxMDIParentFrame_GetClientSize(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    PyObject *o;
-    o = PyInt_FromLong((long) (*_arg1));
-    _resultobj = t_output_helper(_resultobj, o);
-}
-{
-    PyObject *o;
-    o = PyInt_FromLong((long) (*_arg2));
-    _resultobj = t_output_helper(_resultobj, o);
-}
-    return _resultobj;
-}
-
 #define wxMDIParentFrame_GetActiveChild(_swigobj)  (_swigobj->GetActiveChild())
 static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -578,99 +537,6 @@ static PyObject *_wrap_wxMDIChildFrame_Restore(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxMDIChildFrame_SetMenuBar(_swigobj,_swigarg0)  (_swigobj->SetMenuBar(_swigarg0))
-static PyObject *_wrap_wxMDIChildFrame_SetMenuBar(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxMDIChildFrame * _arg0;
-    wxMenuBar * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxMDIChildFrame_SetMenuBar",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_SetMenuBar. Expected _wxMDIChildFrame_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenuBar_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMDIChildFrame_SetMenuBar. Expected _wxMenuBar_p.");
-        return NULL;
-        }
-    }
-    wxMDIChildFrame_SetMenuBar(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxMDIChildFrame_SetClientSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetClientSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMDIChildFrame_SetClientSize(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxMDIChildFrame * _arg0;
-    int  _arg1;
-    int  _arg2;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"sii:wxMDIChildFrame_SetClientSize",&_argc0,&_arg1,&_arg2)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_SetClientSize. Expected _wxMDIChildFrame_p.");
-        return NULL;
-        }
-    }
-    wxMDIChildFrame_SetClientSize(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxMDIChildFrame_GetPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetPosition(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMDIChildFrame_GetPosition(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxMDIChildFrame * _arg0;
-    int * _arg1;
-    int  temp;
-    int * _arg2;
-    int  temp0;
-    char * _argc0 = 0;
-
-    self = self;
-{
-  _arg1 = &temp;
-}
-{
-  _arg2 = &temp0;
-}
-    if(!PyArg_ParseTuple(args,"s:wxMDIChildFrame_GetPosition",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_GetPosition. Expected _wxMDIChildFrame_p.");
-        return NULL;
-        }
-    }
-    wxMDIChildFrame_GetPosition(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    PyObject *o;
-    o = PyInt_FromLong((long) (*_arg1));
-    _resultobj = t_output_helper(_resultobj, o);
-}
-{
-    PyObject *o;
-    o = PyInt_FromLong((long) (*_arg2));
-    _resultobj = t_output_helper(_resultobj, o);
-}
-    return _resultobj;
-}
-
 static void *SwigwxMDIClientWindowTowxWindow(void *ptr) {
     wxMDIClientWindow *src;
     wxWindow *dest;
@@ -713,9 +579,6 @@ static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args) {
 
 static PyMethodDef mdicMethods[] = {
 	 { "new_wxMDIClientWindow", _wrap_new_wxMDIClientWindow, 1 },
-	 { "wxMDIChildFrame_GetPosition", _wrap_wxMDIChildFrame_GetPosition, 1 },
-	 { "wxMDIChildFrame_SetClientSize", _wrap_wxMDIChildFrame_SetClientSize, 1 },
-	 { "wxMDIChildFrame_SetMenuBar", _wrap_wxMDIChildFrame_SetMenuBar, 1 },
 	 { "wxMDIChildFrame_Restore", _wrap_wxMDIChildFrame_Restore, 1 },
 	 { "wxMDIChildFrame_Maximize", _wrap_wxMDIChildFrame_Maximize, 1 },
 	 { "wxMDIChildFrame_Activate", _wrap_wxMDIChildFrame_Activate, 1 },
@@ -725,7 +588,6 @@ static PyMethodDef mdicMethods[] = {
 	 { "wxMDIParentFrame_GetToolBar", _wrap_wxMDIParentFrame_GetToolBar, 1 },
 	 { "wxMDIParentFrame_GetClientWindow", _wrap_wxMDIParentFrame_GetClientWindow, 1 },
 	 { "wxMDIParentFrame_GetActiveChild", _wrap_wxMDIParentFrame_GetActiveChild, 1 },
-	 { "wxMDIParentFrame_GetClientSize", _wrap_wxMDIParentFrame_GetClientSize, 1 },
 	 { "wxMDIParentFrame_Cascade", _wrap_wxMDIParentFrame_Cascade, 1 },
 	 { "wxMDIParentFrame_ArrangeIcons", _wrap_wxMDIParentFrame_ArrangeIcons, 1 },
 	 { "wxMDIParentFrame_ActivatePrevious", _wrap_wxMDIParentFrame_ActivatePrevious, 1 },

utils/wxPython/src/msw/mdi.py

@@ -31,9 +31,6 @@ class wxMDIParentFramePtr(wxFramePtr):
     def Cascade(self):
         val = mdic.wxMDIParentFrame_Cascade(self.this)
         return val
-    def GetClientSize(self):
-        val = mdic.wxMDIParentFrame_GetClientSize(self.this)
-        return val
     def GetActiveChild(self):
         val = mdic.wxMDIParentFrame_GetActiveChild(self.this)
         val = wxMDIChildFramePtr(val)
@@ -82,15 +79,6 @@ class wxMDIChildFramePtr(wxFramePtr):
     def Restore(self):
         val = mdic.wxMDIChildFrame_Restore(self.this)
         return val
-    def SetMenuBar(self,arg0):
-        val = mdic.wxMDIChildFrame_SetMenuBar(self.this,arg0.this)
-        return val
-    def SetClientSize(self,arg0,arg1):
-        val = mdic.wxMDIChildFrame_SetClientSize(self.this,arg0,arg1)
-        return val
-    def GetPosition(self):
-        val = mdic.wxMDIChildFrame_GetPosition(self.this)
-        return val
     def __repr__(self):
         return "<C wxMDIChildFrame instance>"
 class wxMDIChildFrame(wxMDIChildFramePtr):

utils/wxPython/src/msw/misc.cpp

@@ -3470,35 +3470,6 @@ static PyObject *_wrap_wxToolTip_GetTip(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxToolTip_SetWindow(_swigobj,_swigarg0)  (_swigobj->SetWindow(_swigarg0))
-static PyObject *_wrap_wxToolTip_SetWindow(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxToolTip * _arg0;
-    wxWindow * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxToolTip_SetWindow",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_SetWindow. Expected _wxToolTip_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolTip_SetWindow. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-    wxToolTip_SetWindow(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
 #define wxToolTip_GetWindow(_swigobj)  (_swigobj->GetWindow())
 static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -3524,7 +3495,6 @@ static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args) {
 
 static PyMethodDef misccMethods[] = {
 	 { "wxToolTip_GetWindow", _wrap_wxToolTip_GetWindow, 1 },
-	 { "wxToolTip_SetWindow", _wrap_wxToolTip_SetWindow, 1 },
 	 { "wxToolTip_GetTip", _wrap_wxToolTip_GetTip, 1 },
 	 { "wxToolTip_SetTip", _wrap_wxToolTip_SetTip, 1 },
 	 { "new_wxToolTip", _wrap_new_wxToolTip, 1 },

utils/wxPython/src/msw/misc.py

@@ -498,9 +498,6 @@ class wxToolTipPtr :
     def GetTip(self):
         val = miscc.wxToolTip_GetTip(self.this)
         return val
-    def SetWindow(self,arg0):
-        val = miscc.wxToolTip_SetWindow(self.this,arg0.this)
-        return val
     def GetWindow(self):
         val = miscc.wxToolTip_GetWindow(self.this)
         val = wxWindowPtr(val)

utils/wxPython/src/msw/utils.cpp

@@ -115,6 +115,10 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
+#ifdef SEPARATE
+    static wxString wxPyEmptyStr("");
+#endif
+
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
         PyObject* ret = PyTuple_New(3);
         if (ret) {

utils/wxPython/src/msw/wx.cpp

@@ -33,8 +33,8 @@
  * and things like that.
  *
  * $Log$
- * Revision 1.6  1999/02/01 00:11:10  RD
+ * Revision 1.7  1999/02/25 07:09:28  RD
- * Added the missing EVT_LIST_ITEM_SELECTED and friends.
+ * wxPython version 2.0b5
  *
  ************************************************************************/
 
@@ -628,15 +628,28 @@ extern "C" SWIGEXPORT(void,initcontrols2c)();
 extern "C" SWIGEXPORT(void,initcmndlgsc)();
 extern "C" SWIGEXPORT(void,initstattoolc)();
 extern "C" SWIGEXPORT(void,initframesc)();
-extern "C" SWIGEXPORT(void,initutilsc)();
 extern "C" SWIGEXPORT(void,initwindows3c)();
-
+#ifndef SEPARATE
-
+extern "C" SWIGEXPORT(void,initutilsc)();
+#endif
 static int _wrap_wxPyDefaultPosition_set(PyObject *val) {
+    char * tval;
+    wxPoint * temp;
 
-    PyErr_SetString(PyExc_TypeError,"Variable wxPyDefaultPosition is read-only.");
+    tval = (char *) PyString_AsString(val);
+    if (PyErr_Occurred()) {
+        PyErr_SetString(PyExc_TypeError,"C variable 'wxPyDefaultPosition'(wxPoint *)");
         return 1; 
     }
+    if (tval) {
+        if (SWIG_GetPtr(tval,(void **) &temp,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultPosition. Expected _wxPoint_p.");
+        return 1;
+        }
+    }
+    wxPyDefaultPosition = *temp;
+    return 0;
+}
 
 static PyObject *_wrap_wxPyDefaultPosition_get() {
     PyObject * pyobj;
@@ -648,10 +661,23 @@ static PyObject *_wrap_wxPyDefaultPosition_get() {
 }
 
 static int _wrap_wxPyDefaultSize_set(PyObject *val) {
+    char * tval;
+    wxSize * temp;
 
-    PyErr_SetString(PyExc_TypeError,"Variable wxPyDefaultSize is read-only.");
+    tval = (char *) PyString_AsString(val);
+    if (PyErr_Occurred()) {
+        PyErr_SetString(PyExc_TypeError,"C variable 'wxPyDefaultSize'(wxSize *)");
         return 1; 
     }
+    if (tval) {
+        if (SWIG_GetPtr(tval,(void **) &temp,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultSize. Expected _wxSize_p.");
+        return 1;
+        }
+    }
+    wxPyDefaultSize = *temp;
+    return 0;
+}
 
 static PyObject *_wrap_wxPyDefaultSize_get() {
     PyObject * pyobj;
@@ -1594,6 +1620,7 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"false", PyInt_FromLong((long) 0));
 	 PyDict_SetItemString(d,"TRUE", PyInt_FromLong((long) 1));
 	 PyDict_SetItemString(d,"true", PyInt_FromLong((long) 1));
+	 PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString("wxVERSION_STRING"));
 	 PyDict_SetItemString(d,"wxEVT_NULL", PyInt_FromLong((long) wxEVT_NULL));
 	 PyDict_SetItemString(d,"wxEVT_FIRST", PyInt_FromLong((long) wxEVT_FIRST));
 	 PyDict_SetItemString(d,"wxEVT_COMMAND_BUTTON_CLICKED", PyInt_FromLong((long) wxEVT_COMMAND_BUTTON_CLICKED));
@@ -1726,7 +1753,7 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING));
 	 PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
 	 PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
-	 PyDict_SetItemString(d,"__version__", PyString_FromString("0.5.4"));
+	 PyDict_SetItemString(d,"__version__", PyString_FromString("2.0b5"));
 	 PyDict_SetItemString(d,"cvar", SWIG_globals);
 	 SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
 	 SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);
@@ -1773,6 +1800,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
 	 SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
 	 SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0);
+	 SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
 	 SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
 	 SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
 	 SWIG_RegisterMapping("_wxPageSetupData","_class_wxPageSetupData",0);
@@ -1788,6 +1816,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_long","_wxDash",0);
 	 SWIG_RegisterMapping("_long","_unsigned_long",0);
 	 SWIG_RegisterMapping("_long","_signed_long",0);
+	 SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
 	 SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
 	 SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
 	 SWIG_RegisterMapping("_wxSashWindow","_class_wxSashWindow",0);
@@ -1809,6 +1838,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
 	 SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
 	 SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
+	 SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
 	 SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
 	 SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
 	 SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0);
@@ -1962,6 +1992,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
 	 SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
 	 SWIG_RegisterMapping("_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0);
+	 SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
 	 SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
 	 SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
 	 SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);

utils/wxPython/src/msw/wx.py

@@ -1259,7 +1259,10 @@ class wxApp(wxPyApp):
 #----------------------------------------------------------------------------
 #
 # $Log$
-# Revision 1.6  1999/02/20 09:11:32  RD
+# Revision 1.7  1999/02/25 07:09:30  RD
+# wxPython version 2.0b5
+#
+# Revision 1.11  1999/02/20 09:02:55  RD
 # Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 # window handle.  If you can get the window handle into the python code,
 # it should just work...  More news on this later.

utils/wxPython/src/stattool.i

@@ -178,40 +178,17 @@ public:
 
 
 
-//  // The Native Toolbar
-//  class wxToolBar : public wxToolBarBase {
-//  public:
-//      wxToolBar(wxWindow* parent, wxWindowID id,
-//                const wxPoint& pos = wxPyDefaultPosition,
-//                const wxSize& size = wxPyDefaultSize,
-//                long style = wxTB_HORIZONTAL | wxNO_BORDER,
-//                char* name = "toolBar");
-
-//      %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
-
-//  };
-
-
-//  // A generic toolbar
-//  class wxToolBarSimple : public wxToolBarBase {
-//  public:
-//      wxToolBarSimple(wxWindow* parent, wxWindowID id,
-//                      const wxPoint& pos = wxPyDefaultPosition,
-//                      const wxSize& size = wxPyDefaultSize,
-//                      long style = wxTB_HORIZONTAL | wxNO_BORDER,
-//                      char* name = "toolBar");
-
-//      %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
-
-//  };
-
 
 //---------------------------------------------------------------------------
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.6  1999/02/25 07:08:35  RD
+// wxPython version 2.0b5
+//
 // Revision 1.5  1999/01/30 07:30:15  RD
+//
 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain

utils/wxPython/src/utils.i

@@ -24,11 +24,11 @@
 %include my_typemaps.i
 
 
-#ifdef SEPARATE
 %{
+#ifdef SEPARATE
     static wxString wxPyEmptyStr("");
-%}
 #endif
+%}
 
 
 %{
@@ -138,6 +138,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.3  1999/02/25 07:08:36  RD
+// wxPython version 2.0b5
+//
 // Revision 1.2  1999/02/20 09:03:02  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,

utils/wxPython/src/windows2.i

@@ -119,8 +119,7 @@ public:
     int GetCellAlignment(int row, int col);
     %name(GetDefCellAlignment)int GetCellAlignment();
     wxColour& GetCellBackgroundColour(int row, int col);
-    %name(GetDefCellBackgroundColour)
+    %name(GetDefCellBackgroundColour) wxColour& GetCellBackgroundColour();
-        wxColour& GetCellBackgroundColour();
     //wxGridCell *** GetCells();
     wxColour& GetCellTextColour(int row, int col);
     %name(GetDefCellTextColour)wxColour& GetCellTextColour();
@@ -333,7 +332,11 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.9  1999/02/25 07:08:36  RD
+// wxPython version 2.0b5
+//
 // Revision 1.8  1998/12/17 18:05:53  RD
+//
 // wxPython 0.5.2
 // Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
 // versions are much closer now!

utils/wxPython/src/wx.i

@@ -114,12 +114,14 @@ extern "C" SWIGEXPORT(void,initcontrols2c)();
 extern "C" SWIGEXPORT(void,initcmndlgsc)();
 extern "C" SWIGEXPORT(void,initstattoolc)();
 extern "C" SWIGEXPORT(void,initframesc)();
-extern "C" SWIGEXPORT(void,initutilsc)();
 extern "C" SWIGEXPORT(void,initwindows3c)();
-
+#ifndef SEPARATE
-
+extern "C" SWIGEXPORT(void,initutilsc)();
+#endif
 %}
 
+
+
 %init %{
 
     __wxPreStart();     // initialize the GUI toolkit, if needed.
@@ -156,6 +158,9 @@ extern "C" SWIGEXPORT(void,initwindows3c)();
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.7  1999/02/25 07:08:37  RD
+// wxPython version 2.0b5
+//
 // Revision 1.6  1999/02/20 09:03:04  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,

utils/wxPython/tests/test6.py

@@ -12,7 +12,7 @@
 #----------------------------------------------------------------------------
 
 import sys
-from wxPython.wx import wxConfig
+from wxPython.utils import wxConfig
 
 
 #----------------------------------------------------------------------------
@@ -81,6 +81,9 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.2  1999/02/25 07:09:51  RD
+# wxPython version 2.0b5
+#
 # Revision 1.1  1998/12/15 20:44:37  RD
 # Changed the import semantics from "from wxPython import *" to "from
 # wxPython.wx import *"  This is for people who are worried about