cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,7 +17,6 @@
|
||||
|
||||
%{
|
||||
#include <wx/checklst.h>
|
||||
|
||||
%}
|
||||
|
||||
MAKE_CONST_WXSTRING(ListBoxNameStr);
|
||||
@@ -34,31 +33,57 @@ public:
|
||||
%pythonAppend wxListBox "self._setOORInfo(self)"
|
||||
%pythonAppend wxListBox() ""
|
||||
|
||||
wxListBox(wxWindow* parent, wxWindowID id=-1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxArrayString& choices = wxPyEmptyStringArray,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxPyListBoxNameStr);
|
||||
wxListBox(wxWindow* parent,
|
||||
wxWindowID id = -1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxArrayString& choices = wxPyEmptyStringArray,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxPyListBoxNameStr);
|
||||
|
||||
// wxListBox(wxWindow* parent,
|
||||
// wxWindowID id = -1,
|
||||
// const wxPoint& pos = wxDefaultPosition,
|
||||
// const wxSize& size = wxDefaultSize,
|
||||
// int n = 0,
|
||||
// const wxString choices[] = NULL,
|
||||
// long style = 0,
|
||||
// const wxValidator& validator = wxDefaultValidator,
|
||||
// const wxString& name = wxPyListBoxNameStr);
|
||||
%RenameCtor(PreListBox, wxListBox());
|
||||
|
||||
bool Create(wxWindow* parent, wxWindowID id=-1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxArrayString& choices = wxPyEmptyStringArray,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxPyListBoxNameStr);
|
||||
bool Create(wxWindow* parent,
|
||||
wxWindowID id = -1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxArrayString& choices = wxPyEmptyStringArray,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxPyListBoxNameStr);
|
||||
|
||||
// bool Create(wxWindow *parent,
|
||||
// wxWindowID id = -1,
|
||||
// const wxPoint& pos = wxDefaultPosition,
|
||||
// const wxSize& size = wxDefaultSize,
|
||||
// int n = 0,
|
||||
// const wxString choices[] = NULL,
|
||||
// long style = 0,
|
||||
// const wxValidator& validator = wxDefaultValidator,
|
||||
// const wxString& name = wxPyListBoxNameStr);
|
||||
|
||||
// all generic methods are in wxControlWithItems...
|
||||
|
||||
%extend {
|
||||
void Insert(const wxString& item, int pos, PyObject* clientData=NULL) {
|
||||
if (clientData) {
|
||||
%extend
|
||||
{
|
||||
void Insert(const wxString& item, int pos, PyObject* clientData = NULL)
|
||||
{
|
||||
if (clientData)
|
||||
{
|
||||
wxPyClientData* data = new wxPyClientData(clientData);
|
||||
self->Insert(item, pos, data);
|
||||
} else
|
||||
}
|
||||
else
|
||||
self->Insert(item, pos);
|
||||
}
|
||||
}
|
||||
@@ -70,6 +95,7 @@ public:
|
||||
virtual bool IsSelected(int n) const;
|
||||
virtual void SetSelection(int n, bool select = true);
|
||||
virtual void Select(int n);
|
||||
|
||||
void Deselect(int n);
|
||||
void DeselectAll(int itemToLeaveSelected = -1);
|
||||
|
||||
@@ -78,12 +104,15 @@ public:
|
||||
// works for single as well as multiple selection listboxes (unlike
|
||||
// GetSelection which only works for listboxes with single selection)
|
||||
//virtual int GetSelections(wxArrayInt& aSelections) const;
|
||||
%extend {
|
||||
PyObject* GetSelections() {
|
||||
%extend
|
||||
{
|
||||
PyObject* GetSelections()
|
||||
{
|
||||
wxArrayInt lst;
|
||||
self->GetSelections(lst);
|
||||
PyObject *tup = PyTuple_New(lst.GetCount());
|
||||
for(size_t i=0; i<lst.GetCount(); i++) {
|
||||
for (size_t i=0; i<lst.GetCount(); i++)
|
||||
{
|
||||
PyTuple_SetItem(tup, i, PyInt_FromLong(lst[i]));
|
||||
}
|
||||
return tup;
|
||||
@@ -95,8 +124,8 @@ public:
|
||||
void SetFirstItem(int n);
|
||||
%Rename(SetFirstItemStr, void, SetFirstItem(const wxString& s));
|
||||
|
||||
// ensures that the given item is visible scrolling the listbox if
|
||||
// necessary
|
||||
// ensures that the given item is visible scrolling the listbox
|
||||
// if necessary
|
||||
virtual void EnsureVisible(int n);
|
||||
|
||||
// a combination of Append() and EnsureVisible(): appends the item to the
|
||||
@@ -109,27 +138,31 @@ public:
|
||||
// return the index of the item at this position or wxNOT_FOUND
|
||||
int HitTest(const wxPoint& pt) const;
|
||||
|
||||
%extend {
|
||||
void SetItemForegroundColour(int item, const wxColour& c) {
|
||||
%extend
|
||||
{
|
||||
void SetItemForegroundColour(int item, const wxColour& c)
|
||||
{
|
||||
%#ifdef __WXMSW__
|
||||
if (self->GetWindowStyle() & wxLB_OWNERDRAW)
|
||||
self->GetItem(item)->SetTextColour(c);
|
||||
%#endif
|
||||
}
|
||||
void SetItemBackgroundColour(int item, const wxColour& c) {
|
||||
void SetItemBackgroundColour(int item, const wxColour& c)
|
||||
{
|
||||
%#ifdef __WXMSW__
|
||||
if (self->GetWindowStyle() & wxLB_OWNERDRAW)
|
||||
self->GetItem(item)->SetBackgroundColour(c);
|
||||
%#endif
|
||||
}
|
||||
void SetItemFont(int item, const wxFont& f) {
|
||||
void SetItemFont(int item, const wxFont& f)
|
||||
{
|
||||
%#ifdef __WXMSW__
|
||||
if (self->GetWindowStyle() & wxLB_OWNERDRAW)
|
||||
self->GetItem(item)->SetFont(f);
|
||||
%#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static wxVisualAttributes
|
||||
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
||||
};
|
||||
@@ -148,22 +181,24 @@ public:
|
||||
%pythonAppend wxCheckListBox "self._setOORInfo(self)"
|
||||
%pythonAppend wxCheckListBox() ""
|
||||
|
||||
wxCheckListBox(wxWindow *parent, wxWindowID id=-1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxArrayString& choices = wxPyEmptyStringArray,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxPyListBoxNameStr);
|
||||
wxCheckListBox(wxWindow *parent,
|
||||
wxWindowID id = -1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxArrayString& choices = wxPyEmptyStringArray,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxPyListBoxNameStr);
|
||||
%RenameCtor(PreCheckListBox, wxCheckListBox());
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id=-1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxArrayString& choices = wxPyEmptyStringArray,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxPyListBoxNameStr);
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id = -1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxArrayString& choices = wxPyEmptyStringArray,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxPyListBoxNameStr);
|
||||
|
||||
bool IsChecked(unsigned int index);
|
||||
void Check(unsigned int index, int check = true);
|
||||
@@ -171,7 +206,6 @@ public:
|
||||
#if defined(__WXMSW__) || defined(__WXGTK__)
|
||||
int GetItemHeight();
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user