Don't confuse SWIG with static and non-static methods of the same name

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

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index 9918d65287c84f3a31d5c51326a4ac02b406ba9b..225a7539f8113c0033f834183329e796710b60c2 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -200,6 +200,8 @@ ID_HELP_CONTENTS = _core_.ID_HELP_CONTENTS
 ID_HELP_COMMANDS = _core_.ID_HELP_COMMANDS
 ID_HELP_PROCEDURES = _core_.ID_HELP_PROCEDURES
 ID_HELP_CONTEXT = _core_.ID_HELP_CONTEXT
+ID_HELP_INDEX = _core_.ID_HELP_INDEX
+ID_HELP_SEARCH = _core_.ID_HELP_SEARCH
 ID_CLOSE_ALL = _core_.ID_CLOSE_ALL
 ID_PREFERENCES = _core_.ID_PREFERENCES
 ID_CUT = _core_.ID_CUT
@@ -844,6 +846,14 @@ class Size(object):
         """
         return _core_.Size_DecTo(*args, **kwargs)
 
+    def Scale(*args, **kwargs):
+        """
+        Scale(self, float xscale, float yscale)
+
+        Scales the dimensions of this object by the given factors.
+        """
+        return _core_.Size_Scale(*args, **kwargs)
+
     def Set(*args, **kwargs):
         """
         Set(self, int w, int h)
@@ -1691,8 +1701,6 @@ class FSFile(Object):
             DateTime modif) -> FSFile
         """
         _core_.FSFile_swiginit(self,_core_.new_FSFile(*args, **kwargs))
-        self.thisown = 0   # It will normally be deleted by the user of the wx.FileSystem
-
     __swig_destroy__ = _core_.delete_FSFile
     __del__ = lambda self : None;
     def GetStream(*args, **kwargs):
@@ -1984,6 +1992,10 @@ class ImageHandler(Object):
         """CanRead(self, String name) -> bool"""
         return _core_.ImageHandler_CanRead(*args, **kwargs)
 
+    def CanReadStream(*args, **kwargs):
+        """CanReadStream(self, InputStream stream) -> bool"""
+        return _core_.ImageHandler_CanReadStream(*args, **kwargs)
+
     def SetName(*args, **kwargs):
         """SetName(self, String name)"""
         return _core_.ImageHandler_SetName(*args, **kwargs)
@@ -4818,6 +4830,15 @@ class KeyEvent(Event):
         return _core_.KeyEvent_GetUnicodeKey(*args, **kwargs)
 
     GetUniChar = GetUnicodeKey 
+    def SetUnicodeKey(*args, **kwargs):
+        """
+        SetUnicodeKey(self, int uniChar)
+
+        Set the Unicode value of the key event, but only if this is a Unicode
+        build of wxPython.
+        """
+        return _core_.KeyEvent_SetUnicodeKey(*args, **kwargs)
+
     def GetRawKeyCode(*args, **kwargs):
         """
         GetRawKeyCode(self) -> unsigned int
@@ -8266,31 +8287,6 @@ class Window(EvtHandler):
         """
         return _core_.Window_AcceptsFocusFromKeyboard(*args, **kwargs)
 
-    def GetDefaultItem(*args, **kwargs):
-        """
-        GetDefaultItem(self) -> Window
-
-        Get the default child of this parent, i.e. the one which is activated
-        by pressing <Enter> such as the OK button on a wx.Dialog.
-        """
-        return _core_.Window_GetDefaultItem(*args, **kwargs)
-
-    def SetDefaultItem(*args, **kwargs):
-        """
-        SetDefaultItem(self, Window child) -> Window
-
-        Set this child as default, return the old default.
-        """
-        return _core_.Window_SetDefaultItem(*args, **kwargs)
-
-    def SetTmpDefaultItem(*args, **kwargs):
-        """
-        SetTmpDefaultItem(self, Window win)
-
-        Set this child as temporary default
-        """
-        return _core_.Window_SetTmpDefaultItem(*args, **kwargs)
-
     def Navigate(*args, **kwargs):
         """
         Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool
@@ -9154,6 +9150,10 @@ class Window(EvtHandler):
         """
         return _core_.Window_PopupMenu(*args, **kwargs)
 
+    def HasMultiplePages(*args, **kwargs):
+        """HasMultiplePages(self) -> bool"""
+        return _core_.Window_HasMultiplePages(*args, **kwargs)
+
     def GetHandle(*args, **kwargs):
         """
         GetHandle(self) -> long
@@ -9317,6 +9317,18 @@ class Window(EvtHandler):
         """
         return _core_.Window_SetHelpTextForId(*args, **kwargs)
 
+    def GetHelpTextAtPoint(*args, **kwargs):
+        """
+        GetHelpTextAtPoint(self, Point pt, wxHelpEvent::Origin origin) -> String
+
+        Get the help string associated with the given position in this window.
+
+        Notice that pt may be invalid if event origin is keyboard or unknown
+        and this method should return the global window help text then
+
+        """
+        return _core_.Window_GetHelpTextAtPoint(*args, **kwargs)
+
     def GetHelpText(*args, **kwargs):
         """
         GetHelpText(self) -> String
@@ -9544,7 +9556,7 @@ class Window(EvtHandler):
             self._setCallbackInfo(self, self.__class__)
 
     def SendSizeEvent(self):
-        self.GetEventhandler().ProcessEvent(wx.SizeEvent((-1,-1)))
+        self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1)))
 
 _core_.Window_swigregister(Window)
 
@@ -10372,6 +10384,23 @@ class Control(Window):
         """
         return _core_.Control_Create(*args, **kwargs)
 
+    def GetAlignment(*args, **kwargs):
+        """
+        GetAlignment(self) -> int
+
+        Get the control alignment (left/right/centre, top/bottom/centre)
+        """
+        return _core_.Control_GetAlignment(*args, **kwargs)
+
+    def GetLabelText(*args):
+        """
+        GetLabelText(self, String label) -> String
+        GetLabelText(self) -> String
+
+        Get just the text of the label, without mnemonic characters ('&')
+        """
+        return _core_.Control_GetLabelText(*args)
+
     def Command(*args, **kwargs):
         """
         Command(self, CommandEvent event)
@@ -10965,8 +10994,8 @@ class Sizer(Object):
     wx.Sizer is the abstract base class used for laying out subwindows in
     a window.  You cannot use wx.Sizer directly; instead, you will have to
     use one of the sizer classes derived from it such as `wx.BoxSizer`,
-    `wx.StaticBoxSizer`, `wx.NotebookSizer`, `wx.GridSizer`,  `wx.FlexGridSizer`
-    and `wx.GridBagSizer`.
+    `wx.StaticBoxSizer`, `wx.GridSizer`, `wx.FlexGridSizer` and
+    `wx.GridBagSizer`.
 
     The concept implemented by sizers in wxWidgets is closely related to
     layout tools in other GUI toolkits, such as Java's AWT, the GTK