X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9416aa89ca06d0fb20b1002e026d2c7ac7aa6a17..c331ac2ed75ba5c435d745e9282c27a339da4f18:/wxPython/src/msw/windows.py?ds=sidebyside diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py index df27f40d05..2c3579fede 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 @@ -130,6 +138,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def CenterOnScreen(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_CenterOnScreen,(self,) + _args, _kwargs) return val + def Clear(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_Clear,(self,) + _args, _kwargs) + return val def ClientToScreenXY(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_ClientToScreenXY,(self,) + _args, _kwargs) return val @@ -146,6 +157,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def DestroyChildren(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_DestroyChildren,(self,) + _args, _kwargs) return val + def IsBeingDeleted(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_IsBeingDeleted,(self,) + _args, _kwargs) + return val def DragAcceptFiles(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_DragAcceptFiles,(self,) + _args, _kwargs) return val @@ -165,6 +179,9 @@ class wxWindowPtr(wxEvtHandlerPtr): val = apply(windowsc.wxWindow_GetBackgroundColour,(self,) + _args, _kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val + def GetBorder(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_GetBorder,(self,) + _args, _kwargs) + return val def GetChildren(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_GetChildren,(self,) + _args, _kwargs) return val @@ -181,6 +198,14 @@ class wxWindowPtr(wxEvtHandlerPtr): val = apply(windowsc.wxWindow_GetClientSize,(self,) + _args, _kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val + def GetClientAreaOrigin(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_GetClientAreaOrigin,(self,) + _args, _kwargs) + if val: val = wxPointPtr(val) ; val.thisown = 1 + return val + def GetClientRect(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_GetClientRect,(self,) + _args, _kwargs) + if val: val = wxRectPtr(val) ; val.thisown = 1 + return val def GetConstraints(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_GetConstraints,(self,) + _args, _kwargs) if val: val = wxLayoutConstraintsPtr(val) @@ -190,7 +215,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) @@ -266,9 +291,15 @@ class wxWindowPtr(wxEvtHandlerPtr): def SetWindowStyle(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_SetWindowStyle,(self,) + _args, _kwargs) return val + def HasScrollbar(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_HasScrollbar,(self,) + _args, _kwargs) + return val def Hide(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_Hide,(self,) + _args, _kwargs) return val + def HitTest(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_HitTest,(self,) + _args, _kwargs) + return val def InitDialog(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_InitDialog,(self,) + _args, _kwargs) return val @@ -317,6 +348,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def PushEventHandler(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_PushEventHandler,(self,) + _args, _kwargs) return val + def RemoveEventHandler(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_RemoveEventHandler,(self,) + _args, _kwargs) + return val def PopupMenuXY(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_PopupMenuXY,(self,) + _args, _kwargs) return val @@ -329,6 +363,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 @@ -348,9 +385,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 @@ -432,6 +466,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def TransferDataToWindow(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_TransferDataToWindow,(self,) + _args, _kwargs) return val + def UpdateWindowUI(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_UpdateWindowUI,(self,) + _args, _kwargs) + return val def Validate(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_Validate,(self,) + _args, _kwargs) return val @@ -477,6 +514,12 @@ class wxWindowPtr(wxEvtHandlerPtr): def GetSizer(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_GetSizer,(self,) + _args, _kwargs) return val + def SetContainingSizer(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_SetContainingSizer,(self,) + _args, _kwargs) + return val + def GetContainingSizer(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_GetContainingSizer,(self,) + _args, _kwargs) + return val def GetValidator(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_GetValidator,(self,) + _args, _kwargs) return val @@ -502,6 +545,58 @@ class wxWindowPtr(wxEvtHandlerPtr): val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs) if val: val = wxCaretPtr(val) return val + def Freeze(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_Freeze,(self,) + _args, _kwargs) + return val + 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 SetHelpTextForId(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_SetHelpTextForId,(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 GetDefaultItem(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_GetDefaultItem,(self,) + _args, _kwargs) + return val + def SetDefaultItem(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_SetDefaultItem,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) # replaces broken shadow method @@ -515,96 +610,51 @@ 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 - def GetDefaultItem(self, *_args, **_kwargs): - val = apply(windowsc.wxPanel_GetDefaultItem,(self,) + _args, _kwargs) - return val - def SetDefaultItem(self, *_args, **_kwargs): - val = apply(windowsc.wxPanel_SetDefaultItem,(self,) + _args, _kwargs) - return val def __repr__(self): return "" % (self.this,) 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 @@ -641,9 +691,6 @@ class wxScrolledWindowPtr(wxPanelPtr): def GetViewStart(self, *_args, **_kwargs): val = apply(windowsc.wxScrolledWindow_GetViewStart,(self,) + _args, _kwargs) return val - def ViewStart(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_ViewStart,(self,) + _args, _kwargs) - return val def CalcScrolledPosition(self, *_args, **_kwargs): val = apply(windowsc.wxScrolledWindow_CalcScrolledPosition,(self,) + _args, _kwargs) return val @@ -664,15 +711,21 @@ class wxScrolledWindowPtr(wxPanelPtr): return val def __repr__(self): return "" % (self.this,) + ViewStart = GetViewStart 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): @@ -792,6 +845,7 @@ class wxMenu(wxMenuPtr): def __init__(self,*_args,**_kwargs): self.this = apply(windowsc.new_wxMenu,_args,_kwargs) self.thisown = 1 + self._setOORInfo(self) @@ -827,6 +881,9 @@ class wxMenuBarPtr(wxWindowPtr): def GetLabelTop(self, *_args, **_kwargs): val = apply(windowsc.wxMenuBar_GetLabelTop,(self,) + _args, _kwargs) return val + def FindMenu(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuBar_FindMenu,(self,) + _args, _kwargs) + return val def FindMenuItem(self, *_args, **_kwargs): val = apply(windowsc.wxMenuBar_FindMenuItem,(self,) + _args, _kwargs) return val @@ -863,6 +920,7 @@ class wxMenuBar(wxMenuBarPtr): def __init__(self,*_args,**_kwargs): self.this = apply(windowsc.new_wxMenuBar,_args,_kwargs) self.thisown = 1 + self._setOORInfo(self) @@ -940,21 +998,21 @@ 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) return val def GetTextColour(self, *_args, **_kwargs): val = apply(windowsc.wxMenuItem_GetTextColour,(self,) + _args, _kwargs) - if val: val = wxColourPtr(val) + if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetBackgroundColour(self, *_args, **_kwargs): val = apply(windowsc.wxMenuItem_SetBackgroundColour,(self,) + _args, _kwargs) return val def GetBackgroundColour(self, *_args, **_kwargs): val = apply(windowsc.wxMenuItem_GetBackgroundColour,(self,) + _args, _kwargs) - if val: val = wxColourPtr(val) + if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetBitmaps(self, *_args, **_kwargs): val = apply(windowsc.wxMenuItem_SetBitmaps,(self,) + _args, _kwargs) @@ -964,7 +1022,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) @@ -992,24 +1050,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