X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5172800e29f9c4b3f4dfa9737f80114a61e55f1f..ec184e324214ea06f0c056ab626de5f32bcdad3b:/wxPython/src/mac/_controls.py

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index 504546def8..d249504783 100644
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -701,14 +701,6 @@ class ComboBox(_core.Control,_core.ItemContainer):
         """
         return _controls_.ComboBox_SetStringSelection(*args, **kwargs)
 
-    def SetString(*args, **kwargs):
-        """
-        SetString(self, int n, String string)
-
-        Set the label for the n'th item (zero based) in the list.
-        """
-        return _controls_.ComboBox_SetString(*args, **kwargs)
-
     def SetEditable(*args, **kwargs):
         """SetEditable(self, bool editable)"""
         return _controls_.ComboBox_SetEditable(*args, **kwargs)
@@ -1020,6 +1012,7 @@ _controls_.StaticBox_swigregister(StaticBox)
 StaticBitmapNameStr = cvar.StaticBitmapNameStr
 StaticBoxNameStr = cvar.StaticBoxNameStr
 StaticTextNameStr = cvar.StaticTextNameStr
+StaticLineNameStr = cvar.StaticLineNameStr
 
 def PreStaticBox(*args, **kwargs):
     """PreStaticBox() -> StaticBox"""
@@ -1053,7 +1046,7 @@ class StaticLine(_core.Control):
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=LI_HORIZONTAL, 
-            String name=StaticTextNameStr) -> StaticLine
+            String name=StaticLineNameStr) -> StaticLine
         """
         _controls_.StaticLine_swiginit(self,_controls_.new_StaticLine(*args, **kwargs))
         self._setOORInfo(self)
@@ -1062,7 +1055,7 @@ class StaticLine(_core.Control):
         """
         Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=LI_HORIZONTAL, 
-            String name=StaticTextNameStr) -> bool
+            String name=StaticLineNameStr) -> bool
         """
         return _controls_.StaticLine_Create(*args, **kwargs)
 
@@ -1923,6 +1916,10 @@ class TextCtrl(_core.Control):
         """SetEditable(self, bool editable)"""
         return _controls_.TextCtrl_SetEditable(*args, **kwargs)
 
+    def MacCheckSpelling(*args, **kwargs):
+        """MacCheckSpelling(self, bool check)"""
+        return _controls_.TextCtrl_MacCheckSpelling(*args, **kwargs)
+
     def SendTextUpdatedEvent(*args, **kwargs):
         """SendTextUpdatedEvent(self)"""
         return _controls_.TextCtrl_SendTextUpdatedEvent(*args, **kwargs)
@@ -4448,7 +4445,7 @@ class ListCtrl(_core.Control):
             Validator validator=DefaultValidator, String name=ListCtrlNameStr) -> ListCtrl
         """
         _controls_.ListCtrl_swiginit(self,_controls_.new_ListCtrl(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)
+        self._setOORInfo(self);ListCtrl._setCallbackInfo(self, self, ListCtrl)
 
     def Create(*args, **kwargs):
         """
@@ -5171,7 +5168,7 @@ class TreeCtrl(_core.Control):
             String name=TreeCtrlNameStr) -> TreeCtrl
         """
         _controls_.TreeCtrl_swiginit(self,_controls_.new_TreeCtrl(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl)
+        self._setOORInfo(self);TreeCtrl._setCallbackInfo(self, self, TreeCtrl)
 
     def Create(*args, **kwargs):
         """
@@ -5733,7 +5730,7 @@ class PyControl(_core.Control):
             String name=ControlNameStr) -> PyControl
         """
         _controls_.PyControl_swiginit(self,_controls_.new_PyControl(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyControl)
+        self._setOORInfo(self);PyControl._setCallbackInfo(self, self, PyControl)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -7090,6 +7087,8 @@ class CollapsiblePane(_core.Control):
         """
         return _controls_.CollapsiblePane_GetPane(*args, **kwargs)
 
+    Expanded = property(IsExpanded) 
+    Collapsed = property(IsCollapsed) 
 _controls_.CollapsiblePane_swigregister(CollapsiblePane)
 CollapsiblePaneNameStr = cvar.CollapsiblePaneNameStr
 
