wxPython version 2.0b5

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

diff --git a/utils/wxPython/src/gtk/controls.cpp b/utils/wxPython/src/gtk/controls.cpp
index 63ba909af6e1e00630c406b2d72a49026033fa6a..ae2363048dbdb0a7b1b0aae4e48d5838e6180f9a 100644 (file)
--- a/utils/wxPython/src/gtk/controls.cpp
+++ b/utils/wxPython/src/gtk/controls.cpp
@@ -4245,8 +4245,8 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxRadioBox_EnableBox(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
-static PyObject *_wrap_wxRadioBox_EnableBox(PyObject *self, PyObject *args) {
+#define wxRadioBox_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
+static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     bool  _arg1;
@@ -4254,23 +4254,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))
-static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args) {
+#define wxRadioBox_EnableItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxRadioBox_EnableItem(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
@@ -4279,16 +4279,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;
@@ -4328,8 +4328,8 @@ static PyObject *_wrap_wxRadioBox_FindString(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxRadioBox_GetLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))
-static PyObject *_wrap_wxRadioBox_GetLabel(PyObject *self, PyObject *args) {
+#define wxRadioBox_GetItemLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))
+static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;
@@ -4337,15 +4337,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));
 }
@@ -4450,8 +4450,8 @@ static PyObject *_wrap_wxRadioBox_Number(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxRadioBox_SetBoxLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
-static PyObject *_wrap_wxRadioBox_SetBoxLabel(PyObject *self, PyObject *args) {
+#define wxRadioBox_SetLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
+static PyObject *_wrap_wxRadioBox_SetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     wxString * _arg1;
@@ -4459,11 +4459,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;
         }
     }
@@ -4474,7 +4474,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;
 {
@@ -4484,8 +4484,8 @@ static PyObject *_wrap_wxRadioBox_SetBoxLabel(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxRadioBox_SetLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxRadioBox_SetLabel(PyObject *self, PyObject *args) {
+#define wxRadioBox_SetItemLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxRadioBox_SetItemLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
@@ -4494,11 +4494,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;
         }
     }
@@ -4509,7 +4509,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;
 {
@@ -5271,16 +5271,16 @@ 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_GetLabel", _wrap_wxRadioBox_GetLabel, 1 },
+        { "wxRadioBox_GetItemLabel", _wrap_wxRadioBox_GetItemLabel, 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 },

diff --git a/utils/wxPython/src/gtk/controls.py b/utils/wxPython/src/gtk/controls.py
index e81929ea285f04198732a37639c99939c26debd5..5b1b0c78bb8e5b03c472a5e5179f072594e7ee1a 100644 (file)
--- a/utils/wxPython/src/gtk/controls.py
+++ b/utils/wxPython/src/gtk/controls.py
@@ -662,17 +662,17 @@ class wxRadioBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def EnableBox(self,arg0):
-        val = controlsc.wxRadioBox_EnableBox(self.this,arg0)
+    def Enable(self,arg0):
+        val = controlsc.wxRadioBox_Enable(self.this,arg0)
         return val
-    def Enable(self,arg0,arg1):
-        val = controlsc.wxRadioBox_Enable(self.this,arg0,arg1)
+    def EnableItem(self,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 GetLabel(self,arg0):
-        val = controlsc.wxRadioBox_GetLabel(self.this,arg0)
+    def GetItemLabel(self,arg0):
+        val = controlsc.wxRadioBox_GetItemLabel(self.this,arg0)
         return val
     def GetSelection(self):
         val = controlsc.wxRadioBox_GetSelection(self.this)
@@ -686,11 +686,11 @@ class wxRadioBoxPtr(wxControlPtr):
     def Number(self):
         val = controlsc.wxRadioBox_Number(self.this)
         return val
-    def SetBoxLabel(self,arg0):
-        val = controlsc.wxRadioBox_SetBoxLabel(self.this,arg0)
+    def SetLabel(self,arg0):
+        val = controlsc.wxRadioBox_SetLabel(self.this,arg0)
         return val
-    def SetLabel(self,arg0,arg1):
-        val = controlsc.wxRadioBox_SetLabel(self.this,arg0,arg1)
+    def SetItemLabel(self,arg0,arg1):
+        val = controlsc.wxRadioBox_SetItemLabel(self.this,arg0,arg1)
         return val
     def SetSelection(self,arg0):
         val = controlsc.wxRadioBox_SetSelection(self.this,arg0)

diff --git a/utils/wxPython/src/gtk/controls2.cpp b/utils/wxPython/src/gtk/controls2.cpp
index b340053dae41d8f85b46f8aa25f1212fc589240b..1fc9d22c64e716b91f68b7938618fa25c20606fb 100644 (file)
--- a/utils/wxPython/src/gtk/controls2.cpp
+++ b/utils/wxPython/src/gtk/controls2.cpp
@@ -1377,8 +1377,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;
         }
@@ -1386,11 +1387,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")) {
@@ -1398,7 +1400,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;
@@ -1661,8 +1663,8 @@ static PyObject *_wrap_wxListCtrl_HitTest(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxListCtrl_InsertColumnWithInfo(_swigobj,_swigarg0,_swigarg1)  (_swigobj->InsertColumn(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_InsertColumnWithInfo(PyObject *self, PyObject *args) {
+#define wxListCtrl_InsertColumnWith(_swigobj,_swigarg0,_swigarg1)  (_swigobj->InsertColumn(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxListCtrl_InsertColumnWith(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -1672,21 +1674,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;
 }
@@ -4253,7 +4255,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_GetSelectedItemCount", _wrap_wxListCtrl_GetSelectedItemCount, 1 },

diff --git a/utils/wxPython/src/gtk/controls2.py b/utils/wxPython/src/gtk/controls2.py
index 6c518ce39dcc8fae4afdded1349b8c7dbd582289..80435d518fc1199a5563cd1a91f4420d5e16b2d7 100644 (file)
--- a/utils/wxPython/src/gtk/controls2.py
+++ b/utils/wxPython/src/gtk/controls2.py
@@ -184,8 +184,8 @@ class wxListCtrlPtr(wxControlPtr):
     def GetItemData(self,arg0):
         val = controls2c.wxListCtrl_GetItemData(self.this,arg0)
         return val
-    def GetItem(self):
-        val = controls2c.wxListCtrl_GetItem(self.this)
+    def GetItem(self,arg0):
+        val = controls2c.wxListCtrl_GetItem(self.this,arg0)
         val = wxListItemPtr(val)
         val.thisown = 1
         return val
@@ -223,8 +223,8 @@ class wxListCtrlPtr(wxControlPtr):
     def HitTest(self,arg0):
         val = controls2c.wxListCtrl_HitTest(self.this,arg0.this)
         return val
-    def InsertColumnWithInfo(self,arg0,arg1):
-        val = controls2c.wxListCtrl_InsertColumnWithInfo(self.this,arg0,arg1.this)
+    def InsertColumnWith(self,arg0,arg1):
+        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)

diff --git a/utils/wxPython/src/gtk/mdi.cpp b/utils/wxPython/src/gtk/mdi.cpp
index d0bac20db2f23926e6f80b7aa5c4df93f4bf127a..3ccfd726e08bb7d7cc682c880bdf32b4d0496121 100644 (file)
--- a/utils/wxPython/src/gtk/mdi.cpp
+++ b/utils/wxPython/src/gtk/mdi.cpp
@@ -277,47 +277,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;
@@ -550,99 +509,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;
@@ -685,9 +551,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 },
@@ -696,7 +559,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 },

diff --git a/utils/wxPython/src/gtk/mdi.py b/utils/wxPython/src/gtk/mdi.py
index 3bd0fa00a102a9cf94c2f636f1173d4c0309eff7..b878c8dc130835bebd5bc6d950c34e6176b6abf9 100644 (file)
--- a/utils/wxPython/src/gtk/mdi.py
+++ b/utils/wxPython/src/gtk/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)
@@ -79,15 +76,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):

