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

some little fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-02-21 20:57:57 +00:00
parent 331a33a1bc
commit 211a46cf82
5 changed files with 78 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
wxPython/contrib/ogl/oglcanvas.cpp
View File

@@ -1119,20 +1119,16 @@ static PyObject *_wrap_wxDiagram_Snap(PyObject *self, PyObject *args, PyObject *
PyObject * _resultobj; PyObject * _resultobj;
wxDiagram * _arg0; wxDiagram * _arg0;
double * _arg1; double * _arg1;
double temp;
double * _arg2; double * _arg2;
double temp0;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL }; double temp;
PyObject * _obj1 = 0;
double temp0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","INOUT","INOUT", NULL };
self = self; self = self;
{ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxDiagram_Snap",_kwnames,&_argo0,&_obj1,&_obj2))
_arg1 = &temp;
}
{
_arg2 = &temp0;
}
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDiagram_Snap",_kwnames,&_argo0))
return NULL; return NULL;
if (_argo0) { if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; } if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1141,6 +1137,14 @@ static PyObject *_wrap_wxDiagram_Snap(PyObject *self, PyObject *args, PyObject *
return NULL; return NULL;
} }
} }
{
temp = PyFloat_AsDouble(_obj1);
_arg1 = &temp;
}
{
temp0 = PyFloat_AsDouble(_obj2);
_arg2 = &temp0;
}
{ {
wxPy_BEGIN_ALLOW_THREADS; wxPy_BEGIN_ALLOW_THREADS;
wxDiagram_Snap(_arg0,_arg1,_arg2); wxDiagram_Snap(_arg0,_arg1,_arg2);
@@ -1896,20 +1900,16 @@ static PyObject *_wrap_wxPyShapeCanvas_Snap(PyObject *self, PyObject *args, PyOb
PyObject * _resultobj; PyObject * _resultobj;
wxPyShapeCanvas * _arg0; wxPyShapeCanvas * _arg0;
double * _arg1; double * _arg1;
double temp;
double * _arg2; double * _arg2;
double temp0;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL }; double temp;
PyObject * _obj1 = 0;
double temp0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","INOUT","INOUT", NULL };
self = self; self = self;
{ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyShapeCanvas_Snap",_kwnames,&_argo0,&_obj1,&_obj2))
_arg1 = &temp;
}
{
_arg2 = &temp0;
}
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyShapeCanvas_Snap",_kwnames,&_argo0))
return NULL; return NULL;
if (_argo0) { if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; } if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1918,6 +1918,14 @@ static PyObject *_wrap_wxPyShapeCanvas_Snap(PyObject *self, PyObject *args, PyOb
return NULL; return NULL;
} }
} }
{
temp = PyFloat_AsDouble(_obj1);
_arg1 = &temp;
}
{
temp0 = PyFloat_AsDouble(_obj2);
_arg2 = &temp0;
}
{ {
wxPy_BEGIN_ALLOW_THREADS; wxPy_BEGIN_ALLOW_THREADS;
wxPyShapeCanvas_Snap(_arg0,_arg1,_arg2); wxPyShapeCanvas_Snap(_arg0,_arg1,_arg2);

4
wxPython/contrib/ogl/oglcanvas.i
View File

@@ -91,7 +91,7 @@ public:
void SetQuickEditMode(bool mode); void SetQuickEditMode(bool mode);
void SetSnapToGrid(bool snap); void SetSnapToGrid(bool snap);
void ShowAll(bool show); void ShowAll(bool show);
void Snap(double *OUTPUT, double *OUTPUT); void Snap(double *INOUT, double *INOUT);
}; };
@@ -147,7 +147,7 @@ public:
void Redraw(wxDC& dc); void Redraw(wxDC& dc);
void RemoveShape(wxPyShape *shape); void RemoveShape(wxPyShape *shape);
void SetDiagram(wxDiagram *diagram); void SetDiagram(wxDiagram *diagram);
void Snap(double *OUTPUT, double *OUTPUT); void Snap(double *INOUT, double *INOUT);
}; };

3
wxPython/contrib/ogl/oglshapes2.i
View File

@@ -207,6 +207,9 @@ public:
bool IsSpline(); bool IsSpline();
void MakeLineControlPoints(int n); void MakeLineControlPoints(int n);
// TODO:
// inline wxList *GetLineControlPoints() { return m_lineControlPoints; }
void SetAttachmentFrom(int fromAttach); void SetAttachmentFrom(int fromAttach);
void SetAttachments(int fromAttach, int toAttach); void SetAttachments(int fromAttach, int toAttach);
void SetAttachmentTo(int toAttach); void SetAttachmentTo(int toAttach);

8
wxPython/src/misc.i
View File

