X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a0958b1657f6105b1efcf04032070143b87af80..a92b0cfd2bd0bef75b43c071df0b0e028f360d8e:/wxPython/src/msw/windows.py?ds=inline diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py index ca42379c8f..1f950d9e82 100644 --- a/wxPython/src/msw/windows.py +++ b/wxPython/src/msw/windows.py @@ -54,6 +54,9 @@ class wxEvtHandlerPtr(wxObjectPtr): def Disconnect(self, *_args, **_kwargs): val = apply(windowsc.wxEvtHandler_Disconnect,(self,) + _args, _kwargs) return val + def _setOORInfo(self, *_args, **_kwargs): + val = apply(windowsc.wxEvtHandler__setOORInfo,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxEvtHandler(wxEvtHandlerPtr): @@ -83,6 +86,7 @@ class wxValidator(wxValidatorPtr): def __init__(self,*_args,**_kwargs): self.this = apply(windowsc.new_wxValidator,_args,_kwargs) self.thisown = 1 + self._setOORInfo(self) @@ -91,8 +95,8 @@ class wxPyValidatorPtr(wxValidatorPtr): def __init__(self,this): self.this = this self.thisown = 0 - def _setSelf(self, *_args, **_kwargs): - val = apply(windowsc.wxPyValidator__setSelf,(self,) + _args, _kwargs) + def _setCallbackInfo(self, *_args, **_kwargs): + val = apply(windowsc.wxPyValidator__setCallbackInfo,(self,) + _args, _kwargs) return val def __repr__(self): return "" % (self.this,) @@ -100,7 +104,8 @@ class wxPyValidator(wxPyValidatorPtr): def __init__(self,*_args,**_kwargs): self.this = apply(windowsc.new_wxPyValidator,_args,_kwargs) self.thisown = 1 - self._setSelf(self, wxPyValidator, 1) + self._setCallbackInfo(self, wxPyValidator, 1) + self._setOORInfo(self) @@ -109,6 +114,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def __init__(self,this): self.this = this self.thisown = 0 + 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 @@ -196,7 +204,7 @@ class wxWindowPtr(wxEvtHandlerPtr): return val def GetFont(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_GetFont,(self,) + _args, _kwargs) - if val: val = wxFontPtr(val) + if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetForegroundColour(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_GetForegroundColour,(self,) + _args, _kwargs) @@ -335,6 +343,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def Refresh(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_Refresh,(self,) + _args, _kwargs) return val + 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 @@ -354,9 +365,6 @@ class wxWindowPtr(wxEvtHandlerPtr): def ScrollWindow(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_ScrollWindow,(self,) + _args, _kwargs) return val - def SetAcceleratorTable(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs) - return val def SetAutoLayout(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_SetAutoLayout,(self,) + _args, _kwargs) return val @@ -514,6 +522,43 @@ class wxWindowPtr(wxEvtHandlerPtr): def Thaw(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_Thaw,(self,) + _args, _kwargs) return val + def Update(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_Update,(self,) + _args, _kwargs) + return val + def GetHelpText(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_GetHelpText,(self,) + _args, _kwargs) + return val + def SetHelpText(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_SetHelpText,(self,) + _args, _kwargs) + return val + def ScrollLines(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_ScrollLines,(self,) + _args, _kwargs) + return val + def ScrollPages(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_ScrollPages,(self,) + _args, _kwargs) + return val + def LineUp(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_LineUp,(self,) + _args, _kwargs) + return val + def LineDown(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_LineDown,(self,) + _args, _kwargs) + return val + def PageUp(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_PageUp,(self,) + _args, _kwargs) + return val + def PageDown(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_PageDown,(self,) + _args, _kwargs) + return val + def SetAcceleratorTable(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs) + return val + def GetAcceleratorTable(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_GetAcceleratorTable,(self,) + _args, _kwargs) + if val: val = wxAcceleratorTablePtr(val) + return val + def OnPaint(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_OnPaint,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) # replaces broken shadow method @@ -527,15 +572,24 @@ class wxWindow(wxWindowPtr): def __init__(self,*_args,**_kwargs): self.this = apply(windowsc.new_wxWindow,_args,_kwargs) self.thisown = 1 - #wx._StdWindowCallbacks(self) + self._setOORInfo(self) +def wxPreWindow(*_args,**_kwargs): + val = wxWindowPtr(apply(windowsc.new_wxPreWindow,_args,_kwargs)) + val.thisown = 1 + val._setOORInfo(val) + return val + class wxPanelPtr(wxWindowPtr): def __init__(self,this): self.this = this self.thisown = 0 + def Create(self, *_args, **_kwargs): + val = apply(windowsc.wxPanel_Create,(self,) + _args, _kwargs) + return val def InitDialog(self, *_args, **_kwargs): val = apply(windowsc.wxPanel_InitDialog,(self,) + _args, _kwargs) return val @@ -551,72 +605,24 @@ class wxPanel(wxPanelPtr): def __init__(self,*_args,**_kwargs): self.this = apply(windowsc.new_wxPanel,_args,_kwargs) self.thisown = 1 - #wx._StdWindowCallbacks(self) + self._setOORInfo(self) - -class wxDialogPtr(wxPanelPtr): - def __init__(self,this): - self.this = this - self.thisown = 0 - def Centre(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_Centre,(self,) + _args, _kwargs) - return val - def EndModal(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_EndModal,(self,) + _args, _kwargs) - return val - def GetTitle(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_GetTitle,(self,) + _args, _kwargs) - return val - def Iconize(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_Iconize,(self,) + _args, _kwargs) - return val - def IsIconized(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_IsIconized,(self,) + _args, _kwargs) - return val - def SetModal(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_SetModal,(self,) + _args, _kwargs) - return val - def IsModal(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_IsModal,(self,) + _args, _kwargs) - return val - def SetTitle(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_SetTitle,(self,) + _args, _kwargs) - return val - def Show(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_Show,(self,) + _args, _kwargs) - return val - def ShowModal(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_ShowModal,(self,) + _args, _kwargs) - return val - def GetReturnCode(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_GetReturnCode,(self,) + _args, _kwargs) - return val - def SetReturnCode(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_SetReturnCode,(self,) + _args, _kwargs) - return val - def CreateTextSizer(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs) - return val - def CreateButtonSizer(self, *_args, **_kwargs): - val = apply(windowsc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs) - return val - def __repr__(self): - return "" % (self.this,) -class wxDialog(wxDialogPtr): - def __init__(self,*_args,**_kwargs): - self.this = apply(windowsc.new_wxDialog,_args,_kwargs) - self.thisown = 1 - #wx._StdDialogCallbacks(self) - - +def wxPrePanel(*_args,**_kwargs): + val = wxPanelPtr(apply(windowsc.new_wxPrePanel,_args,_kwargs)) + val.thisown = 1 + val._setOORInfo(val) + return val class wxScrolledWindowPtr(wxPanelPtr): def __init__(self,this): self.this = this self.thisown = 0 + def Create(self, *_args, **_kwargs): + val = apply(windowsc.wxScrolledWindow_Create,(self,) + _args, _kwargs) + return val def EnableScrolling(self, *_args, **_kwargs): val = apply(windowsc.wxScrolledWindow_EnableScrolling,(self,) + _args, _kwargs) return val @@ -678,11 +684,16 @@ class wxScrolledWindow(wxScrolledWindowPtr): def __init__(self,*_args,**_kwargs): self.this = apply(windowsc.new_wxScrolledWindow,_args,_kwargs) self.thisown = 1 - #wx._StdWindowCallbacks(self) - #wx._StdOnScrollCallbacks(self) + self._setOORInfo(self) +def wxPreScrolledWindow(*_args,**_kwargs): + val = wxScrolledWindowPtr(apply(windowsc.new_wxPreScrolledWindow,_args,_kwargs)) + val.thisown = 1 + val._setOORInfo(val) + return val + class wxMenuPtr(wxEvtHandlerPtr): def __init__(self,this): @@ -802,6 +813,7 @@ class wxMenu(wxMenuPtr): def __init__(self,*_args,**_kwargs): self.this = apply(windowsc.new_wxMenu,_args,_kwargs) self.thisown = 1 + self._setOORInfo(self) @@ -876,6 +888,7 @@ class wxMenuBar(wxMenuBarPtr): def __init__(self,*_args,**_kwargs): self.this = apply(windowsc.new_wxMenuBar,_args,_kwargs) self.thisown = 1 + self._setOORInfo(self) @@ -953,7 +966,7 @@ class wxMenuItemPtr(wxObjectPtr): return val def GetFont(self, *_args, **_kwargs): val = apply(windowsc.wxMenuItem_GetFont,(self,) + _args, _kwargs) - if val: val = wxFontPtr(val) + if val: val = wxFontPtr(val) ; val.thisown = 1 return val def SetTextColour(self, *_args, **_kwargs): val = apply(windowsc.wxMenuItem_SetTextColour,(self,) + _args, _kwargs) @@ -977,7 +990,7 @@ class wxMenuItemPtr(wxObjectPtr): return val def GetBitmap(self, *_args, **_kwargs): val = apply(windowsc.wxMenuItem_GetBitmap,(self,) + _args, _kwargs) - if val: val = wxBitmapPtr(val) + if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def SetMarginWidth(self, *_args, **_kwargs): val = apply(windowsc.wxMenuItem_SetMarginWidth,(self,) + _args, _kwargs) @@ -1005,24 +1018,24 @@ class wxMenuItem(wxMenuItemPtr): #-------------- FUNCTION WRAPPERS ------------------ -def wxWindow_FindFocus(*_args, **_kwargs): - val = apply(windowsc.wxWindow_FindFocus,_args,_kwargs) - return val - def wxWindow_FromHWND(*_args, **_kwargs): val = apply(windowsc.wxWindow_FromHWND,_args,_kwargs) return val +wxValidator_IsSilent = windowsc.wxValidator_IsSilent + +wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError + +def wxWindow_FindFocus(*_args, **_kwargs): + val = apply(windowsc.wxWindow_FindFocus,_args,_kwargs) + return val + wxWindow_NewControlId = windowsc.wxWindow_NewControlId wxWindow_NextControlId = windowsc.wxWindow_NextControlId wxWindow_PrevControlId = windowsc.wxWindow_PrevControlId -wxValidator_IsSilent = windowsc.wxValidator_IsSilent - -wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError - wxMenuItem_GetLabelFromText = windowsc.wxMenuItem_GetLabelFromText wxMenuItem_GetDefaultMarginWidth = windowsc.wxMenuItem_GetDefaultMarginWidth