X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9159fe8e8f1b3653c506805cbb79280aa2a0f38..b7fc54becc0a72fa5b8c8bb30f4e087f93ad83d3:/wxPython/src/msw/windows.py

diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py
index e5b042c213..d3bba2d6d4 100644
--- a/wxPython/src/msw/windows.py
+++ b/wxPython/src/msw/windows.py
@@ -5,6 +5,8 @@ from misc import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 import wx
 
@@ -117,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
@@ -366,9 +365,6 @@ 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)
-        return val
     def RemoveChild(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_RemoveChild,(self,) + _args, _kwargs)
         return val
@@ -403,6 +399,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
@@ -439,6 +438,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
@@ -472,9 +487,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
@@ -511,6 +523,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
@@ -601,6 +616,18 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetDefaultItem(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetDefaultItem,(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
@@ -671,9 +698,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
@@ -724,6 +748,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
@@ -1142,6 +1169,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