diff --git a/wxPython/contrib/stc/mac/stc_.cpp b/wxPython/contrib/stc/mac/stc_.cpp index 1b350b2202..d6c081cfb5 100644 --- a/wxPython/contrib/stc/mac/stc_.cpp +++ b/wxPython/contrib/stc/mac/stc_.cpp @@ -10392,6 +10392,84 @@ static PyObject *_wrap_wxStyledTextCtrl_SetLastKeydownProcessed(PyObject *self, return _resultobj; } +#define wxStyledTextCtrl_SaveFile(_swigobj,_swigarg0) (_swigobj->SaveFile(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_SaveFile(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxStyledTextCtrl * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","filename", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStyledTextCtrl_SaveFile",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SaveFile. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxStyledTextCtrl_SaveFile(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxStyledTextCtrl_LoadFile(_swigobj,_swigarg0) (_swigobj->LoadFile(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxStyledTextCtrl * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","filename", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStyledTextCtrl_LoadFile",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_LoadFile. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxStyledTextCtrl_LoadFile(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + static void *SwigwxStyledTextEventTowxCommandEvent(void *ptr) { wxStyledTextEvent *src; wxCommandEvent *dest; @@ -11818,6 +11896,8 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextEvent_SetPosition", (PyCFunction) _wrap_wxStyledTextEvent_SetPosition, METH_VARARGS | METH_KEYWORDS }, { "delete_wxStyledTextEvent", (PyCFunction) _wrap_delete_wxStyledTextEvent, METH_VARARGS | METH_KEYWORDS }, { "new_wxStyledTextEvent", (PyCFunction) _wrap_new_wxStyledTextEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_LoadFile", (PyCFunction) _wrap_wxStyledTextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_SaveFile", (PyCFunction) _wrap_wxStyledTextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetLastKeydownProcessed", (PyCFunction) _wrap_wxStyledTextCtrl_SetLastKeydownProcessed, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_GetLastKeydownProcessed", (PyCFunction) _wrap_wxStyledTextCtrl_GetLastKeydownProcessed, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetHScrollBar", (PyCFunction) _wrap_wxStyledTextCtrl_SetHScrollBar, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/contrib/stc/mac/stc_.py b/wxPython/contrib/stc/mac/stc_.py index 7e9a819661..93e7f892ef 100644 --- a/wxPython/contrib/stc/mac/stc_.py +++ b/wxPython/contrib/stc/mac/stc_.py @@ -1114,6 +1114,12 @@ class wxStyledTextCtrlPtr(wxControlPtr): def SetLastKeydownProcessed(self, *_args, **_kwargs): val = stc_c.wxStyledTextCtrl_SetLastKeydownProcessed(self, *_args, **_kwargs) return val + def SaveFile(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_SaveFile(self, *_args, **_kwargs) + return val + def LoadFile(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_LoadFile(self, *_args, **_kwargs) + return val def __repr__(self): return "<%s.%s instance; proxy of C++ wxStyledTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxStyledTextCtrl(wxStyledTextCtrlPtr): diff --git a/wxPython/src/mac/gdi.cpp b/wxPython/src/mac/gdi.cpp index 53f515bcd2..2ee0ffb889 100644 --- a/wxPython/src/mac/gdi.cpp +++ b/wxPython/src/mac/gdi.cpp @@ -62,6 +62,9 @@ extern PyObject *SWIG_newvarlink(void); #include #include #include +#ifdef __WXMAC__ +#include +#endif static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -4326,6 +4329,63 @@ static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args, PyObject return _resultobj; } +#define wxBrush_GetMacTheme(_swigobj) (_swigobj->GetMacTheme()) +static PyObject *_wrap_wxBrush_GetMacTheme(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + short _result; + wxBrush * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBrush_GetMacTheme",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_GetMacTheme. Expected _wxBrush_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (short )wxBrush_GetMacTheme(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("h",_result); + return _resultobj; +} + +#define wxBrush_SetMacTheme(_swigobj,_swigarg0) (_swigobj->SetMacTheme(_swigarg0)) +static PyObject *_wrap_wxBrush_SetMacTheme(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBrush * _arg0; + short _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","macThemeBrush", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oh:wxBrush_SetMacTheme",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBrush_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetMacTheme. Expected _wxBrush_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxBrush_SetMacTheme(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxBrushListTowxObject(void *ptr) { wxBrushList *src; wxObject *dest; @@ -10626,6 +10686,8 @@ static PyMethodDef gdicMethods[] = { { "wxBrushList_RemoveBrush", (PyCFunction) _wrap_wxBrushList_RemoveBrush, METH_VARARGS | METH_KEYWORDS }, { "wxBrushList_FindOrCreateBrush", (PyCFunction) _wrap_wxBrushList_FindOrCreateBrush, METH_VARARGS | METH_KEYWORDS }, { "wxBrushList_AddBrush", (PyCFunction) _wrap_wxBrushList_AddBrush, METH_VARARGS | METH_KEYWORDS }, + { "wxBrush_SetMacTheme", (PyCFunction) _wrap_wxBrush_SetMacTheme, METH_VARARGS | METH_KEYWORDS }, + { "wxBrush_GetMacTheme", (PyCFunction) _wrap_wxBrush_GetMacTheme, METH_VARARGS | METH_KEYWORDS }, { "wxBrush_SetStyle", (PyCFunction) _wrap_wxBrush_SetStyle, METH_VARARGS | METH_KEYWORDS }, { "wxBrush_SetStipple", (PyCFunction) _wrap_wxBrush_SetStipple, METH_VARARGS | METH_KEYWORDS }, { "wxBrush_SetColour", (PyCFunction) _wrap_wxBrush_SetColour, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/gdi.py b/wxPython/src/mac/gdi.py index 5a0e4d376e..f89e6d427c 100644 --- a/wxPython/src/mac/gdi.py +++ b/wxPython/src/mac/gdi.py @@ -448,6 +448,12 @@ class wxBrushPtr(wxGDIObjectPtr): def SetStyle(self, *_args, **_kwargs): val = gdic.wxBrush_SetStyle(self, *_args, **_kwargs) return val + def GetMacTheme(self, *_args, **_kwargs): + val = gdic.wxBrush_GetMacTheme(self, *_args, **_kwargs) + return val + def SetMacTheme(self, *_args, **_kwargs): + val = gdic.wxBrush_SetMacTheme(self, *_args, **_kwargs) + return val def __repr__(self): return "<%s.%s instance; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def __nonzero__(self): return self.Ok() diff --git a/wxPython/src/mac/grid.cpp b/wxPython/src/mac/grid.cpp index a28c89c36f..75350e82cd 100644 --- a/wxPython/src/mac/grid.cpp +++ b/wxPython/src/mac/grid.cpp @@ -11563,6 +11563,120 @@ static PyObject *_wrap_wxGrid_SetRowMinimalHeight(PyObject *self, PyObject *args return _resultobj; } +#define wxGrid_SetColMinimalAcceptableWidth(_swigobj,_swigarg0) (_swigobj->SetColMinimalAcceptableWidth(_swigarg0)) +static PyObject *_wrap_wxGrid_SetColMinimalAcceptableWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGrid * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","width", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_SetColMinimalAcceptableWidth",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetColMinimalAcceptableWidth. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGrid_SetColMinimalAcceptableWidth(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGrid_SetRowMinimalAcceptableHeight(_swigobj,_swigarg0) (_swigobj->SetRowMinimalAcceptableHeight(_swigarg0)) +static PyObject *_wrap_wxGrid_SetRowMinimalAcceptableHeight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGrid * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","width", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_SetRowMinimalAcceptableHeight",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetRowMinimalAcceptableHeight. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGrid_SetRowMinimalAcceptableHeight(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGrid_GetColMinimalAcceptableWidth(_swigobj) (_swigobj->GetColMinimalAcceptableWidth()) +static PyObject *_wrap_wxGrid_GetColMinimalAcceptableWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxGrid * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetColMinimalAcceptableWidth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetColMinimalAcceptableWidth. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxGrid_GetColMinimalAcceptableWidth(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxGrid_GetRowMinimalAcceptableHeight(_swigobj) (_swigobj->GetRowMinimalAcceptableHeight()) +static PyObject *_wrap_wxGrid_GetRowMinimalAcceptableHeight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxGrid * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetRowMinimalAcceptableHeight",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetRowMinimalAcceptableHeight. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxGrid_GetRowMinimalAcceptableHeight(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGrid_SetDefaultCellBackgroundColour(_swigobj,_swigarg0) (_swigobj->SetDefaultCellBackgroundColour(_swigarg0)) static PyObject *_wrap_wxGrid_SetDefaultCellBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -14663,6 +14777,10 @@ static PyMethodDef gridcMethods[] = { { "wxGrid_SetDefaultCellTextColour", (PyCFunction) _wrap_wxGrid_SetDefaultCellTextColour, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_SetCellBackgroundColour", (PyCFunction) _wrap_wxGrid_SetCellBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_SetDefaultCellBackgroundColour", (PyCFunction) _wrap_wxGrid_SetDefaultCellBackgroundColour, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_GetRowMinimalAcceptableHeight", (PyCFunction) _wrap_wxGrid_GetRowMinimalAcceptableHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_GetColMinimalAcceptableWidth", (PyCFunction) _wrap_wxGrid_GetColMinimalAcceptableWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_SetRowMinimalAcceptableHeight", (PyCFunction) _wrap_wxGrid_SetRowMinimalAcceptableHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_SetColMinimalAcceptableWidth", (PyCFunction) _wrap_wxGrid_SetColMinimalAcceptableWidth, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_SetRowMinimalHeight", (PyCFunction) _wrap_wxGrid_SetRowMinimalHeight, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_SetColMinimalWidth", (PyCFunction) _wrap_wxGrid_SetColMinimalWidth, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_AutoSize", (PyCFunction) _wrap_wxGrid_AutoSize, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/grid.py b/wxPython/src/mac/grid.py index 2964b4983b..d3539f2955 100644 --- a/wxPython/src/mac/grid.py +++ b/wxPython/src/mac/grid.py @@ -1363,6 +1363,18 @@ class wxGridPtr(wxScrolledWindowPtr): def SetRowMinimalHeight(self, *_args, **_kwargs): val = gridc.wxGrid_SetRowMinimalHeight(self, *_args, **_kwargs) return val + def SetColMinimalAcceptableWidth(self, *_args, **_kwargs): + val = gridc.wxGrid_SetColMinimalAcceptableWidth(self, *_args, **_kwargs) + return val + def SetRowMinimalAcceptableHeight(self, *_args, **_kwargs): + val = gridc.wxGrid_SetRowMinimalAcceptableHeight(self, *_args, **_kwargs) + return val + def GetColMinimalAcceptableWidth(self, *_args, **_kwargs): + val = gridc.wxGrid_GetColMinimalAcceptableWidth(self, *_args, **_kwargs) + return val + def GetRowMinimalAcceptableHeight(self, *_args, **_kwargs): + val = gridc.wxGrid_GetRowMinimalAcceptableHeight(self, *_args, **_kwargs) + return val def SetDefaultCellBackgroundColour(self, *_args, **_kwargs): val = gridc.wxGrid_SetDefaultCellBackgroundColour(self, *_args, **_kwargs) return val diff --git a/wxPython/src/mac/printfw.cpp b/wxPython/src/mac/printfw.cpp index f65f5b2307..71a81aab03 100644 --- a/wxPython/src/mac/printfw.cpp +++ b/wxPython/src/mac/printfw.cpp @@ -3132,6 +3132,34 @@ static PyObject *_wrap_wxPrintDialogData_GetNoCopies(PyObject *self, PyObject *a return _resultobj; } +#define wxPrintDialogData_GetSelection(_swigobj) (_swigobj->GetSelection()) +static PyObject *_wrap_wxPrintDialogData_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPrintDialogData * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetSelection",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetSelection. Expected _wxPrintDialogData_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrintDialogData_GetSelection(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static wxPrintData * wxPrintDialogData_GetPrintData(wxPrintDialogData *self) { return new wxPrintData(self->GetPrintData()); // force a copy } @@ -3284,6 +3312,37 @@ static PyObject *_wrap_wxPrintDialogData_SetCollate(PyObject *self, PyObject *ar return _resultobj; } +#define wxPrintDialogData_SetAllPages(_swigobj,_swigarg0) (_swigobj->SetAllPages(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetAllPages(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintDialogData * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","flag", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetAllPages",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetAllPages. Expected _wxPrintDialogData_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintDialogData_SetAllPages(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxPrintDialogData_SetFromPage(_swigobj,_swigarg0) (_swigobj->SetFromPage(_swigarg0)) static PyObject *_wrap_wxPrintDialogData_SetFromPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3467,6 +3526,37 @@ static PyObject *_wrap_wxPrintDialogData_SetPrintToFile(PyObject *self, PyObject return _resultobj; } +#define wxPrintDialogData_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintDialogData * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","flag", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetSelection",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetSelection. Expected _wxPrintDialogData_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintDialogData_SetSelection(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxPrintDialogData_SetSetupDialog(_swigobj,_swigarg0) (_swigobj->SetSetupDialog(_swigarg0)) static PyObject *_wrap_wxPrintDialogData_SetSetupDialog(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -5434,17 +5524,20 @@ static PyMethodDef printfwcMethods[] = { { "new_wxPrintDialog", (PyCFunction) _wrap_new_wxPrintDialog, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetToPage", (PyCFunction) _wrap_wxPrintDialogData_SetToPage, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetSetupDialog", (PyCFunction) _wrap_wxPrintDialogData_SetSetupDialog, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_SetSelection", (PyCFunction) _wrap_wxPrintDialogData_SetSelection, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetPrintToFile", (PyCFunction) _wrap_wxPrintDialogData_SetPrintToFile, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetPrintData", (PyCFunction) _wrap_wxPrintDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetNoCopies", (PyCFunction) _wrap_wxPrintDialogData_SetNoCopies, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetMinPage", (PyCFunction) _wrap_wxPrintDialogData_SetMinPage, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetMaxPage", (PyCFunction) _wrap_wxPrintDialogData_SetMaxPage, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetFromPage", (PyCFunction) _wrap_wxPrintDialogData_SetFromPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_SetAllPages", (PyCFunction) _wrap_wxPrintDialogData_SetAllPages, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetCollate", (PyCFunction) _wrap_wxPrintDialogData_SetCollate, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_Ok", (PyCFunction) _wrap_wxPrintDialogData_Ok, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_GetToPage", (PyCFunction) _wrap_wxPrintDialogData_GetToPage, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_GetPrintToFile", (PyCFunction) _wrap_wxPrintDialogData_GetPrintToFile, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_GetPrintData", (PyCFunction) _wrap_wxPrintDialogData_GetPrintData, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetSelection", (PyCFunction) _wrap_wxPrintDialogData_GetSelection, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_GetNoCopies", (PyCFunction) _wrap_wxPrintDialogData_GetNoCopies, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_GetMinPage", (PyCFunction) _wrap_wxPrintDialogData_GetMinPage, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_GetMaxPage", (PyCFunction) _wrap_wxPrintDialogData_GetMaxPage, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/printfw.py b/wxPython/src/mac/printfw.py index 6497cc4a30..31b2e4668a 100644 --- a/wxPython/src/mac/printfw.py +++ b/wxPython/src/mac/printfw.py @@ -363,6 +363,9 @@ class wxPrintDialogDataPtr(wxObjectPtr): def GetNoCopies(self, *_args, **_kwargs): val = printfwc.wxPrintDialogData_GetNoCopies(self, *_args, **_kwargs) return val + def GetSelection(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetSelection(self, *_args, **_kwargs) + return val def GetPrintData(self, *_args, **_kwargs): val = printfwc.wxPrintDialogData_GetPrintData(self, *_args, **_kwargs) if val: val = wxPrintDataPtr(val) ; val.thisown = 1 @@ -379,6 +382,9 @@ class wxPrintDialogDataPtr(wxObjectPtr): def SetCollate(self, *_args, **_kwargs): val = printfwc.wxPrintDialogData_SetCollate(self, *_args, **_kwargs) return val + def SetAllPages(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetAllPages(self, *_args, **_kwargs) + return val def SetFromPage(self, *_args, **_kwargs): val = printfwc.wxPrintDialogData_SetFromPage(self, *_args, **_kwargs) return val @@ -397,6 +403,9 @@ class wxPrintDialogDataPtr(wxObjectPtr): def SetPrintToFile(self, *_args, **_kwargs): val = printfwc.wxPrintDialogData_SetPrintToFile(self, *_args, **_kwargs) return val + def SetSelection(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetSelection(self, *_args, **_kwargs) + return val def SetSetupDialog(self, *_args, **_kwargs): val = printfwc.wxPrintDialogData_SetSetupDialog(self, *_args, **_kwargs) return val diff --git a/wxPython/src/mac/windows.cpp b/wxPython/src/mac/windows.cpp index 612ac019d3..89e6faa4e1 100644 --- a/wxPython/src/mac/windows.cpp +++ b/wxPython/src/mac/windows.cpp @@ -6640,6 +6640,65 @@ static PyObject *_wrap_wxWindow_HasCapture(PyObject *self, PyObject *args, PyObj return _resultobj; } +#define wxWindow_SetThemeEnabled(_swigobj,_swigarg0) (_swigobj->SetThemeEnabled(_swigarg0)) +static PyObject *_wrap_wxWindow_SetThemeEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","enable", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_SetThemeEnabled",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetThemeEnabled. Expected _wxWindow_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxWindow_SetThemeEnabled(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxWindow_GetThemeEnabled(_swigobj) (_swigobj->GetThemeEnabled()) +static PyObject *_wrap_wxWindow_GetThemeEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetThemeEnabled",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetThemeEnabled. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxWindow_GetThemeEnabled(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static void *SwigwxPanelTowxWindow(void *ptr) { wxPanel *src; wxWindow *dest; @@ -11543,6 +11602,8 @@ static PyMethodDef windowscMethods[] = { { "wxPanel_Create", (PyCFunction) _wrap_wxPanel_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPrePanel", (PyCFunction) _wrap_new_wxPrePanel, METH_VARARGS | METH_KEYWORDS }, { "new_wxPanel", (PyCFunction) _wrap_new_wxPanel, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_GetThemeEnabled", (PyCFunction) _wrap_wxWindow_GetThemeEnabled, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_SetThemeEnabled", (PyCFunction) _wrap_wxWindow_SetThemeEnabled, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_HasCapture", (PyCFunction) _wrap_wxWindow_HasCapture, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetCapture", (PyCFunction) _wrap_wxWindow_GetCapture, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_ReleaseMouse", (PyCFunction) _wrap_wxWindow_ReleaseMouse, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/windows.py b/wxPython/src/mac/windows.py index 549216dc18..aaff38e842 100644 --- a/wxPython/src/mac/windows.py +++ b/wxPython/src/mac/windows.py @@ -643,6 +643,12 @@ class wxWindowPtr(wxEvtHandlerPtr): def HasCapture(self, *_args, **_kwargs): val = windowsc.wxWindow_HasCapture(self, *_args, **_kwargs) return val + def SetThemeEnabled(self, *_args, **_kwargs): + val = windowsc.wxWindow_SetThemeEnabled(self, *_args, **_kwargs) + return val + def GetThemeEnabled(self, *_args, **_kwargs): + val = windowsc.wxWindow_GetThemeEnabled(self, *_args, **_kwargs) + return val def __repr__(self): return "<%s.%s instance; proxy of C++ wxWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) # replaces broken shadow method diff --git a/wxPython/src/mac/windows3.cpp b/wxPython/src/mac/windows3.cpp index 30b87f625a..0f0c7502b5 100644 --- a/wxPython/src/mac/windows3.cpp +++ b/wxPython/src/mac/windows3.cpp @@ -57,10 +57,8 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include #include -#ifndef __WXMAC__ #include #include -#endif static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -2055,7 +2053,174 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutWindow(PyObject *self, PyObject * return _resultobj; } +static void *SwigwxTipWindowTowxFrame(void *ptr) { + wxTipWindow *src; + wxFrame *dest; + src = (wxTipWindow *) ptr; + dest = (wxFrame *) src; + return (void *) dest; +} + +static void *SwigwxTipWindowTowxTopLevelWindow(void *ptr) { + wxTipWindow *src; + wxTopLevelWindow *dest; + src = (wxTipWindow *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + +static void *SwigwxTipWindowTowxWindow(void *ptr) { + wxTipWindow *src; + wxWindow *dest; + src = (wxTipWindow *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxTipWindowTowxEvtHandler(void *ptr) { + wxTipWindow *src; + wxEvtHandler *dest; + src = (wxTipWindow *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +static void *SwigwxTipWindowTowxObject(void *ptr) { + wxTipWindow *src; + wxObject *dest; + src = (wxTipWindow *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +static wxTipWindow *new_wxTipWindow(wxWindow *parent,const wxString *text,wxCoord maxLength,wxRect *rectBound) { + wxString tmp = *text; + return new wxTipWindow(parent, tmp, maxLength, NULL, rectBound); + } + +static PyObject *_wrap_new_wxTipWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTipWindow * _result; + wxWindow * _arg0; + wxString * _arg1; + wxCoord _arg2 = (wxCoord ) 100; + wxRect * _arg3 = (wxRect *) NULL; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + wxRect temp; + PyObject * _obj3 = 0; + char *_kwnames[] = { "parent","text","maxLength","rectBound", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iO:new_wxTipWindow",_kwnames,&_argo0,&_obj1,&_arg2,&_obj3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxTipWindow. Expected _wxWindow_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} + if (_obj3) +{ + _arg3 = &temp; + if (! wxRect_helper(_obj3, &_arg3)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxTipWindow *)new_wxTipWindow(_arg0,_arg1,_arg2,_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxTipWindow_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxTipWindow_SetBoundingRect(_swigobj,_swigarg0) (_swigobj->SetBoundingRect(_swigarg0)) +static PyObject *_wrap_wxTipWindow_SetBoundingRect(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTipWindow * _arg0; + wxRect * _arg1; + PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","rectBound", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTipWindow_SetBoundingRect",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTipWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTipWindow_SetBoundingRect. Expected _wxTipWindow_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTipWindow_SetBoundingRect(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTipWindow_Close(_swigobj) (_swigobj->Close()) +static PyObject *_wrap_wxTipWindow_Close(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTipWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTipWindow_Close",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTipWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTipWindow_Close. Expected _wxTipWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTipWindow_Close(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static PyMethodDef windows3cMethods[] = { + { "wxTipWindow_Close", (PyCFunction) _wrap_wxTipWindow_Close, METH_VARARGS | METH_KEYWORDS }, + { "wxTipWindow_SetBoundingRect", (PyCFunction) _wrap_wxTipWindow_SetBoundingRect, METH_VARARGS | METH_KEYWORDS }, + { "new_wxTipWindow", (PyCFunction) _wrap_new_wxTipWindow, METH_VARARGS | METH_KEYWORDS }, { "wxLayoutAlgorithm_LayoutWindow", (PyCFunction) _wrap_wxLayoutAlgorithm_LayoutWindow, METH_VARARGS | METH_KEYWORDS }, { "wxLayoutAlgorithm_LayoutFrame", (PyCFunction) _wrap_wxLayoutAlgorithm_LayoutFrame, METH_VARARGS | METH_KEYWORDS }, { "wxLayoutAlgorithm_LayoutMDIFrame", (PyCFunction) _wrap_wxLayoutAlgorithm_LayoutMDIFrame, METH_VARARGS | METH_KEYWORDS }, @@ -2145,6 +2310,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, + { "_wxTopLevelWindow","_wxTipWindow",SwigwxTipWindowTowxTopLevelWindow}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -2173,6 +2339,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_WXTYPE","_unsigned_short",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, + { "_wxObject","_wxTipWindow",SwigwxTipWindowTowxObject}, { "_wxObject","_wxLayoutAlgorithm",SwigwxLayoutAlgorithmTowxObject}, { "_wxObject","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxObject}, { "_wxObject","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxObject}, @@ -2192,6 +2359,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_short","_WXTYPE",0}, { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, + { "_wxFrame","_wxTipWindow",SwigwxTipWindowTowxFrame}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, { "_wxWindowID","_time_t",0}, @@ -2226,8 +2394,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, + { "_wxEvtHandler","_wxTipWindow",SwigwxTipWindowTowxEvtHandler}, { "_wxEvtHandler","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler}, { "_wxEvtHandler","_wxSashWindow",SwigwxSashWindowTowxEvtHandler}, + { "_wxWindow","_wxTipWindow",SwigwxTipWindowTowxWindow}, { "_wxWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow}, { "_wxWindow","_wxSashWindow",SwigwxSashWindowTowxWindow}, {0,0,0}}; diff --git a/wxPython/src/mac/windows3.py b/wxPython/src/mac/windows3.py index 74f65c40b7..99921ddd94 100644 --- a/wxPython/src/mac/windows3.py +++ b/wxPython/src/mac/windows3.py @@ -271,6 +271,27 @@ class wxLayoutAlgorithm(wxLayoutAlgorithmPtr): +class wxTipWindowPtr(wxFramePtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def SetBoundingRect(self, *_args, **_kwargs): + val = windows3c.wxTipWindow_SetBoundingRect(self, *_args, **_kwargs) + return val + def Close(self, *_args, **_kwargs): + val = windows3c.wxTipWindow_Close(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxTipWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxTipWindow(wxTipWindowPtr): + def __init__(self,*_args,**_kwargs): + self.this = windows3c.new_wxTipWindow(*_args,**_kwargs) + self.thisown = 1 + self._setOORInfo(self) + + + + #-------------- FUNCTION WRAPPERS ------------------ diff --git a/wxPython/src/mac/wx.cpp b/wxPython/src/mac/wx.cpp index eed1d72bf4..96d64c89c2 100644 --- a/wxPython/src/mac/wx.cpp +++ b/wxPython/src/mac/wx.cpp @@ -2485,6 +2485,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxGROW", PyInt_FromLong((long) wxGROW)); PyDict_SetItemString(d,"wxEXPAND", PyInt_FromLong((long) wxEXPAND)); PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH)); + PyDict_SetItemString(d,"wxNB_TOP", PyInt_FromLong((long) wxNB_TOP)); PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT)); PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT)); PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM)); diff --git a/wxPython/src/mac/wx.py b/wxPython/src/mac/wx.py index fc8a51fd1d..067ed56261 100644 --- a/wxPython/src/mac/wx.py +++ b/wxPython/src/mac/wx.py @@ -483,6 +483,7 @@ wxSHRINK = wxc.wxSHRINK wxGROW = wxc.wxGROW wxEXPAND = wxc.wxEXPAND wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH +wxNB_TOP = wxc.wxNB_TOP wxNB_LEFT = wxc.wxNB_LEFT wxNB_RIGHT = wxc.wxNB_RIGHT wxNB_BOTTOM = wxc.wxNB_BOTTOM