X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28c628bb931e0f644880a6a39afebed1390671b8..015fd9ef4833ec3d8b0043a1c7e448c8be4f734a:/wxPython/src/_listbox.i?ds=sidebyside diff --git a/wxPython/src/_listbox.i b/wxPython/src/_listbox.i index 05d03382a5..2b3da1dc43 100644 --- a/wxPython/src/_listbox.i +++ b/wxPython/src/_listbox.i @@ -26,28 +26,32 @@ MAKE_CONST_WXSTRING(ListBoxNameStr); //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxListBox); + class wxListBox : public wxControlWithItems { public: - %addtofunc wxListBox "self._setOORInfo(self)" - %addtofunc wxListBox() "" + %pythonAppend wxListBox "self._setOORInfo(self)" + %pythonAppend wxListBox() "" - wxListBox(wxWindow* parent, wxWindowID id, + wxListBox(wxWindow* parent, wxWindowID id=-1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int choices=0, wxString* choices_array = NULL, + //int choices=0, wxString* choices_array = NULL, + const wxArrayString& choices = wxPyEmptyStringArray, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxPyListBoxNameStr); %name(PreListBox)wxListBox(); - bool Create(wxWindow* parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int choices=0, wxString* choices_array = NULL, - 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 choices=0, wxString* choices_array = NULL, + const wxArrayString& choices = wxPyEmptyStringArray, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPyListBoxNameStr); // all generic methods are in wxControlWithItems... @@ -103,6 +107,31 @@ public: // return True if this listbox is sorted bool IsSorted() const; + + + %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) { + %#ifdef __WXMSW__ + if (self->GetWindowStyle() & wxLB_OWNERDRAW) + self->GetItem(item)->SetBackgroundColour(c); + %#endif + } + 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); }; @@ -110,34 +139,38 @@ public: %newgroup +MustHaveApp(wxCheckListBox); + // wxCheckListBox: a listbox whose items may be checked class wxCheckListBox : public wxListBox { public: - %addtofunc wxCheckListBox "self._setOORInfo(self)" - %addtofunc wxCheckListBox() "" + %pythonAppend wxCheckListBox "self._setOORInfo(self)" + %pythonAppend wxCheckListBox() "" - wxCheckListBox(wxWindow *parent, wxWindowID id, + wxCheckListBox(wxWindow *parent, wxWindowID id=-1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int choices = 0, wxString* choices_array = NULL, + //int choices = 0, wxString* choices_array = NULL, + const wxArrayString& choices = wxPyEmptyStringArray, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxPyListBoxNameStr); %name(PreCheckListBox)wxCheckListBox(); - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int choices = 0, wxString* choices_array = NULL, - 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 choices = 0, wxString* choices_array = NULL, + const wxArrayString& choices = wxPyEmptyStringArray, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPyListBoxNameStr); bool IsChecked(int index); void Check(int index, int check = True); -#ifndef __WXMAC__ +#if defined(__WXMSW__) || defined(__WXGTK__) int GetItemHeight(); #endif