X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be4d9c1faf22d57098d17a578d218514598c9ce5..4e4ea166d76da40eaa5fdcf9e958d93521f72fba:/utils/wxPython/src/msw/windows.py diff --git a/utils/wxPython/src/msw/windows.py b/utils/wxPython/src/msw/windows.py index bc234b094f..ecc37e6fb0 100644 --- a/utils/wxPython/src/msw/windows.py +++ b/utils/wxPython/src/msw/windows.py @@ -10,12 +10,15 @@ def wxDLG_PNT(win, point): return win.ConvertDialogPointToPixels(point) def wxDLG_SZE(win, size): - return win.ConvertDialogPointToPixels(size) + return win.ConvertDialogSizeToPixels(size) class wxEvtHandlerPtr : def __init__(self,this): self.this = this self.thisown = 0 + def ProcessEvent(self,arg0): + val = windowsc.wxEvtHandler_ProcessEvent(self.this,arg0.this) + return val def Connect(self,arg0,arg1,arg2,arg3): val = windowsc.wxEvtHandler_Connect(self.this,arg0,arg1,arg2,arg3) return val @@ -41,8 +44,13 @@ class wxWindowPtr(wxEvtHandlerPtr): def Centre(self,*args): val = apply(windowsc.wxWindow_Centre,(self.this,)+args) return val - def ClientToScreen(self,arg0,arg1): - val = windowsc.wxWindow_ClientToScreen(self.this,arg0,arg1) + def ClientToScreenXY(self,arg0,arg1): + val = windowsc.wxWindow_ClientToScreenXY(self.this,arg0,arg1) + return val + def ClientToScreen(self,arg0): + val = windowsc.wxWindow_ClientToScreen(self.this,arg0.this) + val = wxPointPtr(val) + val.thisown = 1 return val def Close(self,*args): val = apply(windowsc.wxWindow_Close,(self.this,)+args) @@ -59,8 +67,8 @@ class wxWindowPtr(wxEvtHandlerPtr): def Enable(self,arg0): val = windowsc.wxWindow_Enable(self.this,arg0) return val - def FindWindowByID(self,arg0): - val = windowsc.wxWindow_FindWindowByID(self.this,arg0) + def FindWindowById(self,arg0): + val = windowsc.wxWindow_FindWindowById(self.this,arg0) val = wxWindowPtr(val) return val def FindWindowByName(self,arg0): @@ -159,6 +167,13 @@ class wxWindowPtr(wxEvtHandlerPtr): def GetTextExtent(self,arg0): val = windowsc.wxWindow_GetTextExtent(self.this,arg0) return val + def GetFullTextExtent(self,arg0,*args): + argl = map(None,args) + try: argl[0] = argl[0].this + except: pass + args = tuple(argl) + val = apply(windowsc.wxWindow_GetFullTextExtent,(self.this,arg0,)+args) + return val def GetTitle(self): val = windowsc.wxWindow_GetTitle(self.this) return val @@ -189,8 +204,11 @@ class wxWindowPtr(wxEvtHandlerPtr): def MakeModal(self,arg0): val = windowsc.wxWindow_MakeModal(self.this,arg0) return val - def Move(self,arg0,arg1): - val = windowsc.wxWindow_Move(self.this,arg0,arg1) + def MoveXY(self,arg0,arg1): + val = windowsc.wxWindow_MoveXY(self.this,arg0,arg1) + return val + def Move(self,arg0): + val = windowsc.wxWindow_Move(self.this,arg0.this) return val def PopupMenu(self,arg0,arg1,arg2): val = windowsc.wxWindow_PopupMenu(self.this,arg0.this,arg1,arg2) @@ -208,8 +226,13 @@ class wxWindowPtr(wxEvtHandlerPtr): def ReleaseMouse(self): val = windowsc.wxWindow_ReleaseMouse(self.this) return val - def ScreenToClient(self,arg0,arg1): - val = windowsc.wxWindow_ScreenToClient(self.this,arg0,arg1) + def ScreenToClientXY(self,arg0,arg1): + val = windowsc.wxWindow_ScreenToClientXY(self.this,arg0,arg1) + return val + def ScreenToClient(self,arg0): + val = windowsc.wxWindow_ScreenToClient(self.this,arg0.this) + val = wxPointPtr(val) + val.thisown = 1 return val def ScrollWindow(self,arg0,arg1,*args): argl = map(None,args) @@ -269,8 +292,11 @@ class wxWindowPtr(wxEvtHandlerPtr): def SetSizeHints(self,*args): val = apply(windowsc.wxWindow_SetSizeHints,(self.this,)+args) return val - def SetClientSize(self,arg0,arg1): - val = windowsc.wxWindow_SetClientSize(self.this,arg0,arg1) + def SetClientSizeWH(self,arg0,arg1): + val = windowsc.wxWindow_SetClientSizeWH(self.this,arg0,arg1) + return val + def SetClientSize(self,arg0): + val = windowsc.wxWindow_SetClientSize(self.this,arg0.this) return val def SetCursor(self,arg0): val = windowsc.wxWindow_SetCursor(self.this,arg0.this) @@ -303,6 +329,16 @@ class wxWindowPtr(wxEvtHandlerPtr): val = wxSizePtr(val) val.thisown = 1 return val + def DLG_PNT(self,arg0): + val = windowsc.wxWindow_DLG_PNT(self.this,arg0.this) + val = wxPointPtr(val) + val.thisown = 1 + return val + def DLG_SZE(self,arg0): + val = windowsc.wxWindow_DLG_SZE(self.this,arg0.this) + val = wxSizePtr(val) + val.thisown = 1 + return val def ConvertPixelPointToDialog(self,arg0): val = windowsc.wxWindow_ConvertPixelPointToDialog(self.this,arg0.this) val = wxPointPtr(val) @@ -313,6 +349,16 @@ class wxWindowPtr(wxEvtHandlerPtr): val = wxSizePtr(val) val.thisown = 1 return val + def SetToolTipString(self,arg0): + val = windowsc.wxWindow_SetToolTipString(self.this,arg0) + return val + def SetToolTip(self,arg0): + val = windowsc.wxWindow_SetToolTip(self.this,arg0.this) + return val + def GetToolTip(self): + val = windowsc.wxWindow_GetToolTip(self.this) + val = wxToolTipPtr(val) + return val def __repr__(self): return "" class wxWindow(wxWindowPtr): @@ -461,6 +507,9 @@ class wxMenuPtr(wxEvtHandlerPtr): def AppendMenu(self,arg0,arg1,arg2,*args): val = apply(windowsc.wxMenu_AppendMenu,(self.this,arg0,arg1,arg2.this,)+args) return val + def AppendItem(self,arg0): + val = windowsc.wxMenu_AppendItem(self.this,arg0.this) + return val def AppendSeparator(self): val = windowsc.wxMenu_AppendSeparator(self.this) return val @@ -636,14 +685,60 @@ class wxMenuItemPtr : def Check(self,*args): val = apply(windowsc.wxMenuItem_Check,(self.this,)+args) return val + def GetBackgroundColour(self): + val = windowsc.wxMenuItem_GetBackgroundColour(self.this) + val = wxColourPtr(val) + return val + def GetBitmap(self,*args): + val = apply(windowsc.wxMenuItem_GetBitmap,(self.this,)+args) + val = wxBitmapPtr(val) + val.thisown = 1 + return val + def GetFont(self): + val = windowsc.wxMenuItem_GetFont(self.this) + val = wxFontPtr(val) + return val + def GetMarginWidth(self): + val = windowsc.wxMenuItem_GetMarginWidth(self.this) + return val + def GetTextColour(self): + val = windowsc.wxMenuItem_GetTextColour(self.this) + val = wxColourPtr(val) + return val + def SetBackgroundColour(self,arg0): + val = windowsc.wxMenuItem_SetBackgroundColour(self.this,arg0.this) + return val + def SetBitmaps(self,arg0,*args): + argl = map(None,args) + try: argl[0] = argl[0].this + except: pass + args = tuple(argl) + val = apply(windowsc.wxMenuItem_SetBitmaps,(self.this,arg0.this,)+args) + return val + def SetFont(self,arg0): + val = windowsc.wxMenuItem_SetFont(self.this,arg0.this) + return val + def SetMarginWidth(self,arg0): + val = windowsc.wxMenuItem_SetMarginWidth(self.this,arg0) + return val + def SetTextColour(self,arg0): + val = windowsc.wxMenuItem_SetTextColour(self.this,arg0.this) + return val def DeleteSubMenu(self): val = windowsc.wxMenuItem_DeleteSubMenu(self.this) return val def __repr__(self): return "" class wxMenuItem(wxMenuItemPtr): - def __init__(self,this): - self.this = this + def __init__(self,*args) : + argl = map(None,args) + try: argl[0] = argl[0].this + except: pass + try: argl[5] = argl[5].this + except: pass + args = tuple(argl) + self.this = apply(windowsc.new_wxMenuItem,()+args) + self.thisown = 1 @@ -657,6 +752,11 @@ def wxWindow_FindFocus(): val = wxWindowPtr(val) return val +def wxWindow_FromHWND(arg0): + val = windowsc.wxWindow_FromHWND(arg0) + val = wxWindowPtr(val) + return val + #-------------- VARIABLE WRAPPERS ------------------