X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b639c3c5ef53c4bdefd3b27aac1496787f024cb8..d24a34bb5d3f17472179b38bcb0be253551fce65:/utils/wxPython/src/msw/windows2.py diff --git a/utils/wxPython/src/msw/windows2.py b/utils/wxPython/src/msw/windows2.py index bc40f10590..f5d4c0cdb9 100644 --- a/utils/wxPython/src/msw/windows2.py +++ b/utils/wxPython/src/msw/windows2.py @@ -10,7 +10,7 @@ from windows import * from controls import * from events import * -import wxp +import wx class wxGridCellPtr : def __init__(self,this): self.this = this @@ -155,6 +155,7 @@ class wxGridPtr(wxPanelPtr): def GetCurrentRect(self): val = windows2c.wxGrid_GetCurrentRect(self.this) val = wxRectPtr(val) + val.thisown = 1 return val def GetCursorColumn(self): val = windows2c.wxGrid_GetCursorColumn(self.this) @@ -294,16 +295,16 @@ class wxGrid(wxGridPtr): args = tuple(argl) self.this = apply(windows2c.new_wxGrid,(arg0.this,arg1,)+args) self.thisown = 1 - wxp._StdWindowCallbacks(self) - wxp._checkForCallback(self, 'OnSelectCell', wxEVT_GRID_SELECT_CELL) - wxp._checkForCallback(self, 'OnCreateCell', wxEVT_GRID_CREATE_CELL) - wxp._checkForCallback(self, 'OnChangeLabels', wxEVT_GRID_CHANGE_LABELS) - wxp._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL) - wxp._checkForCallback(self, 'OnCellChange', wxEVT_GRID_CELL_CHANGE) - wxp._checkForCallback(self, 'OnCellLeftClick', wxEVT_GRID_CELL_LCLICK) - wxp._checkForCallback(self, 'OnCellRightClick', wxEVT_GRID_CELL_RCLICK) - wxp._checkForCallback(self, 'OnLabelLeftClick', wxEVT_GRID_LABEL_LCLICK) - wxp._checkForCallback(self, 'OnLabelRightClick', wxEVT_GRID_LABEL_RCLICK) + wx._StdWindowCallbacks(self) + wx._checkForCallback(self, 'OnSelectCell', wxEVT_GRID_SELECT_CELL) + wx._checkForCallback(self, 'OnCreateCell', wxEVT_GRID_CREATE_CELL) + wx._checkForCallback(self, 'OnChangeLabels', wxEVT_GRID_CHANGE_LABELS) + wx._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL) + wx._checkForCallback(self, 'OnCellChange', wxEVT_GRID_CELL_CHANGE) + wx._checkForCallback(self, 'OnCellLeftClick', wxEVT_GRID_CELL_LCLICK) + wx._checkForCallback(self, 'OnCellRightClick', wxEVT_GRID_CELL_RCLICK) + wx._checkForCallback(self, 'OnLabelLeftClick', wxEVT_GRID_LABEL_LCLICK) + wx._checkForCallback(self, 'OnLabelRightClick', wxEVT_GRID_LABEL_RCLICK) @@ -360,7 +361,7 @@ class wxGridEvent(wxGridEventPtr): -class wxNotebookEventPtr(wxCommandEventPtr): +class wxNotebookEventPtr(wxNotifyEventPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -370,6 +371,12 @@ class wxNotebookEventPtr(wxCommandEventPtr): def GetOldSelection(self): val = windows2c.wxNotebookEvent_GetOldSelection(self.this) return val + def SetOldSelection(self,arg0): + val = windows2c.wxNotebookEvent_SetOldSelection(self.this,arg0) + return val + def SetSelection(self,arg0): + val = windows2c.wxNotebookEvent_SetSelection(self.this,arg0) + return val def __repr__(self): return "" class wxNotebookEvent(wxNotebookEventPtr): @@ -402,10 +409,11 @@ class wxNotebookPtr(wxControlPtr): val = windows2c.wxNotebook_GetPageText(self.this,arg0) return val def SetImageList(self,arg0): - val = windows2c.wxNotebook_SetImageList(self.this,arg0) + val = windows2c.wxNotebook_SetImageList(self.this,arg0.this) return val def GetImageList(self): val = windows2c.wxNotebook_GetImageList(self.this) + val = wxImageListPtr(val) return val def GetPageImage(self,arg0): val = windows2c.wxNotebook_GetPageImage(self.this,arg0) @@ -419,6 +427,9 @@ class wxNotebookPtr(wxControlPtr): def DeletePage(self,arg0): val = windows2c.wxNotebook_DeletePage(self.this,arg0) return val + def RemovePage(self,arg0): + val = windows2c.wxNotebook_RemovePage(self.this,arg0) + return val def DeleteAllPages(self): val = windows2c.wxNotebook_DeleteAllPages(self.this) return val @@ -430,6 +441,10 @@ class wxNotebookPtr(wxControlPtr): return val def GetPage(self,arg0): val = windows2c.wxNotebook_GetPage(self.this,arg0) + val = wxWindowPtr(val) + return val + def ResizeChildren(self): + val = windows2c.wxNotebook_ResizeChildren(self.this) return val def __repr__(self): return "" @@ -443,7 +458,36 @@ class wxNotebook(wxNotebookPtr): args = tuple(argl) self.this = apply(windows2c.new_wxNotebook,(arg0.this,arg1,)+args) self.thisown = 1 - wxp._StdWindowCallbacks(self) + wx._StdWindowCallbacks(self) + + + + +class wxSplitterEventPtr(wxCommandEventPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetSashPosition(self): + val = windows2c.wxSplitterEvent_GetSashPosition(self.this) + return val + def GetX(self): + val = windows2c.wxSplitterEvent_GetX(self.this) + return val + def GetY(self): + val = windows2c.wxSplitterEvent_GetY(self.this) + return val + def GetWindowBeingRemoved(self): + val = windows2c.wxSplitterEvent_GetWindowBeingRemoved(self.this) + val = wxWindowPtr(val) + return val + def SetSashPosition(self,arg0): + val = windows2c.wxSplitterEvent_SetSashPosition(self.this,arg0) + return val + def __repr__(self): + return "" +class wxSplitterEvent(wxSplitterEventPtr): + def __init__(self,this): + self.this = this @@ -521,7 +565,7 @@ class wxSplitterWindow(wxSplitterWindowPtr): args = tuple(argl) self.this = apply(windows2c.new_wxSplitterWindow,(arg0.this,arg1,)+args) self.thisown = 1 - wxp._StdWindowCallbacks(self) + wx._StdWindowCallbacks(self) @@ -539,19 +583,22 @@ class wxTaskBarIconPtr(wxEvtHandlerPtr): def RemoveIcon(self): val = windows2c.wxTaskBarIcon_RemoveIcon(self.this) return val + def PopupMenu(self,arg0): + val = windows2c.wxTaskBarIcon_PopupMenu(self.this,arg0.this) + return val def __repr__(self): return "" class wxTaskBarIcon(wxTaskBarIconPtr): def __init__(self) : self.this = windows2c.new_wxTaskBarIcon() self.thisown = 1 - wxp._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE) - wxp._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN) - wxp._checkForCallback(self, 'OnLButtonUp', wxEVT_TASKBAR_LEFT_UP) - wxp._checkForCallback(self, 'OnRButtonDown', wxEVT_TASKBAR_RIGHT_DOWN) - wxp._checkForCallback(self, 'OnRButtonUp', wxEVT_TASKBAR_RIGHT_UP) - wxp._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK) - wxp._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK) + wx._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE) + wx._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN) + wx._checkForCallback(self, 'OnLButtonUp', wxEVT_TASKBAR_LEFT_UP) + wx._checkForCallback(self, 'OnRButtonDown', wxEVT_TASKBAR_RIGHT_DOWN) + wx._checkForCallback(self, 'OnRButtonUp', wxEVT_TASKBAR_RIGHT_UP) + wx._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK) + wx._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK)