applied patch 1378261

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

diff --git a/wxPython/src/_listbox.i b/wxPython/src/_listbox.i
index 2b3da1dc439a7a1d973d50c1b7b681c2b49a9242..2bf130c77c627747cfe9852b559c70350ac72b71 100644 (file)
--- a/wxPython/src/_listbox.i
+++ b/wxPython/src/_listbox.i
@@ -37,17 +37,15 @@ public:
     wxListBox(wxWindow* parent, wxWindowID id=-1,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
     wxListBox(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);
               const wxArrayString& choices = wxPyEmptyStringArray,              
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = wxPyListBoxNameStr);

-    %name(PreListBox)wxListBox();
+    %RenameCtor(PreListBox, wxListBox());

 
     bool Create(wxWindow* parent, wxWindowID id=-1,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
 
     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 wxArrayString& choices = wxPyEmptyStringArray,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,


@@ -65,37 +63,37 @@ public:
         }
     }
 
         }
     }
 

-    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;
     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 SetSelection(int n, bool select = true);

     virtual void Select(int n);
     void Deselect(int n);
     void DeselectAll(int itemToLeaveSelected = -1);
 
     virtual void Select(int n);
     void Deselect(int n);
     void DeselectAll(int itemToLeaveSelected = -1);
 

-    virtual bool SetStringSelection(const wxString& s, bool select = True);
+    virtual bool SetStringSelection(const wxString& s, bool select = true);

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

     }
 
     // set the specified item at the first visible item or scroll to max
     // range.
     void SetFirstItem(int n);
     }
 
     // set the specified item at the first visible item or scroll to max
     // range.
     void SetFirstItem(int n);

-    %name(SetFirstItemStr) void SetFirstItem(const wxString& s);
+    %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


@@ -108,6 +106,8 @@ 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) {


@@ -151,32 +151,27 @@ public:
     wxCheckListBox(wxWindow *parent, wxWindowID id=-1,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
     wxCheckListBox(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);
                    const wxArrayString& choices = wxPyEmptyStringArray,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxPyListBoxNameStr);

-    %name(PreCheckListBox)wxCheckListBox();
+    %RenameCtor(PreCheckListBox, wxCheckListBox());

 
     bool Create(wxWindow *parent, wxWindowID id=-1,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
 
     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);
 
                 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;
-    %name(HitTestXY)int HitTest(wxCoord x, wxCoord y) const;

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