@@ -7120,7 +7119,89 @@ class CollapsiblePaneEvent(_core.CommandEvent):
         """SetCollapsed(self, bool c)"""
         return _controls_.CollapsiblePaneEvent_SetCollapsed(*args, **kwargs)
 
+    Collapsed = property(GetCollapsed,SetCollapsed) 
 _controls_.CollapsiblePaneEvent_swigregister(CollapsiblePaneEvent)
 
+#---------------------------------------------------------------------------
+
+class SearchCtrl(TextCtrl):
+    """Proxy of C++ SearchCtrl class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, Window parent, int id=-1, String value=wxEmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=0, Validator validator=DefaultValidator, 
+            String name=SearchCtrlNameStr) -> SearchCtrl
+        """
+        _controls_.SearchCtrl_swiginit(self,_controls_.new_SearchCtrl(*args, **kwargs))
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id=-1, String value=wxEmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=0, Validator validator=DefaultValidator, 
+            String name=SearchCtrlNameStr) -> bool
+        """
+        return _controls_.SearchCtrl_Create(*args, **kwargs)
+
+    def SetMenu(*args, **kwargs):
+        """SetMenu(self, Menu menu)"""
+        return _controls_.SearchCtrl_SetMenu(*args, **kwargs)
+
+    def GetMenu(*args, **kwargs):
+        """GetMenu(self) -> Menu"""
+        return _controls_.SearchCtrl_GetMenu(*args, **kwargs)
+
+    def SetSearchButtonVisible(*args, **kwargs):
+        """SetSearchButtonVisible(self, bool show)"""
+        return _controls_.SearchCtrl_SetSearchButtonVisible(*args, **kwargs)
+
+    def GetSearchButtonVisible(*args, **kwargs):
+        """GetSearchButtonVisible(self) -> bool"""
+        return _controls_.SearchCtrl_GetSearchButtonVisible(*args, **kwargs)
+
+    def SetCancelButtonVisible(*args, **kwargs):
+        """SetCancelButtonVisible(self, bool show)"""
+        return _controls_.SearchCtrl_SetCancelButtonVisible(*args, **kwargs)
+
+    def GetCancelButtonVisible(*args, **kwargs):
+        """GetCancelButtonVisible(self) -> bool"""
+        return _controls_.SearchCtrl_GetCancelButtonVisible(*args, **kwargs)
+
+    def SetSearchBitmap(*args, **kwargs):
+        """SetSearchBitmap(self, Bitmap ?)"""
+        return _controls_.SearchCtrl_SetSearchBitmap(*args, **kwargs)
+
+    def SetSearchMenuBitmap(*args, **kwargs):
+        """SetSearchMenuBitmap(self, Bitmap ?)"""
+        return _controls_.SearchCtrl_SetSearchMenuBitmap(*args, **kwargs)
+
+    def SetCancelBitmap(*args, **kwargs):
+        """SetCancelBitmap(self, Bitmap ?)"""
+        return _controls_.SearchCtrl_SetCancelBitmap(*args, **kwargs)
+
+    Menu = property(GetMenu,SetMenu) 
+    SearchButtonVisible = property(GetSearchButtonVisible,SetSearchButtonVisible) 
+    CancelButtonVisible = property(GetCancelButtonVisible,SetCancelButtonVisible) 
+_controls_.SearchCtrl_swigregister(SearchCtrl)
+SearchCtrlNameStr = cvar.SearchCtrlNameStr
+
+def PreSearchCtrl(*args, **kwargs):
+    """
+    PreSearchCtrl() -> SearchCtrl
+
+    Precreate a wx.SearchCtrl for 2-phase creation.
+    """
+    val = _controls_.new_PreSearchCtrl(*args, **kwargs)
+    return val
+
+wxEVT_COMMAND_SEARCHCTRL_CANCEL = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL
+wxEVT_COMMAND_SEARCHCTRL_SEARCH = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH
+EVT_SEARCHCTRL_CANCEL = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL, 1)
+EVT_SEARCHCTRL_SEARCH = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH, 1)
+