@@ -64,7 +64,7 @@ public:
%pragma(python) addtoclass = " %pragma(python) addtoclass = "
def __str__(self): return str(self.asTuple()) def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple()) def __repr__(self): return str(self.asTuple())
def __len__(self): return len(self.asTuple() def __len__(self): return len(self.asTuple())
def __getitem__(self, index): return self.asTuple()[index] def __getitem__(self, index): return self.asTuple()[index]
def __setitem__(self, index, val): def __setitem__(self, index, val):
if index == 0: self.width = val if index == 0: self.width = val
@@ -113,7 +113,7 @@ public:
%pragma(python) addtoclass = " %pragma(python) addtoclass = "
def __str__(self): return str(self.asTuple()) def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple()) def __repr__(self): return str(self.asTuple())
def __len__(self): return len(self.asTuple() def __len__(self): return len(self.asTuple())
def __getitem__(self, index): return self.asTuple()[index] def __getitem__(self, index): return self.asTuple()[index]
def __setitem__(self, index, val): def __setitem__(self, index, val):
if index == 0: self.width = val if index == 0: self.width = val
@@ -160,7 +160,7 @@ public:
%pragma(python) addtoclass = " %pragma(python) addtoclass = "
def __str__(self): return str(self.asTuple()) def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple()) def __repr__(self): return str(self.asTuple())
def __len__(self): return len(self.asTuple() def __len__(self): return len(self.asTuple())
def __getitem__(self, index): return self.asTuple()[index] def __getitem__(self, index): return self.asTuple()[index]
def __setitem__(self, index, val): def __setitem__(self, index, val):
if index == 0: self.x = val if index == 0: self.x = val
@@ -229,7 +229,7 @@ public:
%pragma(python) addtoclass = " %pragma(python) addtoclass = "
def __str__(self): return str(self.asTuple()) def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple()) def __repr__(self): return str(self.asTuple())
def __len__(self): return len(self.asTuple() def __len__(self): return len(self.asTuple())
def __getitem__(self, index): return self.asTuple()[index] def __getitem__(self, index): return self.asTuple()[index]
def __setitem__(self, index, val): def __setitem__(self, index, val):
if index == 0: self.x = val if index == 0: self.x = val

49
wxPython/src/msw/misc.py
View File

@@ -57,8 +57,16 @@ class wxSizePtr :
raise AttributeError,name raise AttributeError,name
def __repr__(self): def __repr__(self):
return "<C wxSize instance at %s>" % (self.this,) return "<C wxSize instance at %s>" % (self.this,)
def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple()) def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple())
def __len__(self): return len(self.asTuple())
def __getitem__(self, index): return self.asTuple()[index]
def __setitem__(self, index, val):
if index == 0: self.width = val
elif index == 1: self.height = val
else: raise IndexError
class wxSize(wxSizePtr): class wxSize(wxSizePtr):
def __init__(self,*_args,**_kwargs): def __init__(self,*_args,**_kwargs):
self.this = apply(miscc.new_wxSize,_args,_kwargs) self.this = apply(miscc.new_wxSize,_args,_kwargs)
@@ -107,8 +115,16 @@ class wxRealPointPtr :
raise AttributeError,name raise AttributeError,name
def __repr__(self): def __repr__(self):
return "<C wxRealPoint instance at %s>" % (self.this,) return "<C wxRealPoint instance at %s>" % (self.this,)
def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple()) def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple())
def __len__(self): return len(self.asTuple())
def __getitem__(self, index): return self.asTuple()[index]
def __setitem__(self, index, val):
if index == 0: self.width = val
elif index == 1: self.height = val
else: raise IndexError
class wxRealPoint(wxRealPointPtr): class wxRealPoint(wxRealPointPtr):
def __init__(self,*_args,**_kwargs): def __init__(self,*_args,**_kwargs):
self.this = apply(miscc.new_wxRealPoint,_args,_kwargs) self.this = apply(miscc.new_wxRealPoint,_args,_kwargs)
@@ -157,8 +173,16 @@ class wxPointPtr :
raise AttributeError,name raise AttributeError,name
def __repr__(self): def __repr__(self):
return "<C wxPoint instance at %s>" % (self.this,) return "<C wxPoint instance at %s>" % (self.this,)
def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple()) def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple())
def __len__(self): return len(self.asTuple())
def __getitem__(self, index): return self.asTuple()[index]
def __setitem__(self, index, val):
if index == 0: self.x = val
elif index == 1: self.y = val
else: raise IndexError
class wxPoint(wxPointPtr): class wxPoint(wxPointPtr):
def __init__(self,*_args,**_kwargs): def __init__(self,*_args,**_kwargs):
self.this = apply(miscc.new_wxPoint,_args,_kwargs) self.this = apply(miscc.new_wxPoint,_args,_kwargs)
@@ -272,9 +296,18 @@ class wxRectPtr :
raise AttributeError,name raise AttributeError,name
def __repr__(self): def __repr__(self):
return "<C wxRect instance at %s>" % (self.this,) return "<C wxRect instance at %s>" % (self.this,)
def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple())
def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple())
def __len__(self): return len(self.asTuple())
def __getitem__(self, index): return self.asTuple()[index]
def __setitem__(self, index, val):
if index == 0: self.x = val
elif index == 1: self.y = val
elif index == 2: self.width = val
elif index == 3: self.height = val
else: raise IndexError
# override the __getattr__ made by SWIG # override the __getattr__ made by SWIG
def __getattr__(self, name): def __getattr__(self, name):
d = { d = {