A bunch of little tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -132,15 +132,15 @@ extern wxValidator wxPyDefaultValidator;
|
|||||||
class wxPyTreeItemData : public wxTreeItemData {
|
class wxPyTreeItemData : public wxTreeItemData {
|
||||||
public:
|
public:
|
||||||
wxPyTreeItemData(PyObject* obj = NULL) {
|
wxPyTreeItemData(PyObject* obj = NULL) {
|
||||||
if (obj == NULL)
|
if (obj == NULL)
|
||||||
obj = Py_None;
|
obj = Py_None;
|
||||||
Py_INCREF(obj);
|
Py_INCREF(obj);
|
||||||
m_obj = obj;
|
m_obj = obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
~wxPyTreeItemData() {
|
~wxPyTreeItemData() {
|
||||||
bool doSave = wxPyRestoreThread();
|
bool doSave = wxPyRestoreThread();
|
||||||
Py_DECREF(m_obj);
|
Py_DECREF(m_obj);
|
||||||
wxPySaveThread(doSave);
|
wxPySaveThread(doSave);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4543,7 +4543,7 @@ static PyObject *_wrap_wxTreeItemId_IsOk(PyObject *self, PyObject *args, PyObjec
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int wxTreeItemId___cmp__(wxTreeItemId *self,wxTreeItemId * other) {
|
static int wxTreeItemId___cmp__(wxTreeItemId *self,wxTreeItemId * other) {
|
||||||
if (! other) return 0;
|
if (! other) return -1;
|
||||||
return *self != *other;
|
return *self != *other;
|
||||||
}
|
}
|
||||||
static PyObject *_wrap_wxTreeItemId___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) {
|
static PyObject *_wrap_wxTreeItemId___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||||
@@ -5645,7 +5645,7 @@ static PyObject *_wrap_wxTreeCtrl_GetItemData(PyObject *self, PyObject *args, Py
|
|||||||
static void wxPyTreeCtrl_SetItemData(wxPyTreeCtrl *self,const wxTreeItemId & item,wxPyTreeItemData * data) {
|
static void wxPyTreeCtrl_SetItemData(wxPyTreeCtrl *self,const wxTreeItemId & item,wxPyTreeItemData * data) {
|
||||||
data->SetId(item); // set the id
|
data->SetId(item); // set the id
|
||||||
self->SetItemData(item, data);
|
self->SetItemData(item, data);
|
||||||
}
|
}
|
||||||
static PyObject *_wrap_wxTreeCtrl_SetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
|
static PyObject *_wrap_wxTreeCtrl_SetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||||
PyObject * _resultobj;
|
PyObject * _resultobj;
|
||||||
wxPyTreeCtrl * _arg0;
|
wxPyTreeCtrl * _arg0;
|
||||||
@@ -5698,7 +5698,7 @@ static PyObject * wxPyTreeCtrl_GetPyData(wxPyTreeCtrl *self,const wxTreeItemId &
|
|||||||
self->SetItemData(item, data);
|
self->SetItemData(item, data);
|
||||||
}
|
}
|
||||||
return data->GetData();
|
return data->GetData();
|
||||||
}
|
}
|
||||||
static PyObject *_wrap_wxTreeCtrl_GetPyData(PyObject *self, PyObject *args, PyObject *kwargs) {
|
static PyObject *_wrap_wxTreeCtrl_GetPyData(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||||
PyObject * _resultobj;
|
PyObject * _resultobj;
|
||||||
PyObject * _result;
|
PyObject * _result;
|
||||||
@@ -5744,7 +5744,7 @@ static void wxPyTreeCtrl_SetPyData(wxPyTreeCtrl *self,const wxTreeItemId & item
|
|||||||
self->SetItemData(item, data);
|
self->SetItemData(item, data);
|
||||||
} else
|
} else
|
||||||
data->SetData(obj);
|
data->SetData(obj);
|
||||||
}
|
}
|
||||||
static PyObject *_wrap_wxTreeCtrl_SetPyData(PyObject *self, PyObject *args, PyObject *kwargs) {
|
static PyObject *_wrap_wxTreeCtrl_SetPyData(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||||
PyObject * _resultobj;
|
PyObject * _resultobj;
|
||||||
wxPyTreeCtrl * _arg0;
|
wxPyTreeCtrl * _arg0;
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -298,6 +298,55 @@ class wxMouseEventPtr(wxEventPtr):
|
|||||||
def GetY(self, *_args, **_kwargs):
|
def GetY(self, *_args, **_kwargs):
|
||||||
val = apply(eventsc.wxMouseEvent_GetY,(self,) + _args, _kwargs)
|
val = apply(eventsc.wxMouseEvent_GetY,(self,) + _args, _kwargs)
|
||||||
return val
|
return val
|
||||||
|
def __setattr__(self,name,value):
|
||||||
|
if name == "m_x" :
|
||||||
|
eventsc.wxMouseEvent_m_x_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_y" :
|
||||||
|
eventsc.wxMouseEvent_m_y_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_leftDown" :
|
||||||
|
eventsc.wxMouseEvent_m_leftDown_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_middleDown" :
|
||||||
|
eventsc.wxMouseEvent_m_middleDown_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_rightDown" :
|
||||||
|
eventsc.wxMouseEvent_m_rightDown_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_controlDown" :
|
||||||
|
eventsc.wxMouseEvent_m_controlDown_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_shiftDown" :
|
||||||
|
eventsc.wxMouseEvent_m_shiftDown_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_altDown" :
|
||||||
|
eventsc.wxMouseEvent_m_altDown_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_metaDown" :
|
||||||
|
eventsc.wxMouseEvent_m_metaDown_set(self,value)
|
||||||
|
return
|
||||||
|
self.__dict__[name] = value
|
||||||
|
def __getattr__(self,name):
|
||||||
|
if name == "m_x" :
|
||||||
|
return eventsc.wxMouseEvent_m_x_get(self)
|
||||||
|
if name == "m_y" :
|
||||||
|
return eventsc.wxMouseEvent_m_y_get(self)
|
||||||
|
if name == "m_leftDown" :
|
||||||
|
return eventsc.wxMouseEvent_m_leftDown_get(self)
|
||||||
|
if name == "m_middleDown" :
|
||||||
|
return eventsc.wxMouseEvent_m_middleDown_get(self)
|
||||||
|
if name == "m_rightDown" :
|
||||||
|
return eventsc.wxMouseEvent_m_rightDown_get(self)
|
||||||
|
if name == "m_controlDown" :
|
||||||
|
return eventsc.wxMouseEvent_m_controlDown_get(self)
|
||||||
|
if name == "m_shiftDown" :
|
||||||
|
return eventsc.wxMouseEvent_m_shiftDown_get(self)
|
||||||
|
if name == "m_altDown" :
|
||||||
|
return eventsc.wxMouseEvent_m_altDown_get(self)
|
||||||
|
if name == "m_metaDown" :
|
||||||
|
return eventsc.wxMouseEvent_m_metaDown_get(self)
|
||||||
|
raise AttributeError,name
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return "<C wxMouseEvent instance at %s>" % (self.this,)
|
return "<C wxMouseEvent instance at %s>" % (self.this,)
|
||||||
class wxMouseEvent(wxMouseEventPtr):
|
class wxMouseEvent(wxMouseEventPtr):
|
||||||
@@ -346,6 +395,50 @@ class wxKeyEventPtr(wxEventPtr):
|
|||||||
def GetPositionTuple(self, *_args, **_kwargs):
|
def GetPositionTuple(self, *_args, **_kwargs):
|
||||||
val = apply(eventsc.wxKeyEvent_GetPositionTuple,(self,) + _args, _kwargs)
|
val = apply(eventsc.wxKeyEvent_GetPositionTuple,(self,) + _args, _kwargs)
|
||||||
return val
|
return val
|
||||||
|
def __setattr__(self,name,value):
|
||||||
|
if name == "m_x" :
|
||||||
|
eventsc.wxKeyEvent_m_x_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_y" :
|
||||||
|
eventsc.wxKeyEvent_m_y_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_keyCode" :
|
||||||
|
eventsc.wxKeyEvent_m_keyCode_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_controlDown" :
|
||||||
|
eventsc.wxKeyEvent_m_controlDown_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_shiftDown" :
|
||||||
|
eventsc.wxKeyEvent_m_shiftDown_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_altDown" :
|
||||||
|
eventsc.wxKeyEvent_m_altDown_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_metaDown" :
|
||||||
|
eventsc.wxKeyEvent_m_metaDown_set(self,value)
|
||||||
|
return
|
||||||
|
if name == "m_scanCode" :
|
||||||
|
eventsc.wxKeyEvent_m_scanCode_set(self,value)
|
||||||
|
return
|
||||||
|
self.__dict__[name] = value
|
||||||
|
def __getattr__(self,name):
|
||||||
|
if name == "m_x" :
|
||||||
|
return eventsc.wxKeyEvent_m_x_get(self)
|
||||||
|
if name == "m_y" :
|
||||||
|
return eventsc.wxKeyEvent_m_y_get(self)
|
||||||
|
if name == "m_keyCode" :
|
||||||
|
return eventsc.wxKeyEvent_m_keyCode_get(self)
|
||||||
|
if name == "m_controlDown" :
|
||||||
|
return eventsc.wxKeyEvent_m_controlDown_get(self)
|
||||||
|
if name == "m_shiftDown" :
|
||||||
|
return eventsc.wxKeyEvent_m_shiftDown_get(self)
|
||||||
|
if name == "m_altDown" :
|
||||||
|
return eventsc.wxKeyEvent_m_altDown_get(self)
|
||||||
|
if name == "m_metaDown" :
|
||||||
|
return eventsc.wxKeyEvent_m_metaDown_get(self)
|
||||||
|
if name == "m_scanCode" :
|
||||||
|
return eventsc.wxKeyEvent_m_scanCode_get(self)
|
||||||
|
raise AttributeError,name
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return "<C wxKeyEvent instance at %s>" % (self.this,)
|
return "<C wxKeyEvent instance at %s>" % (self.this,)
|
||||||
class wxKeyEvent(wxKeyEventPtr):
|
class wxKeyEvent(wxKeyEventPtr):
|
||||||
|
Reference in New Issue
Block a user