wxMac updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2789,7 +2789,7 @@ static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args, PyObject
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
_result = (wxFontDialog *)new_wxFontDialog(_arg0,_arg1);
|
||||
_result = (wxFontDialog *)new_wxFontDialog(_arg0,*_arg1);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
|
||||
@@ -2471,17 +2471,17 @@ static PyObject *_wrap_wxSystemSettings_HasFeature(PyObject *self, PyObject *arg
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject *_wrap_wxSystemSettings_GetScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
static PyObject *_wrap_wxSystemSettings_GetScreenType(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxSystemScreen _result;
|
||||
wxSystemScreenType _result;
|
||||
char *_kwnames[] = { NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxSystemSettings_GetScreen",_kwnames))
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxSystemSettings_GetScreenType",_kwnames))
|
||||
return NULL;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
_result = (wxSystemScreen )wxSystemSettings::GetScreenType();
|
||||
_result = (wxSystemScreenType )wxSystemSettings::GetScreenType();
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
@@ -2489,17 +2489,17 @@ static PyObject *_wrap_wxSystemSettings_GetScreen(PyObject *self, PyObject *args
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject *_wrap_wxSystemSettings_SetScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
static PyObject *_wrap_wxSystemSettings_SetScreenType(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxSystemScreen _arg0;
|
||||
wxSystemScreenType _arg0;
|
||||
char *_kwnames[] = { "screen", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_SetScreen",_kwnames,&_arg0))
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_SetScreenType",_kwnames,&_arg0))
|
||||
return NULL;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxSystemSettings::SetScreen(_arg0);
|
||||
wxSystemSettings::SetScreenType(_arg0);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
@@ -10106,8 +10106,8 @@ static PyMethodDef misc2cMethods[] = {
|
||||
{ "wxToolTip_GetTip", (PyCFunction) _wrap_wxToolTip_GetTip, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxToolTip_SetTip", (PyCFunction) _wrap_wxToolTip_SetTip, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "new_wxToolTip", (PyCFunction) _wrap_new_wxToolTip, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSystemSettings_SetScreen", (PyCFunction) _wrap_wxSystemSettings_SetScreen, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSystemSettings_GetScreen", (PyCFunction) _wrap_wxSystemSettings_GetScreen, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSystemSettings_SetScreenType", (PyCFunction) _wrap_wxSystemSettings_SetScreenType, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSystemSettings_GetScreenType", (PyCFunction) _wrap_wxSystemSettings_GetScreenType, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSystemSettings_HasFeature", (PyCFunction) _wrap_wxSystemSettings_HasFeature, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSystemSettings_GetMetric", (PyCFunction) _wrap_wxSystemSettings_GetMetric, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSystemSettings_GetFont", (PyCFunction) _wrap_wxSystemSettings_GetFont, METH_VARARGS | METH_KEYWORDS },
|
||||
@@ -10395,10 +10395,10 @@ SWIGEXPORT(void) initmisc2c() {
|
||||
PyDict_SetItemString(d,"wxSYS_CAN_DRAW_FRAME_DECORATIONS", PyInt_FromLong((long) wxSYS_CAN_DRAW_FRAME_DECORATIONS));
|
||||
PyDict_SetItemString(d,"wxSYS_CAN_ICONIZE_FRAME", PyInt_FromLong((long) wxSYS_CAN_ICONIZE_FRAME));
|
||||
PyDict_SetItemString(d,"wxSYS_SCREEN_NONE", PyInt_FromLong((long) wxSYS_SCREEN_NONE));
|
||||
PyDict_SetItemString(d,"wxSYS_SCREEN_DESKTOP", PyInt_FromLong((long) wxSYS_SCREEN_DESKTOP));
|
||||
PyDict_SetItemString(d,"wxSYS_SCREEN_SMALL", PyInt_FromLong((long) wxSYS_SCREEN_SMALL));
|
||||
PyDict_SetItemString(d,"wxSYS_SCREEN_PDA", PyInt_FromLong((long) wxSYS_SCREEN_PDA));
|
||||
PyDict_SetItemString(d,"wxSYS_SCREEN_TINY", PyInt_FromLong((long) wxSYS_SCREEN_TINY));
|
||||
PyDict_SetItemString(d,"wxSYS_SCREEN_PDA", PyInt_FromLong((long) wxSYS_SCREEN_PDA));
|
||||
PyDict_SetItemString(d,"wxSYS_SCREEN_SMALL", PyInt_FromLong((long) wxSYS_SCREEN_SMALL));
|
||||
PyDict_SetItemString(d,"wxSYS_SCREEN_DESKTOP", PyInt_FromLong((long) wxSYS_SCREEN_DESKTOP));
|
||||
PyDict_SetItemString(d,"wxLOG_FatalError", PyInt_FromLong((long) wxLOG_FatalError));
|
||||
PyDict_SetItemString(d,"wxLOG_Error", PyInt_FromLong((long) wxLOG_Error));
|
||||
PyDict_SetItemString(d,"wxLOG_Warning", PyInt_FromLong((long) wxLOG_Warning));
|
||||
|
||||
@@ -1126,9 +1126,9 @@ wxSystemSettings_GetMetric = misc2c.wxSystemSettings_GetMetric
|
||||
|
||||
wxSystemSettings_HasFeature = misc2c.wxSystemSettings_HasFeature
|
||||
|
||||
wxSystemSettings_GetScreen = misc2c.wxSystemSettings_GetScreen
|
||||
wxSystemSettings_GetScreenType = misc2c.wxSystemSettings_GetScreenType
|
||||
|
||||
wxSystemSettings_SetScreen = misc2c.wxSystemSettings_SetScreen
|
||||
wxSystemSettings_SetScreenType = misc2c.wxSystemSettings_SetScreenType
|
||||
|
||||
wxToolTip_Enable = misc2c.wxToolTip_Enable
|
||||
|
||||
@@ -1270,10 +1270,10 @@ wxSYS_SWAP_BUTTONS = misc2c.wxSYS_SWAP_BUTTONS
|
||||
wxSYS_CAN_DRAW_FRAME_DECORATIONS = misc2c.wxSYS_CAN_DRAW_FRAME_DECORATIONS
|
||||
wxSYS_CAN_ICONIZE_FRAME = misc2c.wxSYS_CAN_ICONIZE_FRAME
|
||||
wxSYS_SCREEN_NONE = misc2c.wxSYS_SCREEN_NONE
|
||||
wxSYS_SCREEN_DESKTOP = misc2c.wxSYS_SCREEN_DESKTOP
|
||||
wxSYS_SCREEN_SMALL = misc2c.wxSYS_SCREEN_SMALL
|
||||
wxSYS_SCREEN_PDA = misc2c.wxSYS_SCREEN_PDA
|
||||
wxSYS_SCREEN_TINY = misc2c.wxSYS_SCREEN_TINY
|
||||
wxSYS_SCREEN_PDA = misc2c.wxSYS_SCREEN_PDA
|
||||
wxSYS_SCREEN_SMALL = misc2c.wxSYS_SCREEN_SMALL
|
||||
wxSYS_SCREEN_DESKTOP = misc2c.wxSYS_SCREEN_DESKTOP
|
||||
wxLOG_FatalError = misc2c.wxLOG_FatalError
|
||||
wxLOG_Error = misc2c.wxLOG_Error
|
||||
wxLOG_Warning = misc2c.wxLOG_Warning
|
||||
|
||||
Reference in New Issue
Block a user