Implemented the first phase of OOR (Original Object Return). See the
text in the demo for more details of what this means, but in a nutshell methods such as wxWindow.GetParent or FindWindowById will now return a shadow object of the proper type if it can. By "proper type" I mean that if the wxWindow pointer returned from FindWindowById really points to a wxButton then the Python object constructed will be of a wxButtonPtr class instead of wxWindowPtr as before. This should reduce or eliminiate the need for wxPyTypeCast. (Woo Hoo!) The objects returned are still not the original Python object, but that is the next step. (Although it will probably only work on Python 2.1 and beyond because it will use weak references.) A few other minor tweaks and fixes and additions for things found while doing the OOR stuff. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,7 +14,7 @@ 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
|
||||
@@ -52,14 +52,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,7 +95,7 @@ class wxSizerItem(wxSizerItemPtr):
|
||||
|
||||
|
||||
|
||||
class wxSizerPtr :
|
||||
class wxSizerPtr(wxObjectPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
@@ -284,7 +282,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)
|
||||
@@ -316,7 +313,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,)
|
||||
|
Reference in New Issue
Block a user