Use kControlContentIconRef when recreating the tool for toggled state

[wxWidgets.git] / wxPython / src / mac / _controls.py

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index 988d2161113f8fc6d65171ad13eaeba2b2990819..cb9f2787a6ce4d117f21aae2293ba24b7b388f21 100644 (file)
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -4831,7 +4831,6 @@ class ListCtrl(_core.Control):
     CountPerPage = property(GetCountPerPage,doc="See `GetCountPerPage`") 
     EditControl = property(GetEditControl,doc="See `GetEditControl`") 
     FocusedItem = property(GetFocusedItem,doc="See `GetFocusedItem`") 
-    ImageList = property(GetImageList,SetImageList,doc="See `GetImageList` and `SetImageList`") 
     ItemCount = property(GetItemCount,SetItemCount,doc="See `GetItemCount` and `SetItemCount`") 
     MainWindow = property(GetMainWindow,doc="See `GetMainWindow`") 
     SelectedItemCount = property(GetSelectedItemCount,doc="See `GetSelectedItemCount`") 
@@ -5319,6 +5318,10 @@ class TreeCtrl(_core.Control):
         """IsBold(self, TreeItemId item) -> bool"""
         return _controls_.TreeCtrl_IsBold(*args, **kwargs)
 
+    def IsEmpty(*args, **kwargs):
+        """IsEmpty(self) -> bool"""
+        return _controls_.TreeCtrl_IsEmpty(*args, **kwargs)
+
     def GetChildrenCount(*args, **kwargs):
         """GetChildrenCount(self, TreeItemId item, bool recursively=True) -> size_t"""
         return _controls_.TreeCtrl_GetChildrenCount(*args, **kwargs)
@@ -5431,6 +5434,14 @@ class TreeCtrl(_core.Control):
         """Collapse(self, TreeItemId item)"""
         return _controls_.TreeCtrl_Collapse(*args, **kwargs)
 
+    def CollapseAllChildren(*args, **kwargs):
+        """CollapseAllChildren(self, TreeItemId item)"""
+        return _controls_.TreeCtrl_CollapseAllChildren(*args, **kwargs)
+
+    def CollapseAll(*args, **kwargs):
+        """CollapseAll(self)"""
+        return _controls_.TreeCtrl_CollapseAll(*args, **kwargs)
+
     def CollapseAndReset(*args, **kwargs):
         """CollapseAndReset(self, TreeItemId item)"""
         return _controls_.TreeCtrl_CollapseAndReset(*args, **kwargs)
@@ -7129,7 +7140,7 @@ class SearchCtrl(TextCtrl):
     A search control is a composite of a `wx.TextCtrl` with optional
     bitmap buttons and a drop-down menu.  Controls like this can typically
     be found on a toolbar of applications that support some form of search
-    functionality.  On the Mac this control is implemneted using the
+    functionality.  On the Mac this control is implemented using the
     native HISearchField control, on the other platforms a generic control
     is used, although that may change in the future as more platforms
     introduce native search widgets.
@@ -7162,7 +7173,7 @@ class SearchCtrl(TextCtrl):
         A search control is a composite of a `wx.TextCtrl` with optional
         bitmap buttons and a drop-down menu.  Controls like this can typically
         be found on a toolbar of applications that support some form of search
-        functionality.  On the Mac this control is implemneted using the
+        functionality.  On the Mac this control is implemented using the
         native HISearchField control, on the other platforms a generic control
         is used, although that may change in the future as more platforms
         introduce native search widgets.
@@ -7293,10 +7304,10 @@ def PreSearchCtrl(*args, **kwargs):
     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)
+wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN
+wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN
+EVT_SEARCHCTRL_CANCEL_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1)
+EVT_SEARCHCTRL_SEARCH_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1)