X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..4a7ea057cd6bf54d645134615f4c9d247767cef0:/wxPython/src/_listbox.i

diff --git a/wxPython/src/_listbox.i b/wxPython/src/_listbox.i
index b6dc1ae915..ebef42f095 100644
--- a/wxPython/src/_listbox.i
+++ b/wxPython/src/_listbox.i
@@ -18,9 +18,11 @@
 %{
 #include <wx/checklst.h>
     
-    DECLARE_DEF_STRING(ListBoxNameStr);
 %}
 
+MAKE_CONST_WXSTRING(ListBoxNameStr);
+
+
 //---------------------------------------------------------------------------
 %newgroup
 
@@ -64,12 +66,12 @@ public:
 
     // 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 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)
@@ -99,7 +101,7 @@ public:
     // listbox and ensures that it is visible i.e. not scrolled out of view
     void AppendAndEnsureVisible(const wxString& s);
 
-    // return TRUE if this listbox is sorted
+    // return True if this listbox is sorted
     bool IsSorted() const;
 };
 
@@ -112,8 +114,8 @@ public:
 class wxCheckListBox : public wxListBox
 {
 public:
-    %addtofunc wxListBox         "self._setOORInfo(self)"
-    %addtofunc wxListBox()       ""
+    %addtofunc wxCheckListBox         "self._setOORInfo(self)"
+    %addtofunc wxCheckListBox()       ""
 
     wxCheckListBox(wxWindow *parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,
@@ -133,9 +135,9 @@ public:
                    const wxString& name = wxPyListBoxNameStr);
 
     bool  IsChecked(int index);
-    void  Check(int index, int check = TRUE);
+    void  Check(int index, int check = True);
 
-#ifndef __WXMAC__
+#if !defined(__WXMAC__) && !defined(__WXX11__)
     int GetItemHeight();
 #endif