X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68bc8549d81adc1b6f031bdbb03b91a71944197c..a4353f07c6b37712634d4b2d86527b647a08044f:/wxPython/src/msw/windows.py

diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py
index 476245bcbb..a79d3e40bd 100644
--- a/wxPython/src/msw/windows.py
+++ b/wxPython/src/msw/windows.py
@@ -119,9 +119,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Create(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Create,(self,) + _args, _kwargs)
         return val
-    def CaptureMouse(self, *_args, **_kwargs):
-        val = apply(windowsc.wxWindow_CaptureMouse,(self,) + _args, _kwargs)
-        return val
     def Center(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Center,(self,) + _args, _kwargs)
         return val
@@ -368,8 +365,8 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def RefreshRect(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_RefreshRect,(self,) + _args, _kwargs)
         return val
-    def ReleaseMouse(self, *_args, **_kwargs):
-        val = apply(windowsc.wxWindow_ReleaseMouse,(self,) + _args, _kwargs)
+    def AddChild(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_AddChild,(self,) + _args, _kwargs)
         return val
     def RemoveChild(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_RemoveChild,(self,) + _args, _kwargs)
@@ -405,6 +402,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetFocus(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetFocus,(self,) + _args, _kwargs)
         return val
+    def SetFocusFromKbd(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetFocusFromKbd,(self,) + _args, _kwargs)
+        return val
     def AcceptsFocus(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_AcceptsFocus,(self,) + _args, _kwargs)
         return val
@@ -441,6 +441,22 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetSizeHints(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetSizeHints,(self,) + _args, _kwargs)
         return val
+    def SetVirtualSizeHints(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetVirtualSizeHints,(self,) + _args, _kwargs)
+        return val
+    def SetVirtualSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetVirtualSize,(self,) + _args, _kwargs)
+        return val
+    def SetVirtualSizeWH(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetVirtualSizeWH,(self,) + _args, _kwargs)
+        return val
+    def GetVirtualSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetVirtualSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def GetVirtualSizeTuple(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetVirtualSizeTuple,(self,) + _args, _kwargs)
+        return val
     def SetClientSizeWH(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetClientSizeWH,(self,) + _args, _kwargs)
         return val
@@ -450,6 +466,10 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetCursor(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetCursor,(self,) + _args, _kwargs)
         return val
+    def GetCursor(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetCursor,(self,) + _args, _kwargs)
+        if val: val = wxCursorPtr(val) 
+        return val
     def SetEventHandler(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetEventHandler,(self,) + _args, _kwargs)
         return val
@@ -474,9 +494,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Validate(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Validate,(self,) + _args, _kwargs)
         return val
-    def WarpPointer(self, *_args, **_kwargs):
-        val = apply(windowsc.wxWindow_WarpPointer,(self,) + _args, _kwargs)
-        return val
     def ConvertDialogPointToPixels(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_ConvertDialogPointToPixels,(self,) + _args, _kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
@@ -513,6 +530,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetSizer(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetSizer,(self,) + _args, _kwargs)
         return val
+    def SetSizerAndFit(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetSizerAndFit,(self,) + _args, _kwargs)
+        return val
     def GetSizer(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetSizer,(self,) + _args, _kwargs)
         return val
@@ -603,6 +623,21 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetDefaultItem(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetDefaultItem,(self,) + _args, _kwargs)
         return val
+    def SetTmpDefaultItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetTmpDefaultItem,(self,) + _args, _kwargs)
+        return val
+    def WarpPointer(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_WarpPointer,(self,) + _args, _kwargs)
+        return val
+    def CaptureMouse(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_CaptureMouse,(self,) + _args, _kwargs)
+        return val
+    def ReleaseMouse(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ReleaseMouse,(self,) + _args, _kwargs)
+        return val
+    def HasCapture(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_HasCapture,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxWindow instance at %s>" % (self.this,)
     # replaces broken shadow method
@@ -673,9 +708,6 @@ class wxScrolledWindowPtr(wxPanelPtr):
     def GetTargetWindow(self, *_args, **_kwargs):
         val = apply(windowsc.wxScrolledWindow_GetTargetWindow,(self,) + _args, _kwargs)
         return val
-    def GetVirtualSize(self, *_args, **_kwargs):
-        val = apply(windowsc.wxScrolledWindow_GetVirtualSize,(self,) + _args, _kwargs)
-        return val
     def IsRetained(self, *_args, **_kwargs):
         val = apply(windowsc.wxScrolledWindow_IsRetained,(self,) + _args, _kwargs)
         return val
@@ -726,6 +758,9 @@ class wxScrolledWindowPtr(wxPanelPtr):
     def Layout(self, *_args, **_kwargs):
         val = apply(windowsc.wxScrolledWindow_Layout,(self,) + _args, _kwargs)
         return val
+    def SetScrollRate(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_SetScrollRate,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxScrolledWindow instance at %s>" % (self.this,)
     ViewStart = GetViewStart
@@ -1093,13 +1128,6 @@ class wxMenuItemPtr(wxObjectPtr):
     def SetBitmaps(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenuItem_SetBitmaps,(self,) + _args, _kwargs)
         return val
-    def SetBitmap(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_SetBitmap,(self,) + _args, _kwargs)
-        return val
-    def GetBitmap(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_GetBitmap,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) ; val.thisown = 1
-        return val
     def SetMarginWidth(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenuItem_SetMarginWidth,(self,) + _args, _kwargs)
         return val
@@ -1112,6 +1140,13 @@ class wxMenuItemPtr(wxObjectPtr):
     def ResetOwnerDrawn(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenuItem_ResetOwnerDrawn,(self,) + _args, _kwargs)
         return val
+    def SetBitmap(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetBitmap,(self,) + _args, _kwargs)
+        return val
+    def GetBitmap(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetBitmap,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 
+        return val
     def __repr__(self):
         return "<C wxMenuItem instance at %s>" % (self.this,)
 class wxMenuItem(wxMenuItemPtr):
@@ -1130,6 +1165,18 @@ def wxWindow_FromHWND(*_args, **_kwargs):
     val = apply(windowsc.wxWindow_FromHWND,_args,_kwargs)
     return val
 
+def wxFindWindowById(*_args, **_kwargs):
+    val = apply(windowsc.wxFindWindowById,_args,_kwargs)
+    return val
+
+def wxFindWindowByName(*_args, **_kwargs):
+    val = apply(windowsc.wxFindWindowByName,_args,_kwargs)
+    return val
+
+def wxFindWindowByLabel(*_args, **_kwargs):
+    val = apply(windowsc.wxFindWindowByLabel,_args,_kwargs)
+    return val
+
 wxValidator_IsSilent = windowsc.wxValidator_IsSilent
 
 wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError
@@ -1144,6 +1191,10 @@ wxWindow_NextControlId = windowsc.wxWindow_NextControlId
 
 wxWindow_PrevControlId = windowsc.wxWindow_PrevControlId
 
+def wxWindow_GetCapture(*_args, **_kwargs):
+    val = apply(windowsc.wxWindow_GetCapture,_args,_kwargs)
+    return val
+
 wxMenuItem_GetLabelFromText = windowsc.wxMenuItem_GetLabelFromText
 
 wxMenuItem_GetDefaultMarginWidth = windowsc.wxMenuItem_GetDefaultMarginWidth