Use PyObject_AsReadBuffer in the typemap for getting buffer or buffer

[wxWidgets.git] / wxPython / src / _listbox.i

diff --git a/wxPython/src/_listbox.i b/wxPython/src/_listbox.i
index 565dea0bd12b8cc096c12738b911f9d4b0c3b173..5f9005b7e9293c6c5e9a8629dd8bd3242a37a0e4 100644 (file)
--- a/wxPython/src/_listbox.i
+++ b/wxPython/src/_listbox.i
@@ -17,7 +17,6 @@
 
 %{
 #include <wx/checklst.h>
 
 %{
 #include <wx/checklst.h>

-    

 %}
 
 MAKE_CONST_WXSTRING(ListBoxNameStr);
 %}
 
 MAKE_CONST_WXSTRING(ListBoxNameStr);


@@ -34,42 +33,69 @@ public:
     %pythonAppend wxListBox         "self._setOORInfo(self)"
     %pythonAppend wxListBox()       ""
 
     %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());
 
     %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...
 
 
     // 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);
                 wxPyClientData* data = new wxPyClientData(clientData);
                 self->Insert(item, pos, data);

-            } else
+            }
+            else

                 self->Insert(item, pos);
         }
     }
 
                 self->Insert(item, pos);
         }
     }
 

-    void InsertItems(const wxArrayString& items, int pos);
+    void InsertItems(const wxArrayString& items, unsigned int pos);

     void Set(const wxArrayString& items/*, void **clientData = NULL */);
 
     // multiple selection logic
     virtual bool IsSelected(int n) const;
     virtual void SetSelection(int n, bool select = true);
     virtual void Select(int n);
     void Set(const wxArrayString& items/*, void **clientData = NULL */);
 
     // multiple selection logic
     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);
 
     void Deselect(int n);
     void DeselectAll(int itemToLeaveSelected = -1);
 


@@ -80,12 +106,15 @@ public:
     //virtual int GetSelections(wxArrayInt& aSelections) const;
     %extend {
         PyObject* GetSelections() {
     //virtual int GetSelections(wxArrayInt& aSelections) const;
     %extend {
         PyObject* GetSelections() {

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             wxArrayInt lst;
             self->GetSelections(lst);
             PyObject *tup = PyTuple_New(lst.GetCount());
             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]));
             }
                 PyTuple_SetItem(tup, i, PyInt_FromLong(lst[i]));
             }

+            wxPyEndBlockThreads(blocked);

             return tup;
         }
     }
             return tup;
         }
     }


@@ -95,8 +124,8 @@ public:
     void SetFirstItem(int n);
     %Rename(SetFirstItemStr,  void, SetFirstItem(const wxString& s));
 
     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
     virtual void EnsureVisible(int n);
 
     // a combination of Append() and EnsureVisible(): appends the item to the


@@ -106,28 +135,34 @@ public:
     // return True if this listbox is sorted
     bool IsSorted() const;
 
     // return True if this listbox is sorted
     bool IsSorted() const;
 

+    // 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
         }
             %#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
         }
             %#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
         }
     }
             %#ifdef __WXMSW__
                  if (self->GetWindowStyle() & wxLB_OWNERDRAW)
                      self->GetItem(item)->SetFont(f);
             %#endif
         }
     }

-    
+

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };


@@ -146,33 +181,31 @@ public:
     %pythonAppend wxCheckListBox         "self._setOORInfo(self)"
     %pythonAppend wxCheckListBox()       ""
 
     %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());
 
     %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(int index);
-    void  Check(int index, int check = true);
+    bool  IsChecked(unsigned int index);
+    void  Check(unsigned int index, int check = true);

 
 #if defined(__WXMSW__) || defined(__WXGTK__)
     int GetItemHeight();
 #endif
 
 #if defined(__WXMSW__) || defined(__WXGTK__)
     int GetItemHeight();
 #endif

-
-    // return the index of the item at this position or wxNOT_FOUND
-    int HitTest(const wxPoint& pt) const;
-    %Rename(HitTestXY, int, HitTest(wxCoord x, wxCoord y) const);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------