fixed wxString iterators linked list corruption

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

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index 10b7b43f45ec73a79d5a464177361387f1f07b54..b0de16d9a369e590ed7566c7e24ba21b9cffbd11 100644 (file)
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -72,11 +72,6 @@ __init__ as a plain old wx.Control is not very useful.", "");
         "Get the control alignment (left/right/centre, top/bottom/centre)", "");
     
 
         "Get the control alignment (left/right/centre, top/bottom/centre)", "");
     
 

-//     DocDeclStr(
-//         static wxString , GetLabelText(const wxString& label),
-//         "Get the string without mnemonic characters ('&')", "");
-    
-

     DocDeclStr(
         wxString , GetLabelText() const,
         "Get just the text of the label, without mnemonic characters ('&')", "");
     DocDeclStr(
         wxString , GetLabelText() const,
         "Get just the text of the label, without mnemonic characters ('&')", "");


@@ -90,14 +85,6 @@ __init__ as a plain old wx.Control is not very useful.", "");
 :see: `wx.CommandEvent`
 ", "");
    
 :see: `wx.CommandEvent`
 ", "");
    

-    DocDeclStr(
-        wxString , GetLabel(),
-        "Return a control's text.", "");
-    
-    DocDeclStr(
-        void , SetLabel(const wxString& label),
-        "Sets the item's text.", "");
-

 
 //     DocDeclStr(
 //         bool , GetAdjustMinSizeFlag(),
 
 //     DocDeclStr(
 //         bool , GetAdjustMinSizeFlag(),


@@ -112,12 +99,23 @@ __init__ as a plain old wx.Control is not very useful.", "");
 
 // :see: `GetAdjustMinSizeFlag`
 // ");
 
 // :see: `GetAdjustMinSizeFlag`
 // ");

+
+ 
+    DocDeclStr(
+        static wxString , RemoveMnemonics(const wxString& str),
+        "removes the mnemonics characters", "");
+

     
     

+// Link error...
+//     DocDeclStr(
+//         static wxString , EscapeMnemonics(const wxString& str),
+//         "escapes the mnemonics characters ('&') by doubling them", "");
+    
+     

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     %property(Alignment, GetAlignment, doc="See `GetAlignment`");
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     %property(Alignment, GetAlignment, doc="See `GetAlignment`");

-    %property(Label, GetLabel, doc="See `GetLabel`");

     %property(LabelText, GetLabelText, doc="See `GetLabelText`");
 
 };
     %property(LabelText, GetLabelText, doc="See `GetLabelText`");
 
 };


@@ -178,7 +176,7 @@ need to add a lot of items.", "",
         DocStr(Insert,
                "Insert an item into the control before the item at the ``pos`` index,
 optionally associating some data object with the item.", "");
         DocStr(Insert,
                "Insert an item into the control before the item at the ``pos`` index,
 optionally associating some data object with the item.", "");

-        int Insert(const wxString& item, unsigned int pos, PyObject* clientData=NULL) {
+        int Insert(const wxString& item, /*unsigned*/ int pos, PyObject* clientData=NULL) {

             if (clientData) {
                 wxPyClientData* data = new wxPyClientData(clientData);
                 return self->Insert(item, pos, data);
             if (clientData) {
                 wxPyClientData* data = new wxPyClientData(clientData);
                 return self->Insert(item, pos, data);


@@ -193,7 +191,7 @@ optionally associating some data object with the item.", "");
         "Removes all items from the control.", "");
     
     DocDeclStr(
         "Removes all items from the control.", "");
     
     DocDeclStr(

-        virtual void , Delete(unsigned int n),
+        virtual void , Delete(/*unsigned*/ int n),

         "Deletes the item at the zero-based index 'n' from the control. Note
 that it is an error (signalled by a `wx.PyAssertionError` exception if
 enabled) to remove an item with the index negative or greater or equal
         "Deletes the item at the zero-based index 'n' from the control. Note
 that it is an error (signalled by a `wx.PyAssertionError` exception if
 enabled) to remove an item with the index negative or greater or equal


@@ -205,7 +203,7 @@ than the number of items in the control.", "");
      %extend {
         DocStr(GetClientData,
                "Returns the client data associated with the given item, (if any.)", "");
      %extend {
         DocStr(GetClientData,
                "Returns the client data associated with the given item, (if any.)", "");

-        PyObject* GetClientData(unsigned int n) {
+        PyObject* GetClientData(/*unsigned*/ int n) {

             wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
             if (data) {
                 Py_INCREF(data->m_obj);
             wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
             if (data) {
                 Py_INCREF(data->m_obj);


@@ -218,7 +216,7 @@ than the number of items in the control.", "");
 
         DocStr(SetClientData,
                "Associate the given client data with the item at position n.", "");
 
         DocStr(SetClientData,
                "Associate the given client data with the item at position n.", "");

-        void SetClientData(unsigned int n, PyObject* clientData) {
+        void SetClientData(/*unsigned*/ int n, PyObject* clientData) {

             wxPyClientData* data = new wxPyClientData(clientData);
             self->SetClientObject(n, data);
         }
             wxPyClientData* data = new wxPyClientData(clientData);
             self->SetClientObject(n, data);
         }


@@ -227,7 +225,7 @@ than the number of items in the control.", "");
 
     
     DocDeclStr(
 
     
     DocDeclStr(

-        virtual unsigned int , GetCount() const,
+        virtual /*unsigned*/ int , GetCount() const,

         "Returns the number of items in the control.", "");
     
     DocDeclStr(
         "Returns the number of items in the control.", "");
     
     DocDeclStr(


@@ -235,7 +233,7 @@ than the number of items in the control.", "");
         "Returns True if the control is empty or False if it has some items.", "");
     
     DocDeclStr(
         "Returns True if the control is empty or False if it has some items.", "");
     
     DocDeclStr(

-        virtual wxString , GetString(unsigned int n) const,
+        virtual wxString , GetString(/*unsigned*/ int n) const,

         "Returns the label of the item with the given index.", "");
     
     DocDeclStr(
         "Returns the label of the item with the given index.", "");
     
     DocDeclStr(


@@ -243,7 +241,7 @@ than the number of items in the control.", "");
         "", "");
     
     DocDeclStr(
         "", "");
     
     DocDeclStr(

-        virtual void , SetString(unsigned int n, const wxString& s),
+        virtual void , SetString(/*unsigned*/ int n, const wxString& s),

         "Sets the label for the given item.", "");
     
     DocDeclStr(
         "Sets the label for the given item.", "");
     
     DocDeclStr(


@@ -288,7 +286,12 @@ slightly more natural for controls which support multiple selection.", "");
             for i in items:
                 self.Append(i)        
     }
             for i in items:
                 self.Append(i)        
     }

-    %property(Items, GetItems, SetItems);
+    
+    %property(Count, GetCount, doc="See `GetCount`");
+    %property(Items, GetItems, SetItems, doc="See `GetItems` and `SetItems`");
+    %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`");
+    %property(StringSelection, GetStringSelection, SetStringSelection, doc="See `GetStringSelection` and `SetStringSelection`");
+    %property(Strings, GetStrings, doc="See `GetStrings`");

     
 };
 
     
 };