X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1679124ae303fb78561ee2b0c56b5831fd0fafe..9fd9e47a93dfcdd99c2722e288a0f28a51ce6f5f:/wxPython/src/msw/sizers.py

diff --git a/wxPython/src/msw/sizers.py b/wxPython/src/msw/sizers.py
index bfd80918ca..5ec6b397d9 100644
--- a/wxPython/src/msw/sizers.py
+++ b/wxPython/src/msw/sizers.py
@@ -7,6 +7,8 @@ from windows import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from controls import *
@@ -14,10 +16,17 @@ from controls import *
 from events import *
 import wx
 import string
-class wxSizerItemPtr :
+class wxSizerItemPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def DeleteWindows(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizerItem_DeleteWindows,(self,) + _args, _kwargs)
+        return val
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizerItem_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
+        return val
     def GetSize(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizerItem_GetSize,(self,) + _args, _kwargs)
         if val: val = wxSizePtr(val) ; val.thisown = 1
@@ -52,14 +61,12 @@ class wxSizerItemPtr :
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizerItem_GetWindow,(self,) + _args, _kwargs)
-        if val: val = wxWindowPtr(val) 
         return val
     def SetWindow(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizerItem_SetWindow,(self,) + _args, _kwargs)
         return val
     def GetSizer(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizerItem_GetSizer,(self,) + _args, _kwargs)
-        if val: val = wxSizerPtr(val) 
         return val
     def SetSizer(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizerItem_SetSizer,(self,) + _args, _kwargs)
@@ -97,10 +104,13 @@ class wxSizerItem(wxSizerItemPtr):
 
 
 
-class wxSizerPtr :
+class wxSizerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def _setOORInfo(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizer__setOORInfo,(self,) + _args, _kwargs)
+        return val
     def Destroy(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizer_Destroy,(self,) + _args, _kwargs)
         return val
@@ -176,6 +186,12 @@ class wxSizerPtr :
     def SetSizeHints(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizer_SetSizeHints,(self,) + _args, _kwargs)
         return val
+    def Clear(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizer_Clear,(self,) + _args, _kwargs)
+        return val
+    def DeleteWindows(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizer_DeleteWindows,(self,) + _args, _kwargs)
+        return val
     def GetChildren(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizer_GetChildren,(self,) + _args, _kwargs)
         return val
@@ -229,6 +245,14 @@ class wxSizerPtr :
         else:
             apply(self.SetItemMinSizeWindow, args)
      
+    
+    def GetSizeTuple(self):
+        return self.GetSize().asTuple()
+    def GetPositionTuple(self):
+        return self.GetPosition().asTuple()
+    def GetMinSizeTuple(self):
+        return self.GetMinSize().asTuple()
+    
 class wxSizer(wxSizerPtr):
     def __init__(self,this):
         self.this = this
@@ -240,8 +264,8 @@ class wxPySizerPtr(wxSizerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(sizersc.wxPySizer__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(sizersc.wxPySizer__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxPySizer instance at %s>" % (self.this,)
@@ -249,7 +273,8 @@ class wxPySizer(wxPySizerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(sizersc.new_wxPySizer,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPySizer)
+        self._setCallbackInfo(self, wxPySizer)
+        self._setOORInfo(self)
 
 
 
@@ -274,6 +299,7 @@ class wxBoxSizer(wxBoxSizerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(sizersc.new_wxBoxSizer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -284,7 +310,6 @@ class wxStaticBoxSizerPtr(wxBoxSizerPtr):
         self.thisown = 0
     def GetStaticBox(self, *_args, **_kwargs):
         val = apply(sizersc.wxStaticBoxSizer_GetStaticBox,(self,) + _args, _kwargs)
-        if val: val = wxStaticBoxPtr(val) 
         return val
     def RecalcSizes(self, *_args, **_kwargs):
         val = apply(sizersc.wxStaticBoxSizer_RecalcSizes,(self,) + _args, _kwargs)
@@ -299,6 +324,7 @@ class wxStaticBoxSizer(wxStaticBoxSizerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(sizersc.new_wxStaticBoxSizer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -316,7 +342,6 @@ class wxNotebookSizerPtr(wxSizerPtr):
         return val
     def GetNotebook(self, *_args, **_kwargs):
         val = apply(sizersc.wxNotebookSizer_GetNotebook,(self,) + _args, _kwargs)
-        if val: val = wxNotebookPtr(val) 
         return val
     def __repr__(self):
         return "<C wxNotebookSizer instance at %s>" % (self.this,)
@@ -324,6 +349,7 @@ class wxNotebookSizer(wxNotebookSizerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(sizersc.new_wxNotebookSizer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -369,6 +395,7 @@ class wxGridSizer(wxGridSizerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(sizersc.new_wxGridSizer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -402,6 +429,7 @@ class wxFlexGridSizer(wxFlexGridSizerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(sizersc.new_wxFlexGridSizer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)