AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't override methods that are in wxControlWithItems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2005-02-18 04:48:26 +00:00
parent 7c1f6b54a5
commit 6f25918850
2 changed files with 40 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wxPython/src/_choice.i
View File

@ -75,26 +75,6 @@ public:
"Actually create the GUI Choice control for 2-phase creation", "");
// // These are only meaningful on wxMotif...
// int GetColumns();
// void SetColumns(const int n = 1);
DocDeclStr(
void , SetSelection(const int n),
"Select the n'th item (zero based) in the list.", "");
DocDeclStr(
bool , SetStringSelection(const wxString& string),
"Select the item with the specifed string", "");
DocDeclStr(
void , SetString(int n, const wxString& string),
"Set the label for the n'th item (zero based) in the list.", "");
%pythoncode { Select = SetSelection }
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
};

70
wxPython/src/_control.i
View File

@ -106,11 +106,13 @@ __init__ as a plain old wx.Control is not very useful.", "");
%newgroup;
DocStr(wxItemContainer,
"wx.ItemContainer defines an interface which is implemented by all
controls which have string subitems, each of which may be selected,
such as `wx.ListBox`, `wx.CheckListBox`, `wx.Choice` as well as
`wx.ComboBox` which implements an extended interface deriving from
"The wx.ItemContainer class defines an interface which is implemented
by all controls which have string subitems, each of which may be
selected, such as `wx.ListBox`, `wx.CheckListBox`, `wx.Choice` as well
as `wx.ComboBox` which implements an extended interface deriving from
this one.
It defines the methods for accessing the control's items and although
@ -178,6 +180,31 @@ than the number of items in the control.", "");
%extend {
DocStr(GetClientData,
"Returns the client data associated with the given item, (if any.)", "");
PyObject* GetClientData(int n) {
wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
if (data) {
Py_INCREF(data->m_obj);
return data->m_obj;
} else {
Py_INCREF(Py_None);
return Py_None;
}
}
DocStr(SetClientData,
"Associate the given client data with the item at position n.", "");
void SetClientData(int n, PyObject* clientData) {
wxPyClientData* data = new wxPyClientData(clientData);
self->SetClientObject(n, data);
}
}
DocDeclStr(
virtual int , GetCount() const,
"Returns the number of items in the control.", "");
@ -205,12 +232,9 @@ zero-based position of the item, or ``wx.NOT_FOUND`` if the string was not
found.", "");
DocDeclStr(
virtual void , Select(int n),
virtual void , SetSelection(int n),
"Sets the item at index 'n' to be the selected item.", "");
%pythoncode { SetSelection = Select }
DocDeclStr(
virtual int , GetSelection() const,
@ -218,35 +242,21 @@ found.", "");
is selected.", "");
bool SetStringSelection(const wxString& s);
DocDeclStr(
wxString , GetStringSelection() const,
"Returns the label of the selected item or an empty string if no item
is selected.", "");
DocDeclStr(
void , Select(int n),
"This is the same as `SetSelection` and exists only because it is
slightly more natural for controls which support multiple selection.", "");
%extend {
DocStr(GetClientData,
"Returns the client data associated with the given item, (if any.)", "");
PyObject* GetClientData(int n) {
wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
if (data) {
Py_INCREF(data->m_obj);
return data->m_obj;
} else {
Py_INCREF(Py_None);
return Py_None;
}
}
DocStr(SetClientData,
"Associate the given client data with the item at position n.", "");
void SetClientData(int n, PyObject* clientData) {
wxPyClientData* data = new wxPyClientData(clientData);
self->SetClientObject(n, data);
}
}
};