+This demo shows how individual radio buttons can be used to build +more complicated selection mechanisms... +
+It uses 2 groups of wxRadioButtons, where the groups are defined by
+instantiation. When a wxRadioButton is created with the wxRB_GROUP
+style, all subsequent wxRadioButtons created without it are implicitly
+added to that group by the framework.
+"""
+
+
+
+if __name__ == '__main__':
+ import sys,os
+ import run
+ run.main(['', os.path.basename(sys.argv[0])])
+
diff --git a/wxPython/setup.py b/wxPython/setup.py
index efcf300f04..4524c51d00 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -176,6 +176,13 @@ if CORE_ONLY:
BUILD_DLLWIDGET = 0
BUILD_IEWIN = 0
+if debug:
+ FINAL = 0
+ HYBRID = 0
+
+if FINAL:
+ HYBRID = 0
+
if UNICODE and os.name != 'nt':
print "UNICODE is currently only supported on Win32"
@@ -203,13 +210,6 @@ if os.name == 'nt':
WXPLAT = '__WXMSW__'
GENDIR = 'msw'
- if debug:
- FINAL = 0
- HYBRID = 0
-
- if HYBRID:
- FINAL = 0
-
includes = ['src',
opj(WXDIR, 'lib', 'mswdll' + libFlag()),
opj(WXDIR, 'include'),
diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index 1c53a4863b..ce353d54ea 100644
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -686,6 +686,9 @@ def wxCallAfter(callable, *args, **kw):
evt.kw = kw
wxPostEvent(app, evt)
+# an alias
+wxRunLater = wxCallAfter
+
#----------------------------------------------------------------------
class wxPyDeadObjectError(AttributeError):
diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 0921bfb962..41ca3958d4 100644
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -725,10 +725,14 @@ public:
'''Append an item to the list control. The entry parameter should be a
sequence with an item for each column'''
if len(entry):
+ if wx.wxUSE_UNICODE:
+ cvtfunc = unicode
+ else:
+ cvtfunc = str
pos = self.GetItemCount()
- self.InsertStringItem(pos, str(entry[0]))
+ self.InsertStringItem(pos, cvtfunc(entry[0]))
for i in range(1, len(entry)):
- self.SetStringItem(pos, i, str(entry[i]))
+ self.SetStringItem(pos, i, cvtfunc(entry[i]))
return pos
"
diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index 2ed6aa0b47..e05754e70c 100644
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -418,6 +418,7 @@ public:
%name(SetWidthFloatFromTag)void SetWidthFloat(const wxHtmlTag& tag);
void SetMinHeight(int h, int align = wxHTML_ALIGN_TOP);
void SetBackgroundColour(const wxColour& clr);
+ wxColour GetBackgroundColour();
void SetBorder(const wxColour& clr1, const wxColour& clr2);
wxHtmlCell* GetFirstCell();
};
@@ -500,7 +501,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyHtmlFilter, wxHtmlFilter);
// And now the version seen by SWIG
-%name(wxHtmlFilter) class wxPyHtmlFilter : wxObject {
+%name(wxHtmlFilter) class wxPyHtmlFilter : public wxObject {
public:
wxPyHtmlFilter();
diff --git a/wxPython/src/msw/controls2.py b/wxPython/src/msw/controls2.py
index 112a51690d..8778dae24c 100644
--- a/wxPython/src/msw/controls2.py
+++ b/wxPython/src/msw/controls2.py
@@ -695,10 +695,14 @@ class wxListCtrlPtr(wxControlPtr):
'''Append an item to the list control. The entry parameter should be a
sequence with an item for each column'''
if len(entry):
+ if wx.wxUSE_UNICODE:
+ cvtfunc = unicode
+ else:
+ cvtfunc = str
pos = self.GetItemCount()
- self.InsertStringItem(pos, str(entry[0]))
+ self.InsertStringItem(pos, cvtfunc(entry[0]))
for i in range(1, len(entry)):
- self.SetStringItem(pos, i, str(entry[i]))
+ self.SetStringItem(pos, i, cvtfunc(entry[i]))
return pos
class wxListCtrl(wxListCtrlPtr):
diff --git a/wxPython/src/msw/html.cpp b/wxPython/src/msw/html.cpp
index 56601d06ed..5ccd54a8dd 100644
--- a/wxPython/src/msw/html.cpp
+++ b/wxPython/src/msw/html.cpp
@@ -3792,6 +3792,36 @@ static PyObject *_wrap_wxHtmlContainerCell_SetBackgroundColour(PyObject *self, P
return _resultobj;
}
+#define wxHtmlContainerCell_GetBackgroundColour(_swigobj) (_swigobj->GetBackgroundColour())
+static PyObject *_wrap_wxHtmlContainerCell_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ wxColour * _result;
+ wxHtmlContainerCell * _arg0;
+ PyObject * _argo0 = 0;
+ char *_kwnames[] = { "self", NULL };
+ char _ptemp[128];
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlContainerCell_GetBackgroundColour",_kwnames,&_argo0))
+ return NULL;
+ if (_argo0) {
+ if (_argo0 == Py_None) { _arg0 = NULL; }
+ else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlContainerCell_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlContainerCell_GetBackgroundColour. Expected _wxHtmlContainerCell_p.");
+ return NULL;
+ }
+ }
+{
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ _result = new wxColour (wxHtmlContainerCell_GetBackgroundColour(_arg0));
+
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) return NULL;
+} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
+ _resultobj = Py_BuildValue("s",_ptemp);
+ return _resultobj;
+}
+
#define wxHtmlContainerCell_SetBorder(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetBorder(_swigarg0,_swigarg1))
static PyObject *_wrap_wxHtmlContainerCell_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -4025,6 +4055,14 @@ static PyObject *_wrap_new_wxHtmlWidgetCell(PyObject *self, PyObject *args, PyOb
return _resultobj;
}
+static void *SwigwxPyHtmlFilterTowxObject(void *ptr) {
+ wxPyHtmlFilter *src;
+ wxObject *dest;
+ src = (wxPyHtmlFilter *) ptr;
+ dest = (wxObject *) src;
+ return (void *) dest;
+}
+
#define new_wxHtmlFilter() (new wxPyHtmlFilter())
static PyObject *_wrap_new_wxHtmlFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -6405,6 +6443,7 @@ static PyMethodDef htmlcMethods[] = {
{ "new_wxHtmlColourCell", (PyCFunction) _wrap_new_wxHtmlColourCell, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlContainerCell_GetFirstCell", (PyCFunction) _wrap_wxHtmlContainerCell_GetFirstCell, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlContainerCell_SetBorder", (PyCFunction) _wrap_wxHtmlContainerCell_SetBorder, METH_VARARGS | METH_KEYWORDS },
+ { "wxHtmlContainerCell_GetBackgroundColour", (PyCFunction) _wrap_wxHtmlContainerCell_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlContainerCell_SetBackgroundColour", (PyCFunction) _wrap_wxHtmlContainerCell_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlContainerCell_SetMinHeight", (PyCFunction) _wrap_wxHtmlContainerCell_SetMinHeight, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlContainerCell_SetWidthFloatFromTag", (PyCFunction) _wrap_wxHtmlContainerCell_SetWidthFloatFromTag, METH_VARARGS | METH_KEYWORDS },
@@ -6575,6 +6614,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxHtmlPrintout",SwigwxHtmlPrintoutTowxObject},
{ "_wxObject","_wxHtmlDCRenderer",SwigwxHtmlDCRendererTowxObject},
{ "_wxObject","_wxPyHtmlWindow",SwigwxPyHtmlWindowTowxObject},
+ { "_wxObject","_wxPyHtmlFilter",SwigwxPyHtmlFilterTowxObject},
{ "_wxObject","_wxHtmlWidgetCell",SwigwxHtmlWidgetCellTowxObject},
{ "_wxObject","_wxHtmlFontCell",SwigwxHtmlFontCellTowxObject},
{ "_wxObject","_wxHtmlColourCell",SwigwxHtmlColourCellTowxObject},
diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index 3abd39d634..9d6a4c8a7a 100644
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -450,6 +450,10 @@ class wxHtmlContainerCellPtr(wxHtmlCellPtr):
def SetBackgroundColour(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlContainerCell_SetBackgroundColour,(self,) + _args, _kwargs)
return val
+ def GetBackgroundColour(self, *_args, **_kwargs):
+ val = apply(htmlc.wxHtmlContainerCell_GetBackgroundColour,(self,) + _args, _kwargs)
+ if val: val = wxColourPtr(val) ; val.thisown = 1
+ return val
def SetBorder(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlContainerCell_SetBorder,(self,) + _args, _kwargs)
return val
@@ -509,7 +513,7 @@ class wxHtmlWidgetCell(wxHtmlWidgetCellPtr):
-class wxHtmlFilterPtr :
+class wxHtmlFilterPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
diff --git a/wxPython/src/msw/wizard.cpp b/wxPython/src/msw/wizard.cpp
index c7e05cbbe4..fb95307b3d 100644
--- a/wxPython/src/msw/wizard.cpp
+++ b/wxPython/src/msw/wizard.cpp
@@ -2069,7 +2069,83 @@ static PyObject *_wrap_wxWizard_ShowPage(PyObject *self, PyObject *args, PyObjec
return _resultobj;
}
+#define wxWizard_HasNextPage(_swigobj,_swigarg0) (_swigobj->HasNextPage(_swigarg0))
+static PyObject *_wrap_wxWizard_HasNextPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ bool _result;
+ wxWizard * _arg0;
+ wxWizardPage * _arg1;
+ PyObject * _argo0 = 0;
+ PyObject * _argo1 = 0;
+ char *_kwnames[] = { "self","page", NULL };
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWizard_HasNextPage",_kwnames,&_argo0,&_argo1))
+ return NULL;
+ if (_argo0) {
+ if (_argo0 == Py_None) { _arg0 = NULL; }
+ else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWizard_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWizard_HasNextPage. Expected _wxWizard_p.");
+ return NULL;
+ }
+ }
+ if (_argo1) {
+ if (_argo1 == Py_None) { _arg1 = NULL; }
+ else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWizardPage_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWizard_HasNextPage. Expected _wxWizardPage_p.");
+ return NULL;
+ }
+ }
+{
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ _result = (bool )wxWizard_HasNextPage(_arg0,_arg1);
+
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) return NULL;
+} _resultobj = Py_BuildValue("i",_result);
+ return _resultobj;
+}
+
+#define wxWizard_HasPrevPage(_swigobj,_swigarg0) (_swigobj->HasPrevPage(_swigarg0))
+static PyObject *_wrap_wxWizard_HasPrevPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ bool _result;
+ wxWizard * _arg0;
+ wxWizardPage * _arg1;
+ PyObject * _argo0 = 0;
+ PyObject * _argo1 = 0;
+ char *_kwnames[] = { "self","page", NULL };
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWizard_HasPrevPage",_kwnames,&_argo0,&_argo1))
+ return NULL;
+ if (_argo0) {
+ if (_argo0 == Py_None) { _arg0 = NULL; }
+ else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWizard_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWizard_HasPrevPage. Expected _wxWizard_p.");
+ return NULL;
+ }
+ }
+ if (_argo1) {
+ if (_argo1 == Py_None) { _arg1 = NULL; }
+ else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWizardPage_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWizard_HasPrevPage. Expected _wxWizardPage_p.");
+ return NULL;
+ }
+ }
+{
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ _result = (bool )wxWizard_HasPrevPage(_arg0,_arg1);
+
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) return NULL;
+} _resultobj = Py_BuildValue("i",_result);
+ return _resultobj;
+}
+
static PyMethodDef wizardcMethods[] = {
+ { "wxWizard_HasPrevPage", (PyCFunction) _wrap_wxWizard_HasPrevPage, METH_VARARGS | METH_KEYWORDS },
+ { "wxWizard_HasNextPage", (PyCFunction) _wrap_wxWizard_HasNextPage, METH_VARARGS | METH_KEYWORDS },
{ "wxWizard_ShowPage", (PyCFunction) _wrap_wxWizard_ShowPage, METH_VARARGS | METH_KEYWORDS },
{ "wxWizard_IsRunning", (PyCFunction) _wrap_wxWizard_IsRunning, METH_VARARGS | METH_KEYWORDS },
{ "wxWizard_FitToPage", (PyCFunction) _wrap_wxWizard_FitToPage, METH_VARARGS | METH_KEYWORDS },
diff --git a/wxPython/src/msw/wizard.py b/wxPython/src/msw/wizard.py
index 391048f193..57b736891f 100644
--- a/wxPython/src/msw/wizard.py
+++ b/wxPython/src/msw/wizard.py
@@ -226,6 +226,12 @@ class wxWizardPtr(wxDialogPtr):
def ShowPage(self, *_args, **_kwargs):
val = apply(wizardc.wxWizard_ShowPage,(self,) + _args, _kwargs)
return val
+ def HasNextPage(self, *_args, **_kwargs):
+ val = apply(wizardc.wxWizard_HasNextPage,(self,) + _args, _kwargs)
+ return val
+ def HasPrevPage(self, *_args, **_kwargs):
+ val = apply(wizardc.wxWizard_HasPrevPage,(self,) + _args, _kwargs)
+ return val
def __repr__(self):
return "