Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWIGged updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-09-19 16:46:57 +00:00
parent 36a73f1d03
commit 854e7dc332
6 changed files with 304 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
wxPython/contrib/stc/mac/stc_.cpp
View File

@@ -9010,8 +9010,8 @@ static PyObject *_wrap_wxStyledTextCtrl_GetMouseDownCaptures(PyObject *self, PyO
return _resultobj;
}
#define wxStyledTextCtrl_SetCursor(_swigobj,_swigarg0) (_swigobj->SetCursor(_swigarg0))
static PyObject *_wrap_wxStyledTextCtrl_SetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
#define wxStyledTextCtrl_SetSTCCursor(_swigobj,_swigarg0) (_swigobj->SetSTCCursor(_swigarg0))
static PyObject *_wrap_wxStyledTextCtrl_SetSTCCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxStyledTextCtrl * _arg0;
int _arg1;
@@ -9019,18 +9019,18 @@ static PyObject *_wrap_wxStyledTextCtrl_SetCursor(PyObject *self, PyObject *args
char *_kwnames[] = { "self","cursorType", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_SetCursor",_kwnames,&_argo0,&_arg1))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_SetSTCCursor",_kwnames,&_argo0,&_arg1))
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_SetCursor. Expected _wxStyledTextCtrl_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetSTCCursor. Expected _wxStyledTextCtrl_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxStyledTextCtrl_SetCursor(_arg0,_arg1);
wxStyledTextCtrl_SetSTCCursor(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@@ -9039,8 +9039,8 @@ static PyObject *_wrap_wxStyledTextCtrl_SetCursor(PyObject *self, PyObject *args
return _resultobj;
}
#define wxStyledTextCtrl_GetCursor(_swigobj) (_swigobj->GetCursor())
static PyObject *_wrap_wxStyledTextCtrl_GetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
#define wxStyledTextCtrl_GetSTCCursor(_swigobj) (_swigobj->GetSTCCursor())
static PyObject *_wrap_wxStyledTextCtrl_GetSTCCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxStyledTextCtrl * _arg0;
@@ -9048,18 +9048,18 @@ static PyObject *_wrap_wxStyledTextCtrl_GetCursor(PyObject *self, PyObject *args
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_GetCursor",_kwnames,&_argo0))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_GetSTCCursor",_kwnames,&_argo0))
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_GetCursor. Expected _wxStyledTextCtrl_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_GetSTCCursor. Expected _wxStyledTextCtrl_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxStyledTextCtrl_GetCursor(_arg0);
_result = (int )wxStyledTextCtrl_GetSTCCursor(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@@ -10626,6 +10626,78 @@ static PyObject *_wrap_wxStyledTextCtrl_LoadFile(PyObject *self, PyObject *args,
return _resultobj;
}
#define wxStyledTextCtrl_DoDragOver(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->DoDragOver(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_wxStyledTextCtrl_DoDragOver(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxDragResult _result;
wxStyledTextCtrl * _arg0;
wxCoord _arg1;
wxCoord _arg2;
wxDragResult _arg3;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","x","y","def", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxStyledTextCtrl_DoDragOver",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3))
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_DoDragOver. Expected _wxStyledTextCtrl_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxDragResult )wxStyledTextCtrl_DoDragOver(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxStyledTextCtrl_DoDropText(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->DoDropText(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_wxStyledTextCtrl_DoDropText(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxStyledTextCtrl * _arg0;
long _arg1;
long _arg2;
wxString * _arg3;
PyObject * _argo0 = 0;
PyObject * _obj3 = 0;
char *_kwnames[] = { "self","x","y","data", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OllO:wxStyledTextCtrl_DoDropText",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3))
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_DoDropText. Expected _wxStyledTextCtrl_p.");
return NULL;
}
}
{
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxStyledTextCtrl_DoDropText(_arg0,_arg1,_arg2,*_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
if (_obj3)
delete _arg3;
}
return _resultobj;
}
static void *SwigwxStyledTextEventTowxCommandEvent(void *ptr) {
wxStyledTextEvent *src;
wxCommandEvent *dest;
@@ -12052,6 +12124,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_DoDropText", (PyCFunction) _wrap_wxStyledTextCtrl_DoDropText, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_DoDragOver", (PyCFunction) _wrap_wxStyledTextCtrl_DoDragOver, 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 },
@@ -12100,8 +12174,8 @@ static PyMethodDef stc_cMethods[] = {
{ "wxStyledTextCtrl_WordPartLeft", (PyCFunction) _wrap_wxStyledTextCtrl_WordPartLeft, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_GetControlCharSymbol", (PyCFunction) _wrap_wxStyledTextCtrl_GetControlCharSymbol, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_SetControlCharSymbol", (PyCFunction) _wrap_wxStyledTextCtrl_SetControlCharSymbol, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_GetCursor", (PyCFunction) _wrap_wxStyledTextCtrl_GetCursor, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_SetCursor", (PyCFunction) _wrap_wxStyledTextCtrl_SetCursor, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_GetSTCCursor", (PyCFunction) _wrap_wxStyledTextCtrl_GetSTCCursor, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_SetSTCCursor", (PyCFunction) _wrap_wxStyledTextCtrl_SetSTCCursor, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_GetMouseDownCaptures", (PyCFunction) _wrap_wxStyledTextCtrl_GetMouseDownCaptures, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_SetMouseDownCaptures", (PyCFunction) _wrap_wxStyledTextCtrl_SetMouseDownCaptures, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_GetStatus", (PyCFunction) _wrap_wxStyledTextCtrl_GetStatus, METH_VARARGS | METH_KEYWORDS },
@@ -12602,6 +12676,7 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_INDIC_TT", PyInt_FromLong((long) 2));
PyDict_SetItemString(d,"wxSTC_INDIC_DIAGONAL", PyInt_FromLong((long) 3));
PyDict_SetItemString(d,"wxSTC_INDIC_STRIKE", PyInt_FromLong((long) 4));
PyDict_SetItemString(d,"wxSTC_INDIC_HIDDEN", PyInt_FromLong((long) 5));
PyDict_SetItemString(d,"wxSTC_INDIC0_MASK", PyInt_FromLong((long) 0x20));
PyDict_SetItemString(d,"wxSTC_INDIC1_MASK", PyInt_FromLong((long) 0x40));
PyDict_SetItemString(d,"wxSTC_INDIC2_MASK", PyInt_FromLong((long) 0x80));
@@ -12648,6 +12723,7 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_CARET_STRICT", PyInt_FromLong((long) 0x04));
PyDict_SetItemString(d,"wxSTC_CARET_JUMPS", PyInt_FromLong((long) 0x10));
PyDict_SetItemString(d,"wxSTC_CARET_EVEN", PyInt_FromLong((long) 0x08));
PyDict_SetItemString(d,"wxSTC_KEYWORDSET_MAX", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_MOD_INSERTTEXT", PyInt_FromLong((long) 0x1));
PyDict_SetItemString(d,"wxSTC_MOD_DELETETEXT", PyInt_FromLong((long) 0x2));
PyDict_SetItemString(d,"wxSTC_MOD_CHANGESTYLE", PyInt_FromLong((long) 0x4));
@@ -12722,6 +12798,9 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_LEX_POV", PyInt_FromLong((long) 39));
PyDict_SetItemString(d,"wxSTC_LEX_LOUT", PyInt_FromLong((long) 40));
PyDict_SetItemString(d,"wxSTC_LEX_ESCRIPT", PyInt_FromLong((long) 41));
PyDict_SetItemString(d,"wxSTC_LEX_PS", PyInt_FromLong((long) 42));
PyDict_SetItemString(d,"wxSTC_LEX_NSIS", PyInt_FromLong((long) 43));
PyDict_SetItemString(d,"wxSTC_LEX_MMIXAL", PyInt_FromLong((long) 44));
PyDict_SetItemString(d,"wxSTC_LEX_AUTOMATIC", PyInt_FromLong((long) 1000));
PyDict_SetItemString(d,"wxSTC_P_DEFAULT", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_P_COMMENTLINE", PyInt_FromLong((long) 1));
@@ -12934,6 +13013,8 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_LUA_WORD4", PyInt_FromLong((long) 15));
PyDict_SetItemString(d,"wxSTC_LUA_WORD5", PyInt_FromLong((long) 16));
PyDict_SetItemString(d,"wxSTC_LUA_WORD6", PyInt_FromLong((long) 17));
PyDict_SetItemString(d,"wxSTC_LUA_WORD7", PyInt_FromLong((long) 18));
PyDict_SetItemString(d,"wxSTC_LUA_WORD8", PyInt_FromLong((long) 19));
PyDict_SetItemString(d,"wxSTC_ERR_DEFAULT", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_ERR_PYTHON", PyInt_FromLong((long) 1));
PyDict_SetItemString(d,"wxSTC_ERR_GCC", PyInt_FromLong((long) 2));
@@ -13121,14 +13202,20 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_POV_DEFAULT", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_POV_COMMENT", PyInt_FromLong((long) 1));
PyDict_SetItemString(d,"wxSTC_POV_COMMENTLINE", PyInt_FromLong((long) 2));
PyDict_SetItemString(d,"wxSTC_POV_COMMENTDOC", PyInt_FromLong((long) 3));
PyDict_SetItemString(d,"wxSTC_POV_NUMBER", PyInt_FromLong((long) 4));
PyDict_SetItemString(d,"wxSTC_POV_WORD", PyInt_FromLong((long) 5));
PyDict_SetItemString(d,"wxSTC_POV_NUMBER", PyInt_FromLong((long) 3));
PyDict_SetItemString(d,"wxSTC_POV_OPERATOR", PyInt_FromLong((long) 4));
PyDict_SetItemString(d,"wxSTC_POV_IDENTIFIER", PyInt_FromLong((long) 5));
PyDict_SetItemString(d,"wxSTC_POV_STRING", PyInt_FromLong((long) 6));
PyDict_SetItemString(d,"wxSTC_POV_OPERATOR", PyInt_FromLong((long) 7));
PyDict_SetItemString(d,"wxSTC_POV_IDENTIFIER", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_POV_BRACE", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_POV_STRINGEOL", PyInt_FromLong((long) 7));
PyDict_SetItemString(d,"wxSTC_POV_DIRECTIVE", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_POV_BADDIRECTIVE", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_POV_WORD2", PyInt_FromLong((long) 10));
PyDict_SetItemString(d,"wxSTC_POV_WORD3", PyInt_FromLong((long) 11));
PyDict_SetItemString(d,"wxSTC_POV_WORD4", PyInt_FromLong((long) 12));
PyDict_SetItemString(d,"wxSTC_POV_WORD5", PyInt_FromLong((long) 13));
PyDict_SetItemString(d,"wxSTC_POV_WORD6", PyInt_FromLong((long) 14));
PyDict_SetItemString(d,"wxSTC_POV_WORD7", PyInt_FromLong((long) 15));
PyDict_SetItemString(d,"wxSTC_POV_WORD8", PyInt_FromLong((long) 16));
PyDict_SetItemString(d,"wxSTC_LOUT_DEFAULT", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_LOUT_COMMENT", PyInt_FromLong((long) 1));
PyDict_SetItemString(d,"wxSTC_LOUT_NUMBER", PyInt_FromLong((long) 2));
@@ -13152,6 +13239,54 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_ESCRIPT_BRACE", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD2", PyInt_FromLong((long) 10));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD3", PyInt_FromLong((long) 11));
PyDict_SetItemString(d,"wxSTC_PS_DEFAULT", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_PS_COMMENT", PyInt_FromLong((long) 1));
PyDict_SetItemString(d,"wxSTC_PS_DSC_COMMENT", PyInt_FromLong((long) 2));
PyDict_SetItemString(d,"wxSTC_PS_DSC_VALUE", PyInt_FromLong((long) 3));
PyDict_SetItemString(d,"wxSTC_PS_NUMBER", PyInt_FromLong((long) 4));
PyDict_SetItemString(d,"wxSTC_PS_NAME", PyInt_FromLong((long) 5));
PyDict_SetItemString(d,"wxSTC_PS_KEYWORD", PyInt_FromLong((long) 6));
PyDict_SetItemString(d,"wxSTC_PS_LITERAL", PyInt_FromLong((long) 7));
PyDict_SetItemString(d,"wxSTC_PS_IMMEVAL", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_PS_PAREN_ARRAY", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_PS_PAREN_DICT", PyInt_FromLong((long) 10));
PyDict_SetItemString(d,"wxSTC_PS_PAREN_PROC", PyInt_FromLong((long) 11));
PyDict_SetItemString(d,"wxSTC_PS_TEXT", PyInt_FromLong((long) 12));
PyDict_SetItemString(d,"wxSTC_PS_HEXSTRING", PyInt_FromLong((long) 13));
PyDict_SetItemString(d,"wxSTC_PS_BASE85STRING", PyInt_FromLong((long) 14));
PyDict_SetItemString(d,"wxSTC_PS_BADSTRINGCHAR", PyInt_FromLong((long) 15));
PyDict_SetItemString(d,"wxSTC_NSIS_DEFAULT", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_NSIS_COMMENT", PyInt_FromLong((long) 1));
PyDict_SetItemString(d,"wxSTC_NSIS_STRINGDQ", PyInt_FromLong((long) 2));
PyDict_SetItemString(d,"wxSTC_NSIS_STRINGLQ", PyInt_FromLong((long) 3));
PyDict_SetItemString(d,"wxSTC_NSIS_STRINGRQ", PyInt_FromLong((long) 4));
PyDict_SetItemString(d,"wxSTC_NSIS_FUNCTION", PyInt_FromLong((long) 5));
PyDict_SetItemString(d,"wxSTC_NSIS_VARIABLE", PyInt_FromLong((long) 6));
PyDict_SetItemString(d,"wxSTC_NSIS_LABEL", PyInt_FromLong((long) 7));
PyDict_SetItemString(d,"wxSTC_NSIS_USERDEFINED", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_NSIS_SECTIONDEF", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_NSIS_SUBSECTIONDEF", PyInt_FromLong((long) 10));
PyDict_SetItemString(d,"wxSTC_NSIS_IFDEFINEDEF", PyInt_FromLong((long) 11));
PyDict_SetItemString(d,"wxSTC_NSIS_MACRODEF", PyInt_FromLong((long) 12));
PyDict_SetItemString(d,"wxSTC_NSIS_STRINGVAR", PyInt_FromLong((long) 13));
PyDict_SetItemString(d,"wxSTC_MMIXAL_LEADWS", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_MMIXAL_COMMENT", PyInt_FromLong((long) 1));
PyDict_SetItemString(d,"wxSTC_MMIXAL_LABEL", PyInt_FromLong((long) 2));
PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE", PyInt_FromLong((long) 3));
PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_PRE", PyInt_FromLong((long) 4));
PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_VALID", PyInt_FromLong((long) 5));
PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_UNKNOWN", PyInt_FromLong((long) 6));
PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_POST", PyInt_FromLong((long) 7));
PyDict_SetItemString(d,"wxSTC_MMIXAL_OPERANDS", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_MMIXAL_NUMBER", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_MMIXAL_REF", PyInt_FromLong((long) 10));
PyDict_SetItemString(d,"wxSTC_MMIXAL_CHAR", PyInt_FromLong((long) 11));
PyDict_SetItemString(d,"wxSTC_MMIXAL_STRING", PyInt_FromLong((long) 12));
PyDict_SetItemString(d,"wxSTC_MMIXAL_REGISTER", PyInt_FromLong((long) 13));
PyDict_SetItemString(d,"wxSTC_MMIXAL_HEX", PyInt_FromLong((long) 14));
PyDict_SetItemString(d,"wxSTC_MMIXAL_OPERATOR", PyInt_FromLong((long) 15));
PyDict_SetItemString(d,"wxSTC_MMIXAL_SYMBOL", PyInt_FromLong((long) 16));
PyDict_SetItemString(d,"wxSTC_MMIXAL_INCLUDE", PyInt_FromLong((long) 17));
PyDict_SetItemString(d,"wxSTC_CMD_REDO", PyInt_FromLong((long) 2011));
PyDict_SetItemString(d,"wxSTC_CMD_SELECTALL", PyInt_FromLong((long) 2013));
PyDict_SetItemString(d,"wxSTC_CMD_UNDO", PyInt_FromLong((long) 2176));

83
wxPython/contrib/stc/mac/stc_.py
View File

@@ -984,11 +984,11 @@ class wxStyledTextCtrlPtr(wxControlPtr):
def GetMouseDownCaptures(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_GetMouseDownCaptures(self, *_args, **_kwargs)
return val
def SetCursor(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_SetCursor(self, *_args, **_kwargs)
def SetSTCCursor(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_SetSTCCursor(self, *_args, **_kwargs)
return val
def GetCursor(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_GetCursor(self, *_args, **_kwargs)
def GetSTCCursor(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_GetSTCCursor(self, *_args, **_kwargs)
return val
def SetControlCharSymbol(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_SetControlCharSymbol(self, *_args, **_kwargs)
@@ -1135,6 +1135,12 @@ class wxStyledTextCtrlPtr(wxControlPtr):
def LoadFile(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_LoadFile(self, *_args, **_kwargs)
return val
def DoDragOver(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_DoDragOver(self, *_args, **_kwargs)
return val
def DoDropText(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_DoDropText(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):
@@ -1394,6 +1400,7 @@ wxSTC_INDIC_SQUIGGLE = stc_c.wxSTC_INDIC_SQUIGGLE
wxSTC_INDIC_TT = stc_c.wxSTC_INDIC_TT
wxSTC_INDIC_DIAGONAL = stc_c.wxSTC_INDIC_DIAGONAL
wxSTC_INDIC_STRIKE = stc_c.wxSTC_INDIC_STRIKE
wxSTC_INDIC_HIDDEN = stc_c.wxSTC_INDIC_HIDDEN
wxSTC_INDIC0_MASK = stc_c.wxSTC_INDIC0_MASK
wxSTC_INDIC1_MASK = stc_c.wxSTC_INDIC1_MASK
wxSTC_INDIC2_MASK = stc_c.wxSTC_INDIC2_MASK
@@ -1440,6 +1447,7 @@ wxSTC_CARET_SLOP = stc_c.wxSTC_CARET_SLOP
wxSTC_CARET_STRICT = stc_c.wxSTC_CARET_STRICT
wxSTC_CARET_JUMPS = stc_c.wxSTC_CARET_JUMPS
wxSTC_CARET_EVEN = stc_c.wxSTC_CARET_EVEN
wxSTC_KEYWORDSET_MAX = stc_c.wxSTC_KEYWORDSET_MAX
wxSTC_MOD_INSERTTEXT = stc_c.wxSTC_MOD_INSERTTEXT
wxSTC_MOD_DELETETEXT = stc_c.wxSTC_MOD_DELETETEXT
wxSTC_MOD_CHANGESTYLE = stc_c.wxSTC_MOD_CHANGESTYLE
@@ -1514,6 +1522,9 @@ wxSTC_LEX_CSS = stc_c.wxSTC_LEX_CSS
wxSTC_LEX_POV = stc_c.wxSTC_LEX_POV
wxSTC_LEX_LOUT = stc_c.wxSTC_LEX_LOUT
wxSTC_LEX_ESCRIPT = stc_c.wxSTC_LEX_ESCRIPT
wxSTC_LEX_PS = stc_c.wxSTC_LEX_PS
wxSTC_LEX_NSIS = stc_c.wxSTC_LEX_NSIS
wxSTC_LEX_MMIXAL = stc_c.wxSTC_LEX_MMIXAL
wxSTC_LEX_AUTOMATIC = stc_c.wxSTC_LEX_AUTOMATIC
wxSTC_P_DEFAULT = stc_c.wxSTC_P_DEFAULT
wxSTC_P_COMMENTLINE = stc_c.wxSTC_P_COMMENTLINE
@@ -1726,6 +1737,8 @@ wxSTC_LUA_WORD3 = stc_c.wxSTC_LUA_WORD3
wxSTC_LUA_WORD4 = stc_c.wxSTC_LUA_WORD4
wxSTC_LUA_WORD5 = stc_c.wxSTC_LUA_WORD5
wxSTC_LUA_WORD6 = stc_c.wxSTC_LUA_WORD6
wxSTC_LUA_WORD7 = stc_c.wxSTC_LUA_WORD7
wxSTC_LUA_WORD8 = stc_c.wxSTC_LUA_WORD8
wxSTC_ERR_DEFAULT = stc_c.wxSTC_ERR_DEFAULT
wxSTC_ERR_PYTHON = stc_c.wxSTC_ERR_PYTHON
wxSTC_ERR_GCC = stc_c.wxSTC_ERR_GCC
@@ -1913,14 +1926,20 @@ wxSTC_CSS_SINGLESTRING = stc_c.wxSTC_CSS_SINGLESTRING
wxSTC_POV_DEFAULT = stc_c.wxSTC_POV_DEFAULT
wxSTC_POV_COMMENT = stc_c.wxSTC_POV_COMMENT
wxSTC_POV_COMMENTLINE = stc_c.wxSTC_POV_COMMENTLINE
wxSTC_POV_COMMENTDOC = stc_c.wxSTC_POV_COMMENTDOC
wxSTC_POV_NUMBER = stc_c.wxSTC_POV_NUMBER
wxSTC_POV_WORD = stc_c.wxSTC_POV_WORD
wxSTC_POV_STRING = stc_c.wxSTC_POV_STRING
wxSTC_POV_OPERATOR = stc_c.wxSTC_POV_OPERATOR
wxSTC_POV_IDENTIFIER = stc_c.wxSTC_POV_IDENTIFIER
wxSTC_POV_BRACE = stc_c.wxSTC_POV_BRACE
wxSTC_POV_STRING = stc_c.wxSTC_POV_STRING
wxSTC_POV_STRINGEOL = stc_c.wxSTC_POV_STRINGEOL
wxSTC_POV_DIRECTIVE = stc_c.wxSTC_POV_DIRECTIVE
wxSTC_POV_BADDIRECTIVE = stc_c.wxSTC_POV_BADDIRECTIVE
wxSTC_POV_WORD2 = stc_c.wxSTC_POV_WORD2
wxSTC_POV_WORD3 = stc_c.wxSTC_POV_WORD3
wxSTC_POV_WORD4 = stc_c.wxSTC_POV_WORD4
wxSTC_POV_WORD5 = stc_c.wxSTC_POV_WORD5
wxSTC_POV_WORD6 = stc_c.wxSTC_POV_WORD6
wxSTC_POV_WORD7 = stc_c.wxSTC_POV_WORD7
wxSTC_POV_WORD8 = stc_c.wxSTC_POV_WORD8
wxSTC_LOUT_DEFAULT = stc_c.wxSTC_LOUT_DEFAULT
wxSTC_LOUT_COMMENT = stc_c.wxSTC_LOUT_COMMENT
wxSTC_LOUT_NUMBER = stc_c.wxSTC_LOUT_NUMBER
@@ -1944,6 +1963,54 @@ wxSTC_ESCRIPT_IDENTIFIER = stc_c.wxSTC_ESCRIPT_IDENTIFIER
wxSTC_ESCRIPT_BRACE = stc_c.wxSTC_ESCRIPT_BRACE
wxSTC_ESCRIPT_WORD2 = stc_c.wxSTC_ESCRIPT_WORD2
wxSTC_ESCRIPT_WORD3 = stc_c.wxSTC_ESCRIPT_WORD3
wxSTC_PS_DEFAULT = stc_c.wxSTC_PS_DEFAULT
wxSTC_PS_COMMENT = stc_c.wxSTC_PS_COMMENT
wxSTC_PS_DSC_COMMENT = stc_c.wxSTC_PS_DSC_COMMENT
wxSTC_PS_DSC_VALUE = stc_c.wxSTC_PS_DSC_VALUE
wxSTC_PS_NUMBER = stc_c.wxSTC_PS_NUMBER
wxSTC_PS_NAME = stc_c.wxSTC_PS_NAME
wxSTC_PS_KEYWORD = stc_c.wxSTC_PS_KEYWORD
wxSTC_PS_LITERAL = stc_c.wxSTC_PS_LITERAL
wxSTC_PS_IMMEVAL = stc_c.wxSTC_PS_IMMEVAL
wxSTC_PS_PAREN_ARRAY = stc_c.wxSTC_PS_PAREN_ARRAY
wxSTC_PS_PAREN_DICT = stc_c.wxSTC_PS_PAREN_DICT
wxSTC_PS_PAREN_PROC = stc_c.wxSTC_PS_PAREN_PROC
wxSTC_PS_TEXT = stc_c.wxSTC_PS_TEXT
wxSTC_PS_HEXSTRING = stc_c.wxSTC_PS_HEXSTRING
wxSTC_PS_BASE85STRING = stc_c.wxSTC_PS_BASE85STRING
wxSTC_PS_BADSTRINGCHAR = stc_c.wxSTC_PS_BADSTRINGCHAR
wxSTC_NSIS_DEFAULT = stc_c.wxSTC_NSIS_DEFAULT
wxSTC_NSIS_COMMENT = stc_c.wxSTC_NSIS_COMMENT
wxSTC_NSIS_STRINGDQ = stc_c.wxSTC_NSIS_STRINGDQ
wxSTC_NSIS_STRINGLQ = stc_c.wxSTC_NSIS_STRINGLQ
wxSTC_NSIS_STRINGRQ = stc_c.wxSTC_NSIS_STRINGRQ
wxSTC_NSIS_FUNCTION = stc_c.wxSTC_NSIS_FUNCTION
wxSTC_NSIS_VARIABLE = stc_c.wxSTC_NSIS_VARIABLE
wxSTC_NSIS_LABEL = stc_c.wxSTC_NSIS_LABEL
wxSTC_NSIS_USERDEFINED = stc_c.wxSTC_NSIS_USERDEFINED
wxSTC_NSIS_SECTIONDEF = stc_c.wxSTC_NSIS_SECTIONDEF
wxSTC_NSIS_SUBSECTIONDEF = stc_c.wxSTC_NSIS_SUBSECTIONDEF
wxSTC_NSIS_IFDEFINEDEF = stc_c.wxSTC_NSIS_IFDEFINEDEF
wxSTC_NSIS_MACRODEF = stc_c.wxSTC_NSIS_MACRODEF
wxSTC_NSIS_STRINGVAR = stc_c.wxSTC_NSIS_STRINGVAR
wxSTC_MMIXAL_LEADWS = stc_c.wxSTC_MMIXAL_LEADWS
wxSTC_MMIXAL_COMMENT = stc_c.wxSTC_MMIXAL_COMMENT
wxSTC_MMIXAL_LABEL = stc_c.wxSTC_MMIXAL_LABEL
wxSTC_MMIXAL_OPCODE = stc_c.wxSTC_MMIXAL_OPCODE
wxSTC_MMIXAL_OPCODE_PRE = stc_c.wxSTC_MMIXAL_OPCODE_PRE
wxSTC_MMIXAL_OPCODE_VALID = stc_c.wxSTC_MMIXAL_OPCODE_VALID
wxSTC_MMIXAL_OPCODE_UNKNOWN = stc_c.wxSTC_MMIXAL_OPCODE_UNKNOWN
wxSTC_MMIXAL_OPCODE_POST = stc_c.wxSTC_MMIXAL_OPCODE_POST
wxSTC_MMIXAL_OPERANDS = stc_c.wxSTC_MMIXAL_OPERANDS
wxSTC_MMIXAL_NUMBER = stc_c.wxSTC_MMIXAL_NUMBER
wxSTC_MMIXAL_REF = stc_c.wxSTC_MMIXAL_REF
wxSTC_MMIXAL_CHAR = stc_c.wxSTC_MMIXAL_CHAR
wxSTC_MMIXAL_STRING = stc_c.wxSTC_MMIXAL_STRING
wxSTC_MMIXAL_REGISTER = stc_c.wxSTC_MMIXAL_REGISTER
wxSTC_MMIXAL_HEX = stc_c.wxSTC_MMIXAL_HEX
wxSTC_MMIXAL_OPERATOR = stc_c.wxSTC_MMIXAL_OPERATOR
wxSTC_MMIXAL_SYMBOL = stc_c.wxSTC_MMIXAL_SYMBOL
wxSTC_MMIXAL_INCLUDE = stc_c.wxSTC_MMIXAL_INCLUDE
wxSTC_CMD_REDO = stc_c.wxSTC_CMD_REDO
wxSTC_CMD_SELECTALL = stc_c.wxSTC_CMD_SELECTALL
wxSTC_CMD_UNDO = stc_c.wxSTC_CMD_UNDO

6
wxPython/src/mac/grid.cpp
View File

@@ -2725,6 +2725,7 @@ static PyObject *_wrap_wxPyGridCellEditor_base_PaintBackground(PyObject *self, P
#define wxPyGridCellEditor_base_IsAcceptedKey(_swigobj,_swigarg0) (_swigobj->base_IsAcceptedKey(_swigarg0))
static PyObject *_wrap_wxPyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxPyGridCellEditor * _arg0;
wxKeyEvent * _arg1;
PyObject * _argo0 = 0;
@@ -2749,12 +2750,11 @@ static PyObject *_wrap_wxPyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyGridCellEditor_base_IsAcceptedKey(_arg0,*_arg1);
_result = (bool )wxPyGridCellEditor_base_IsAcceptedKey(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}

78
wxPython/src/mac/misc2.cpp
View File

@@ -318,15 +318,80 @@ public:
#ifdef __WXMSW__
#include <wx/msw/private.h>
#include <wx/dynload.h>
#endif
void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc)
void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc, int method)
{
#ifdef __WXMSW__
switch (method)
{
case 1:
// This one only partially works. Appears to be an undocumented
// "standard" convention that not all widgets adhear to. For
// example, for some widgets backgrounds or non-client areas may
// not be painted.
::SendMessage(GetHwndOf(window), WM_PAINT, (long)GetHdcOf(dc), 0);
// ::SendMessage(GetHwndOf(window), WM_PRINTCLIENT, (long)GetHdcOf(dc),
// PRF_CLIENT | PRF_NONCLIENT | PRF_CHILDREN );
break;
case 2:
// This one works much better, except for on XP. On Win2k nearly
// all widgets and their children are captured correctly[**]. On
// XP with Themes activated most native widgets draw only
// partially, if at all. Without themes it works just like on
// Win2k.
//
// ** For example the radio buttons in a wxRadioBox are not its
// children by default, but you can capture it via the panel
// instead, or change RADIOBTN_PARENT_IS_RADIOBOX in radiobox.cpp.
::SendMessage(GetHwndOf(window), WM_PRINT, (long)GetHdcOf(dc),
PRF_CLIENT | PRF_NONCLIENT | PRF_CHILDREN |
PRF_ERASEBKGND | PRF_OWNED );
break;
case 3:
// This one is only defined in the latest SDK and is only
// available on XP. MSDN says it is similar to sending WM_PRINT
// so I expect that it will work similar to the above. Since it
// is avaialble only on XP, it can't be compiled like this and
// will have to be loaded dynamically.
// //::PrintWindow(GetHwndOf(window), GetHdcOf(dc), 0); //break;
// fall through
case 4:
// Use PrintWindow if available, or fallback to WM_PRINT
// otherwise. Unfortunately using PrintWindow is even worse than
// WM_PRINT. For most native widgets nothing is drawn to the dc
// at all, with or without Themes.
typedef BOOL (WINAPI *PrintWindow_t)(HWND, HDC, UINT);
static bool s_triedToLoad = false;
static PrintWindow_t pfnPrintWindow = NULL;
if ( !s_triedToLoad )
{
s_triedToLoad = true;
wxDynamicLibrary dllUser32(_T("user32.dll"));
if ( dllUser32.IsLoaded() )
{
wxLogNull nolog; // Don't report errors here
pfnPrintWindow = (PrintWindow_t)dllUser32.GetSymbol(_T("PrintWindow"));
}
}
if (pfnPrintWindow)
{
printf("Using PrintWindow\n");
pfnPrintWindow(GetHwndOf(window), GetHdcOf(dc), 0);
}
else
{
printf("Using WM_PRINT\n");
::SendMessage(GetHwndOf(window), WM_PRINT, (long)GetHdcOf(dc),
PRF_CLIENT | PRF_NONCLIENT | PRF_CHILDREN | PRF_ERASEBKGND | PRF_OWNED );
}
}
#endif
}
@@ -2303,12 +2368,13 @@ static PyObject *_wrap_wxDrawWindowOnDC(PyObject *self, PyObject *args, PyObject
PyObject * _resultobj;
wxWindow * _arg0;
wxDC * _arg1;
int _arg2;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "window","dc", NULL };
char *_kwnames[] = { "window","dc","method", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDrawWindowOnDC",_kwnames,&_argo0,&_argo1))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxDrawWindowOnDC",_kwnames,&_argo0,&_argo1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2325,7 +2391,7 @@ static PyObject *_wrap_wxDrawWindowOnDC(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDrawWindowOnDC(_arg0,*_arg1);
wxDrawWindowOnDC(_arg0,*_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;

41
wxPython/src/mac/wx.cpp
View File

@@ -1789,24 +1789,6 @@ static PyObject *_wrap_wxPyApp_SetAssertMode(PyObject *self, PyObject *args, PyO
return _resultobj;
}
static PyObject *_wrap_wxPyApp_GetMacDefaultEncodingIsPC(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxPyApp_GetMacDefaultEncodingIsPC",_kwnames))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxPyApp::GetMacDefaultEncodingIsPC();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static PyObject *_wrap_wxPyApp_GetMacSupportPCMenuShortcuts(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
@@ -1906,27 +1888,6 @@ static PyObject *_wrap_wxPyApp_GetMacHelpMenuTitleName(PyObject *self, PyObject
return _resultobj;
}
static PyObject *_wrap_wxPyApp_SetMacDefaultEncodingIsPC(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _arg0;
int tempbool0;
char *_kwnames[] = { "val", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxPyApp_SetMacDefaultEncodingIsPC",_kwnames,&tempbool0))
return NULL;
_arg0 = (bool ) tempbool0;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyApp::SetMacDefaultEncodingIsPC(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static PyObject *_wrap_wxPyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _arg0;
@@ -2040,13 +2001,11 @@ static PyMethodDef wxcMethods[] = {
{ "wxPyApp_SetMacPreferencesMenuItemId", (PyCFunction) _wrap_wxPyApp_SetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_SetMacAboutMenuItemId", (PyCFunction) _wrap_wxPyApp_SetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_SetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_wxPyApp_SetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_SetMacDefaultEncodingIsPC", (PyCFunction) _wrap_wxPyApp_SetMacDefaultEncodingIsPC, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_GetMacHelpMenuTitleName", (PyCFunction) _wrap_wxPyApp_GetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_GetMacExitMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_GetMacPreferencesMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_GetMacAboutMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_GetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_wxPyApp_GetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_GetMacDefaultEncodingIsPC", (PyCFunction) _wrap_wxPyApp_GetMacDefaultEncodingIsPC, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_SetAssertMode", (PyCFunction) _wrap_wxPyApp_SetAssertMode, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_GetAssertMode", (PyCFunction) _wrap_wxPyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS },
{ "wxPyApp_SetUseBestVisual", (PyCFunction) _wrap_wxPyApp_SetUseBestVisual, METH_VARARGS | METH_KEYWORDS },

6
wxPython/src/mac/wx.py
View File

@@ -164,8 +164,6 @@ def wxGetApp(*_args, **_kwargs):
wxApp_CleanUp = wxc.wxApp_CleanUp
wxPyApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC
wxPyApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts
wxPyApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId
@@ -176,8 +174,6 @@ wxPyApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId
wxPyApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName
wxPyApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC
wxPyApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts
wxPyApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId
@@ -1942,13 +1938,11 @@ of your Mac."""
# change from wxPyApp_ to wxApp_
wxApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC
wxApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts
wxApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId
wxApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId
wxApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId
wxApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName
wxApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC
wxApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts
wxApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId
wxApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId