reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6a168c177c
commit
f491ed976a
@ -91,11 +91,6 @@ POPUP_WINDOW = _core_.POPUP_WINDOW
|
||||
CENTER_FRAME = _core_.CENTER_FRAME
|
||||
CENTRE_ON_SCREEN = _core_.CENTRE_ON_SCREEN
|
||||
CENTER_ON_SCREEN = _core_.CENTER_ON_SCREEN
|
||||
ED_CLIENT_MARGIN = _core_.ED_CLIENT_MARGIN
|
||||
ED_BUTTONS_BOTTOM = _core_.ED_BUTTONS_BOTTOM
|
||||
ED_BUTTONS_RIGHT = _core_.ED_BUTTONS_RIGHT
|
||||
ED_STATIC_LINE = _core_.ED_STATIC_LINE
|
||||
EXT_DIALOG_STYLE = _core_.EXT_DIALOG_STYLE
|
||||
CLIP_CHILDREN = _core_.CLIP_CHILDREN
|
||||
CLIP_SIBLINGS = _core_.CLIP_SIBLINGS
|
||||
ALWAYS_SHOW_SB = _core_.ALWAYS_SHOW_SB
|
||||
|
@ -47544,21 +47544,6 @@ SWIGEXPORT(void) SWIG_init(void) {
|
||||
{
|
||||
PyDict_SetItemString(d,"CENTER_ON_SCREEN", SWIG_From_int((int)(wxCENTER_ON_SCREEN)));
|
||||
}
|
||||
{
|
||||
PyDict_SetItemString(d,"ED_CLIENT_MARGIN", SWIG_From_int((int)(wxED_CLIENT_MARGIN)));
|
||||
}
|
||||
{
|
||||
PyDict_SetItemString(d,"ED_BUTTONS_BOTTOM", SWIG_From_int((int)(wxED_BUTTONS_BOTTOM)));
|
||||
}
|
||||
{
|
||||
PyDict_SetItemString(d,"ED_BUTTONS_RIGHT", SWIG_From_int((int)(wxED_BUTTONS_RIGHT)));
|
||||
}
|
||||
{
|
||||
PyDict_SetItemString(d,"ED_STATIC_LINE", SWIG_From_int((int)(wxED_STATIC_LINE)));
|
||||
}
|
||||
{
|
||||
PyDict_SetItemString(d,"EXT_DIALOG_STYLE", SWIG_From_int((int)(wxEXT_DIALOG_STYLE)));
|
||||
}
|
||||
{
|
||||
PyDict_SetItemString(d,"CLIP_CHILDREN", SWIG_From_int((int)(wxCLIP_CHILDREN)));
|
||||
}
|
||||
|
@ -3968,7 +3968,7 @@ class BufferedDC(MemoryDC):
|
||||
return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args):
|
||||
"""
|
||||
__init__(self, DC dc, Bitmap buffer, int style=BUFFER_CLIENT_AREA) -> BufferedDC
|
||||
__init__(self, DC dc, Bitmap buffer=NullBitmap, int style=BUFFER_CLIENT_AREA) -> BufferedDC
|
||||
__init__(self, DC dc, Size area, int style=BUFFER_CLIENT_AREA) -> BufferedDC
|
||||
|
||||
Constructs a buffered DC.
|
||||
|
@ -17231,23 +17231,26 @@ static PyObject * MemoryDC_swigregister(PyObject *, PyObject *args) {
|
||||
static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) {
|
||||
PyObject *resultobj;
|
||||
wxDC *arg1 = (wxDC *) 0 ;
|
||||
wxBitmap *arg2 = 0 ;
|
||||
wxBitmap const &arg2_defvalue = wxNullBitmap ;
|
||||
wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
|
||||
int arg3 = (int) wxBUFFER_CLIENT_AREA ;
|
||||
wxBufferedDC *result;
|
||||
PyObject * obj0 = 0 ;
|
||||
PyObject * obj1 = 0 ;
|
||||
PyObject * obj2 = 0 ;
|
||||
|
||||
if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
|
||||
if(!PyArg_ParseTuple(args,(char *)"O|OO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
|
||||
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
|
||||
if (SWIG_arg_fail(1)) SWIG_fail;
|
||||
{
|
||||
SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
|
||||
if (SWIG_arg_fail(2)) SWIG_fail;
|
||||
if (arg2 == NULL) {
|
||||
SWIG_null_ref("wxBitmap");
|
||||
if (obj1) {
|
||||
{
|
||||
SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
|
||||
if (SWIG_arg_fail(2)) SWIG_fail;
|
||||
if (arg2 == NULL) {
|
||||
SWIG_null_ref("wxBitmap");
|
||||
}
|
||||
if (SWIG_arg_fail(2)) SWIG_fail;
|
||||
}
|
||||
if (SWIG_arg_fail(2)) SWIG_fail;
|
||||
}
|
||||
if (obj2) {
|
||||
{
|
||||
@ -17318,7 +17321,7 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
|
||||
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
|
||||
argv[ii] = PyTuple_GetItem(args,ii);
|
||||
}
|
||||
if ((argc >= 2) && (argc <= 3)) {
|
||||
if ((argc >= 1) && (argc <= 3)) {
|
||||
int _v;
|
||||
{
|
||||
void *ptr;
|
||||
@ -17330,6 +17333,9 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
|
||||
}
|
||||
}
|
||||
if (_v) {
|
||||
if (argc <= 1) {
|
||||
return _wrap_new_BufferedDC__SWIG_0(self,args);
|
||||
}
|
||||
{
|
||||
void *ptr = 0;
|
||||
if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) {
|
||||
|
@ -155,7 +155,7 @@ class SystemSettings(object):
|
||||
|
||||
GetFont = staticmethod(GetFont)
|
||||
def GetMetric(*args, **kwargs):
|
||||
"""GetMetric(int index) -> int"""
|
||||
"""GetMetric(int index, Window win=None) -> int"""
|
||||
return _misc_.SystemSettings_GetMetric(*args, **kwargs)
|
||||
|
||||
GetMetric = staticmethod(GetMetric)
|
||||
@ -191,7 +191,7 @@ def SystemSettings_GetFont(*args, **kwargs):
|
||||
return _misc_.SystemSettings_GetFont(*args, **kwargs)
|
||||
|
||||
def SystemSettings_GetMetric(*args, **kwargs):
|
||||
"""SystemSettings_GetMetric(int index) -> int"""
|
||||
"""SystemSettings_GetMetric(int index, Window win=None) -> int"""
|
||||
return _misc_.SystemSettings_GetMetric(*args, **kwargs)
|
||||
|
||||
def SystemSettings_HasFeature(*args, **kwargs):
|
||||
|
@ -3049,21 +3049,27 @@ static PyObject *_wrap_SystemSettings_GetFont(PyObject *, PyObject *args, PyObje
|
||||
static PyObject *_wrap_SystemSettings_GetMetric(PyObject *, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxSystemMetric arg1 ;
|
||||
wxWindow *arg2 = (wxWindow *) NULL ;
|
||||
int result;
|
||||
PyObject * obj0 = 0 ;
|
||||
PyObject * obj1 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "index", NULL
|
||||
(char *) "index",(char *) "win", NULL
|
||||
};
|
||||
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetMetric",kwnames,&obj0)) goto fail;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SystemSettings_GetMetric",kwnames,&obj0,&obj1)) goto fail;
|
||||
{
|
||||
arg1 = (wxSystemMetric)(SWIG_As_int(obj0));
|
||||
if (SWIG_arg_fail(1)) SWIG_fail;
|
||||
}
|
||||
if (obj1) {
|
||||
SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
|
||||
if (SWIG_arg_fail(2)) SWIG_fail;
|
||||
}
|
||||
{
|
||||
if (!wxPyCheckForApp()) SWIG_fail;
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
result = (int)wxSystemSettings::GetMetric((wxSystemMetric )arg1);
|
||||
result = (int)wxSystemSettings::GetMetric((wxSystemMetric )arg1,arg2);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
|
@ -360,6 +360,8 @@ FRAME_NO_WINDOW_MENU = _windows_.FRAME_NO_WINDOW_MENU
|
||||
FRAME_NO_TASKBAR = _windows_.FRAME_NO_TASKBAR
|
||||
FRAME_SHAPED = _windows_.FRAME_SHAPED
|
||||
FRAME_DRAWER = _windows_.FRAME_DRAWER
|
||||
FRAME_EX_METAL = _windows_.FRAME_EX_METAL
|
||||
DIALOG_EX_METAL = _windows_.DIALOG_EX_METAL
|
||||
DIALOG_MODAL = _windows_.DIALOG_MODAL
|
||||
DIALOG_MODELESS = _windows_.DIALOG_MODELESS
|
||||
USER_COLOURS = _windows_.USER_COLOURS
|
||||
|
@ -29906,6 +29906,12 @@ SWIGEXPORT(void) SWIG_init(void) {
|
||||
{
|
||||
PyDict_SetItemString(d,"FRAME_DRAWER", SWIG_From_int((int)(wxFRAME_DRAWER)));
|
||||
}
|
||||
{
|
||||
PyDict_SetItemString(d,"FRAME_EX_METAL", SWIG_From_int((int)(wxFRAME_EX_METAL)));
|
||||
}
|
||||
{
|
||||
PyDict_SetItemString(d,"DIALOG_EX_METAL", SWIG_From_int((int)(wxDIALOG_EX_METAL)));
|
||||
}
|
||||
{
|
||||
PyDict_SetItemString(d,"DIALOG_MODAL", SWIG_From_int((int)(wxDIALOG_MODAL)));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user