save a reference to the bitmap so it doesn't get destroyed before the

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

diff --git a/wxPython/src/_combobox.i b/wxPython/src/_combobox.i
index 67837b62a6853a706b9d193b0fd758dae1df0f7e..d593ea6f120b25800693503956817abbe5b6c31e 100644 (file)
--- a/wxPython/src/_combobox.i
+++ b/wxPython/src/_combobox.i
@@ -83,7 +83,7 @@ public:
                    const wxString& name = wxPyComboBoxNameStr),
         "__init__(Window parent, int id, String value=EmptyString,
     Point pos=DefaultPosition, Size size=DefaultSize,
                    const wxString& name = wxPyComboBoxNameStr),
         "__init__(Window parent, int id, String value=EmptyString,
     Point pos=DefaultPosition, Size size=DefaultSize,

-    List choices=[], long style=0, Validator validator=DefaultValidator,
+    List choices=EmptyList, long style=0, Validator validator=DefaultValidator,

     String name=ComboBoxNameStr) -> ComboBox",
         "Constructor, creates and shows a ComboBox control.", "");
 
     String name=ComboBoxNameStr) -> ComboBox",
         "Constructor, creates and shows a ComboBox control.", "");
 


@@ -104,7 +104,7 @@ public:
                      const wxString& name = wxPyChoiceNameStr),
         "Create(Window parent, int id, String value=EmptyString,
     Point pos=DefaultPosition, Size size=DefaultSize,
                      const wxString& name = wxPyChoiceNameStr),
         "Create(Window parent, int id, String value=EmptyString,
     Point pos=DefaultPosition, Size size=DefaultSize,

-    List choices=[], long style=0, Validator validator=DefaultValidator,
+    List choices=EmptyList, long style=0, Validator validator=DefaultValidator,

     String name=ChoiceNameStr) -> bool",
         "Actually create the GUI wxComboBox control for 2-phase creation", "");
     
     String name=ChoiceNameStr) -> bool",
         "Actually create the GUI wxComboBox control for 2-phase creation", "");
     


@@ -157,15 +157,30 @@ combobox text field.", "");
         "Selects the text between the two positions in the combobox text field.", "",
         SetMark);    
 
         "Selects the text between the two positions in the combobox text field.", "",
         SetMark);    
 

-#ifdef __WXMSW__
+#ifndef __WXMAC__

     DocDeclAStrName(
         virtual void , GetSelection(long* OUTPUT, long* OUTPUT),
         "GetMark(self) -> (from, to)",
         "Gets the positions of the begining and ending of the selection mark in
 the combobox text field.", "",
         GetMark);
     DocDeclAStrName(
         virtual void , GetSelection(long* OUTPUT, long* OUTPUT),
         "GetMark(self) -> (from, to)",
         "Gets the positions of the begining and ending of the selection mark in
 the combobox text field.", "",
         GetMark);

+#else
+    %pythoncode {
+        def GetMark(self):
+            return (0,0)
+    }

 #endif
 #endif

+    

 
 

+    DocDeclStr(
+        int , GetCurrentSelection() const,
+        "Unlike `GetSelection` which only returns the accepted selection value,
+i.e. the selection in the control once the user closes the dropdown
+list, this function returns the current selection.  That is, while the
+dropdown list is shown, it returns the currently selected item in
+it. When it is not shown, its result is the same as for the other
+function.", "");
+    

     DocDeclStr(
         bool , SetStringSelection(const wxString& string),
         "Select the item with the specifed string", "");
     DocDeclStr(
         bool , SetStringSelection(const wxString& string),
         "Select the item with the specifed string", "");


@@ -237,6 +252,13 @@ redone.  Only available on Windows.", "");
     
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

+
+    %property(CurrentSelection, GetCurrentSelection, doc="See `GetCurrentSelection`");
+    %property(InsertionPoint, GetInsertionPoint, SetInsertionPoint, doc="See `GetInsertionPoint` and `SetInsertionPoint`");
+    %property(LastPosition, GetLastPosition, doc="See `GetLastPosition`");
+    %property(Mark, GetMark, SetMark, doc="See `GetMark` and `SetMark`");
+    %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`");
+

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