Use "&Help" so wxMac doesn't make an extra help menu

[wxWidgets.git] / wxPython / src / msw / controls.py

diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py
index a85186c8893114a042d3aa040781d14e2902f138..be2571c57eadada7192ad44febc570335ee0adb2 100644 (file)
--- a/wxPython/src/msw/controls.py
+++ b/wxPython/src/msw/controls.py
@@ -800,6 +800,8 @@ class StaticBitmap(core.Control):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

+        self._setOORInfo(self)
+

     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 


@@ -2248,8 +2250,8 @@ class Notebook(BookCtrl):
         return "<%s.%s; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=0, String name=NOTEBOOK_NAME) -> Notebook
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=NOTEBOOK_NAME) -> Notebook

         """
         newobj = _controls.new_Notebook(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_Notebook(*args, **kwargs)
         self.this = newobj.this


@@ -2375,8 +2377,8 @@ class Listbook(BookCtrl):
         return "<%s.%s; proxy of C++ wxListbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxListbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=0, String name=EmptyString) -> Listbook
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=EmptyString) -> Listbook

         """
         newobj = _controls.new_Listbook(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_Listbook(*args, **kwargs)
         self.this = newobj.this


@@ -3453,34 +3455,11 @@ class ListCtrl(core.Control):
         return _controls.ListCtrl__setCallbackInfo(*args, **kwargs)
 
     def SetForegroundColour(*args, **kwargs):
         return _controls.ListCtrl__setCallbackInfo(*args, **kwargs)
 
     def SetForegroundColour(*args, **kwargs):

-        """
-        SetForegroundColour(Colour col) -> bool
-
-        Sets the foreground colour of the window.  Returns True is the colour
-        was changed.  The interpretation of foreground colour is dependent on
-        the window class; it may be the text colour or other colour, or it may
-        not be used at all.
-        """
+        """SetForegroundColour(Colour col) -> bool"""

         return _controls.ListCtrl_SetForegroundColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _controls.ListCtrl_SetForegroundColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """
-        SetBackgroundColour(Colour col) -> bool
-
-        Sets the background colour of the window.  Returns True if the colour
-        was changed.  The background colour is usually painted by the default
-        EVT_ERASE_BACKGROUND event handler function under Windows and
-        automatically under GTK.
-
-        Note that setting the background colour does not cause an immediate
-        refresh, so you may wish to call ClearBackground or Refresh after
-        calling this function.
-
-        Use this function with care under GTK+ as the new appearance of the
-        window might not look equally well when used with themes, i.e GTK+'s
-        ability to change its look as the user wishes with run-time loadable
-        modules.
-        """
+        """SetBackgroundColour(Colour col) -> bool"""

         return _controls.ListCtrl_SetBackgroundColour(*args, **kwargs)
 
     def GetColumn(*args, **kwargs):
         return _controls.ListCtrl_SetBackgroundColour(*args, **kwargs)
 
     def GetColumn(*args, **kwargs):


@@ -3625,6 +3604,10 @@ class ListCtrl(core.Control):
         """AssignImageList(ImageList imageList, int which)"""
         return _controls.ListCtrl_AssignImageList(*args, **kwargs)
 
         """AssignImageList(ImageList imageList, int which)"""
         return _controls.ListCtrl_AssignImageList(*args, **kwargs)
 

+    def InReportView(*args, **kwargs):
+        """InReportView() -> bool"""
+        return _controls.ListCtrl_InReportView(*args, **kwargs)
+

     def IsVirtual(*args, **kwargs):
         """IsVirtual() -> bool"""
         return _controls.ListCtrl_IsVirtual(*args, **kwargs)
     def IsVirtual(*args, **kwargs):
         """IsVirtual() -> bool"""
         return _controls.ListCtrl_IsVirtual(*args, **kwargs)


@@ -4743,6 +4726,14 @@ class PyControl(core.Control):
         """base_RemoveChild(Window child)"""
         return _controls.PyControl_base_RemoveChild(*args, **kwargs)
 
         """base_RemoveChild(Window child)"""
         return _controls.PyControl_base_RemoveChild(*args, **kwargs)
 

+    def base_ShouldInheritColours(*args, **kwargs):
+        """base_ShouldInheritColours() -> bool"""
+        return _controls.PyControl_base_ShouldInheritColours(*args, **kwargs)
+
+    def base_ApplyParentThemeBackground(*args, **kwargs):
+        """base_ApplyParentThemeBackground(Colour c)"""
+        return _controls.PyControl_base_ApplyParentThemeBackground(*args, **kwargs)
+

 
 class PyControlPtr(PyControl):
     def __init__(self, this):
 
 class PyControlPtr(PyControl):
     def __init__(self, this):


@@ -4751,6 +4742,12 @@ class PyControlPtr(PyControl):
         self.__class__ = PyControl
 _controls.PyControl_swigregister(PyControlPtr)
 
         self.__class__ = PyControl
 _controls.PyControl_swigregister(PyControlPtr)
 

+def PrePyControl(*args, **kwargs):
+    """PrePyControl() -> PyControl"""
+    val = _controls.new_PrePyControl(*args, **kwargs)
+    val.thisown = 1
+    return val
+

 #---------------------------------------------------------------------------
 
 FRAME_EX_CONTEXTHELP = _controls.FRAME_EX_CONTEXTHELP
 #---------------------------------------------------------------------------
 
 FRAME_EX_CONTEXTHELP = _controls.FRAME_EX_CONTEXTHELP