diff --git a/utils/wxPython/src/gtk/utils.cpp b/utils/wxPython/src/gtk/utils.cpp
index 239566a7818c8194b0e9bfeb0e9d7a135eb775ee..6511963db4dc6298172936a7971601c517ad0313 100644 (file)
--- a/utils/wxPython/src/gtk/utils.cpp
+++ b/utils/wxPython/src/gtk/utils.cpp
@@ -116,6 +116,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) {

diff --git a/utils/wxPython/src/gtk/wx.cpp b/utils/wxPython/src/gtk/wx.cpp
index 6f510158863acced884eea60dd09597127c0a7d7..8a850714cf8d18b1d597daae48b06abd2639154f 100644 (file)
--- a/utils/wxPython/src/gtk/wx.cpp
+++ b/utils/wxPython/src/gtk/wx.cpp
@@ -33,17 +33,8 @@
  * and things like that.
  *
  * $Log$
- * Revision 1.7  1999/02/20 10:01:33  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.
- *
- * Added wxImageList, wxToolTip.
- *
- * Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
- * wxRegConfig class.
- *
- * As usual, some bug fixes, tweaks, etc.
+ * Revision 1.8  1999/02/25 07:18:51  RD
+ * wxPython version 2.0b5
  *
  ************************************************************************/
 
@@ -638,10 +629,10 @@ 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;

diff --git a/utils/wxPython/src/gtk/wx.py b/utils/wxPython/src/gtk/wx.py
index d59a2cf3536f6dfc5672e8d1ea0f6528dc96598b..8c1b843c93553dfc207891046c11e949b6b598e0 100644 (file)
--- a/utils/wxPython/src/gtk/wx.py
+++ b/utils/wxPython/src/gtk/wx.py
@@ -1247,17 +1247,8 @@ class wxApp(wxPyApp):
 #----------------------------------------------------------------------------
 #
 # $Log$
-# Revision 1.6  1999/02/20 10:01:35  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.
-#
-# Added wxImageList, wxToolTip.
-#
-# Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
-# wxRegConfig class.
-#
-# As usual, some bug fixes, tweaks, etc.
+# Revision 1.7  1999/02/25 07:18:52  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