added test for HitTest(m_dragPoint) bug to the sample

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

diff --git a/wxPython/src/msw/sizers.py b/wxPython/src/msw/sizers.py
index 9dbce08acbcd1c8081e81eaf60a3992dc3463af4..add97c33f2490b36d06e33806457dcc38ef8c650 100644 (file)
--- a/wxPython/src/msw/sizers.py
+++ b/wxPython/src/msw/sizers.py
@@ -14,7 +14,7 @@ from controls import *
 from events import *
 import wx
 import string
 from events import *
 import wx
 import string

-class wxSizerItemPtr :
+class wxSizerItemPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -52,14 +52,12 @@ class wxSizerItemPtr :
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizerItem_GetWindow,(self,) + _args, _kwargs)
         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)
         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)
         return val
     def SetSizer(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizerItem_SetSizer,(self,) + _args, _kwargs)


@@ -97,7 +95,7 @@ class wxSizerItem(wxSizerItemPtr):
 
 
 
 
 
 

-class wxSizerPtr :
+class wxSizerPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -182,37 +180,37 @@ class wxSizerPtr :
     def __repr__(self):
         return "<C wxSizer instance at %s>" % (self.this,)
     
     def __repr__(self):
         return "<C wxSizer instance at %s>" % (self.this,)
     

-    def Add(self, *args):
+    def Add(self, *args, **kw):

         if type(args[0]) == type(1):
         if type(args[0]) == type(1):

-            apply(self.AddSpacer, args)
+            apply(self.AddSpacer, args, kw)

         elif string.find(args[0].this, 'Sizer') != -1:
         elif string.find(args[0].this, 'Sizer') != -1:

-            apply(self.AddSizer, args)
+            apply(self.AddSizer, args, kw)

         else:
         else:

-            apply(self.AddWindow, args)
+            apply(self.AddWindow, args, kw)

 
 

-    def Insert(self, *args):
+    def Insert(self, *args, **kw):

         if type(args[1]) == type(1):
         if type(args[1]) == type(1):

-            apply(self.InsertSpacer, args)
+            apply(self.InsertSpacer, args, kw)

         elif string.find(args[1].this, 'Sizer') != -1:
         elif string.find(args[1].this, 'Sizer') != -1:

-            apply(self.InsertSizer, args)
+            apply(self.InsertSizer, args, kw)

         else:
         else:

-            apply(self.InsertWindow, args)
+            apply(self.InsertWindow, args, kw)

 
 

-    def Prepend(self, *args):
+    def Prepend(self, *args, **kw):

         if type(args[0]) == type(1):
         if type(args[0]) == type(1):

-            apply(self.PrependSpacer, args)
+            apply(self.PrependSpacer, args, kw)

         elif string.find(args[0].this, 'Sizer') != -1:
         elif string.find(args[0].this, 'Sizer') != -1:

-            apply(self.PrependSizer, args)
+            apply(self.PrependSizer, args, kw)

         else:
         else:

-            apply(self.PrependWindow, args)
+            apply(self.PrependWindow, args, kw)

 
 

-    def Remove(self, *args):
+    def Remove(self, *args, **kw):

         if type(args[0]) == type(1):
         if type(args[0]) == type(1):

-            apply(self.RemovePos, args)
+            apply(self.RemovePos, args, kw)

         elif string.find(args[0].this, 'Sizer') != -1:
         elif string.find(args[0].this, 'Sizer') != -1:

-            apply(self.RemoveSizer, args)
+            apply(self.RemoveSizer, args, kw)

         else:
         else:

-            apply(self.RemoveWindow, args)
+            apply(self.RemoveWindow, args, kw)

 
     def AddMany(self, widgets):
         for childinfo in widgets:
 
     def AddMany(self, widgets):
         for childinfo in widgets:


@@ -284,7 +282,6 @@ class wxStaticBoxSizerPtr(wxBoxSizerPtr):
         self.thisown = 0
     def GetStaticBox(self, *_args, **_kwargs):
         val = apply(sizersc.wxStaticBoxSizer_GetStaticBox,(self,) + _args, _kwargs)
         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)
         return val
     def RecalcSizes(self, *_args, **_kwargs):
         val = apply(sizersc.wxStaticBoxSizer_RecalcSizes,(self,) + _args, _kwargs)


@@ -316,7 +313,6 @@ class wxNotebookSizerPtr(wxSizerPtr):
         return val
     def GetNotebook(self, *_args, **_kwargs):
         val = apply(sizersc.wxNotebookSizer_GetNotebook,(self,) + _args, _kwargs)
         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,)
         return val
     def __repr__(self):
         return "<C wxNotebookSizer instance at %s>" % (self.this,)