X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cd9591aab117574f7d0af749d0d1f774b9d7945..85bc0351f76f6d3f00460a167fc108b900e0725c:/utils/wxPython/src/gtk/windows.py

diff --git a/utils/wxPython/src/gtk/windows.py b/utils/wxPython/src/gtk/windows.py
index d28cce4efb..df956d3e07 100644
--- a/utils/wxPython/src/gtk/windows.py
+++ b/utils/wxPython/src/gtk/windows.py
@@ -4,26 +4,57 @@ import windowsc
 from misc import *
 
 from gdi import *
+
+from clip_dnd import *
 import wx
 
-def wxDLG_PNT(win, point):
-    return win.ConvertDialogPointToPixels(point)
+def wxDLG_PNT(win, point_or_x, y=None):
+    if y is None:
+        return win.ConvertDialogPointToPixels(point_or_x)
+    else:
+        return win.ConvertDialogPointToPixels(wxPoint(point_or_x, y))
 
-def wxDLG_SZE(win, size):
-    return win.ConvertDialogSizeToPixels(size)
+def wxDLG_SZE(win, size_width, height=None):
+    if height is None:
+        return win.ConvertDialogSizeToPixels(size_width)
+    else:
+        return win.ConvertDialogSizeToPixels(wxSize(size_width, height))
 
 class wxEvtHandlerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def ProcessEvent(self,arg0):
-        val = windowsc.wxEvtHandler_ProcessEvent(self.this,arg0.this)
+    def ProcessEvent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_ProcessEvent,(self,) + _args, _kwargs)
+        return val
+    def GetEvtHandlerEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_GetEvtHandlerEnabled,(self,) + _args, _kwargs)
+        return val
+    def SetEvtHandlerEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_SetEvtHandlerEnabled,(self,) + _args, _kwargs)
+        return val
+    def GetNextHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_GetNextHandler,(self,) + _args, _kwargs)
+        if val: val = wxEvtHandlerPtr(val) 
+        return val
+    def GetPreviousHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_GetPreviousHandler,(self,) + _args, _kwargs)
+        if val: val = wxEvtHandlerPtr(val) 
+        return val
+    def SetNextHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_SetNextHandler,(self,) + _args, _kwargs)
+        return val
+    def SetPreviousHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_SetPreviousHandler,(self,) + _args, _kwargs)
+        return val
+    def Connect(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_Connect,(self,) + _args, _kwargs)
         return val
-    def Connect(self,arg0,arg1,arg2,arg3):
-        val = windowsc.wxEvtHandler_Connect(self.this,arg0,arg1,arg2,arg3)
+    def Disconnect(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler_Disconnect,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxEvtHandler instance>"
+        return "<C wxEvtHandler instance at %s>" % (self.this,)
 class wxEvtHandler(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
@@ -31,319 +62,445 @@ class wxEvtHandler(wxEvtHandlerPtr):
 
 
 
+class wxValidatorPtr(wxEvtHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Clone(self, *_args, **_kwargs):
+        val = apply(windowsc.wxValidator_Clone,(self,) + _args, _kwargs)
+        if val: val = wxValidatorPtr(val) 
+        return val
+    def GetWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxValidator_GetWindow,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
+        return val
+    def SetWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxValidator_SetWindow,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxValidator instance at %s>" % (self.this,)
+class wxValidator(wxValidatorPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxValidator,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxPyValidatorPtr(wxValidatorPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(windowsc.wxPyValidator_Destroy,(self,) + _args, _kwargs)
+        return val
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(windowsc.wxPyValidator__setSelf,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyValidator instance at %s>" % (self.this,)
+class wxPyValidator(wxPyValidatorPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxPyValidator,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, 0)
+
+
+
+
 class wxWindowPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def CaptureMouse(self):
-        val = windowsc.wxWindow_CaptureMouse(self.this)
+    def CaptureMouse(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_CaptureMouse,(self,) + _args, _kwargs)
+        return val
+    def Center(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Center,(self,) + _args, _kwargs)
         return val
-    def Center(self,*args):
-        val = apply(windowsc.wxWindow_Center,(self.this,)+args)
+    def Centre(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Centre,(self,) + _args, _kwargs)
         return val
-    def Centre(self,*args):
-        val = apply(windowsc.wxWindow_Centre,(self.this,)+args)
+    def CentreOnParent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_CentreOnParent,(self,) + _args, _kwargs)
         return val
-    def ClientToScreenXY(self,arg0,arg1):
-        val = windowsc.wxWindow_ClientToScreenXY(self.this,arg0,arg1)
+    def CenterOnParent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_CenterOnParent,(self,) + _args, _kwargs)
         return val
-    def Close(self,*args):
-        val = apply(windowsc.wxWindow_Close,(self.this,)+args)
+    def ClientToScreenXY(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ClientToScreenXY,(self,) + _args, _kwargs)
         return val
-    def Destroy(self):
-        val = windowsc.wxWindow_Destroy(self.this)
+    def ClientToScreen(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ClientToScreen,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
-    def DestroyChildren(self):
-        val = windowsc.wxWindow_DestroyChildren(self.this)
+    def Close(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Close,(self,) + _args, _kwargs)
         return val
-    def Enable(self,arg0):
-        val = windowsc.wxWindow_Enable(self.this,arg0)
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Destroy,(self,) + _args, _kwargs)
         return val
-    def FindWindowById(self,arg0):
-        val = windowsc.wxWindow_FindWindowById(self.this,arg0)
-        val = wxWindowPtr(val)
+    def DestroyChildren(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_DestroyChildren,(self,) + _args, _kwargs)
         return val
-    def FindWindowByName(self,arg0):
-        val = windowsc.wxWindow_FindWindowByName(self.this,arg0)
-        val = wxWindowPtr(val)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Enable,(self,) + _args, _kwargs)
         return val
-    def Fit(self):
-        val = windowsc.wxWindow_Fit(self.this)
+    def FindWindowById(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_FindWindowById,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
         return val
-    def GetBackgroundColour(self):
-        val = windowsc.wxWindow_GetBackgroundColour(self.this)
-        val = wxColourPtr(val)
-        val.thisown = 1
+    def FindWindowByName(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_FindWindowByName,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
         return val
-    def GetCharHeight(self):
-        val = windowsc.wxWindow_GetCharHeight(self.this)
+    def Fit(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Fit,(self,) + _args, _kwargs)
         return val
-    def GetCharWidth(self):
-        val = windowsc.wxWindow_GetCharWidth(self.this)
+    def GetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetBackgroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
         return val
-    def GetClientSizeTuple(self):
-        val = windowsc.wxWindow_GetClientSizeTuple(self.this)
+    def GetChildren(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetChildren,(self,) + _args, _kwargs)
         return val
-    def GetClientSize(self):
-        val = windowsc.wxWindow_GetClientSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetCharHeight(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetCharHeight,(self,) + _args, _kwargs)
         return val
-    def GetConstraints(self):
-        val = windowsc.wxWindow_GetConstraints(self.this)
-        val = wxLayoutConstraintsPtr(val)
+    def GetCharWidth(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetCharWidth,(self,) + _args, _kwargs)
         return val
-    def GetFont(self):
-        val = windowsc.wxWindow_GetFont(self.this)
-        val = wxFontPtr(val)
+    def GetClientSizeTuple(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetClientSizeTuple,(self,) + _args, _kwargs)
         return val
-    def GetForegroundColour(self):
-        val = windowsc.wxWindow_GetForegroundColour(self.this)
-        val = wxColourPtr(val)
-        val.thisown = 1
+    def GetClientSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetClientSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
-    def GetGrandParent(self):
-        val = windowsc.wxWindow_GetGrandParent(self.this)
-        val = wxWindowPtr(val)
+    def GetConstraints(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetConstraints,(self,) + _args, _kwargs)
+        if val: val = wxLayoutConstraintsPtr(val) 
         return val
-    def GetId(self):
-        val = windowsc.wxWindow_GetId(self.this)
+    def GetEventHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetEventHandler,(self,) + _args, _kwargs)
+        if val: val = wxEvtHandlerPtr(val) 
         return val
-    def GetLabel(self):
-        val = windowsc.wxWindow_GetLabel(self.this)
+    def GetFont(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 
         return val
-    def GetName(self):
-        val = windowsc.wxWindow_GetName(self.this)
+    def GetForegroundColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetForegroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
         return val
-    def GetParent(self):
-        val = windowsc.wxWindow_GetParent(self.this)
-        val = wxWindowPtr(val)
+    def GetGrandParent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetGrandParent,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
         return val
-    def GetPositionTuple(self):
-        val = windowsc.wxWindow_GetPositionTuple(self.this)
+    def GetHandle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetHandle,(self,) + _args, _kwargs)
         return val
-    def GetPosition(self):
-        val = windowsc.wxWindow_GetPosition(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetId,(self,) + _args, _kwargs)
         return val
-    def GetRect(self):
-        val = windowsc.wxWindow_GetRect(self.this)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetLabel,(self,) + _args, _kwargs)
         return val
-    def GetScrollThumb(self,arg0):
-        val = windowsc.wxWindow_GetScrollThumb(self.this,arg0)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetLabel,(self,) + _args, _kwargs)
         return val
-    def GetScrollPos(self,arg0):
-        val = windowsc.wxWindow_GetScrollPos(self.this,arg0)
+    def GetName(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetName,(self,) + _args, _kwargs)
         return val
-    def GetScrollRange(self,arg0):
-        val = windowsc.wxWindow_GetScrollRange(self.this,arg0)
+    def GetParent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetParent,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
         return val
-    def GetSizeTuple(self):
-        val = windowsc.wxWindow_GetSizeTuple(self.this)
+    def GetPositionTuple(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetPositionTuple,(self,) + _args, _kwargs)
         return val
-    def GetSize(self):
-        val = windowsc.wxWindow_GetSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
-    def GetTextExtent(self,arg0):
-        val = windowsc.wxWindow_GetTextExtent(self.this,arg0)
+    def GetRect(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1
         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)
+    def GetScrollThumb(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetScrollThumb,(self,) + _args, _kwargs)
         return val
-    def GetTitle(self):
-        val = windowsc.wxWindow_GetTitle(self.this)
+    def GetScrollPos(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetScrollPos,(self,) + _args, _kwargs)
         return val
-    def GetWindowStyleFlag(self):
-        val = windowsc.wxWindow_GetWindowStyleFlag(self.this)
+    def GetScrollRange(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetScrollRange,(self,) + _args, _kwargs)
         return val
-    def InitDialog(self):
-        val = windowsc.wxWindow_InitDialog(self.this)
+    def GetSizeTuple(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetSizeTuple,(self,) + _args, _kwargs)
         return val
-    def IsEnabled(self):
-        val = windowsc.wxWindow_IsEnabled(self.this)
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
-    def IsRetained(self):
-        val = windowsc.wxWindow_IsRetained(self.this)
+    def GetTextExtent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetTextExtent,(self,) + _args, _kwargs)
         return val
-    def IsShown(self):
-        val = windowsc.wxWindow_IsShown(self.this)
+    def GetFullTextExtent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetFullTextExtent,(self,) + _args, _kwargs)
         return val
-    def Layout(self):
-        val = windowsc.wxWindow_Layout(self.this)
+    def GetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetTitle,(self,) + _args, _kwargs)
         return val
-    def LoadFromResource(self,arg0,arg1,*args):
-        val = apply(windowsc.wxWindow_LoadFromResource,(self.this,arg0.this,arg1,)+args)
+    def GetUpdateRegion(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetUpdateRegion,(self,) + _args, _kwargs)
+        if val: val = wxRegionPtr(val) ; val.thisown = 1
         return val
-    def Lower(self):
-        val = windowsc.wxWindow_Lower(self.this)
+    def GetWindowStyleFlag(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetWindowStyleFlag,(self,) + _args, _kwargs)
         return val
-    def MakeModal(self,arg0):
-        val = windowsc.wxWindow_MakeModal(self.this,arg0)
+    def Hide(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Hide,(self,) + _args, _kwargs)
         return val
-    def MoveXY(self,arg0,arg1):
-        val = windowsc.wxWindow_MoveXY(self.this,arg0,arg1)
+    def InitDialog(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_InitDialog,(self,) + _args, _kwargs)
         return val
-    def Move(self,arg0):
-        val = windowsc.wxWindow_Move(self.this,arg0.this)
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsEnabled,(self,) + _args, _kwargs)
         return val
-    def PopupMenu(self,arg0,arg1,arg2):
-        val = windowsc.wxWindow_PopupMenu(self.this,arg0.this,arg1,arg2)
+    def IsExposed(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsExposed,(self,) + _args, _kwargs)
         return val
-    def Raise(self):
-        val = windowsc.wxWindow_Raise(self.this)
+    def IsExposedPoint(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsExposedPoint,(self,) + _args, _kwargs)
         return val
-    def Refresh(self,*args):
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windowsc.wxWindow_Refresh,(self.this,)+args)
+    def IsExposedRect(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsExposedRect,(self,) + _args, _kwargs)
         return val
-    def ReleaseMouse(self):
-        val = windowsc.wxWindow_ReleaseMouse(self.this)
+    def IsRetained(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsRetained,(self,) + _args, _kwargs)
         return val
-    def ScreenToClientXY(self,arg0,arg1):
-        val = windowsc.wxWindow_ScreenToClientXY(self.this,arg0,arg1)
+    def IsShown(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsShown,(self,) + _args, _kwargs)
         return val
-    def ScrollWindow(self,arg0,arg1,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(windowsc.wxWindow_ScrollWindow,(self.this,arg0,arg1,)+args)
+    def IsTopLevel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_IsTopLevel,(self,) + _args, _kwargs)
         return val
-    def SetAcceleratorTable(self,arg0):
-        val = windowsc.wxWindow_SetAcceleratorTable(self.this,arg0.this)
+    def Layout(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Layout,(self,) + _args, _kwargs)
         return val
-    def SetAutoLayout(self,arg0):
-        val = windowsc.wxWindow_SetAutoLayout(self.this,arg0)
+    def LoadFromResource(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_LoadFromResource,(self,) + _args, _kwargs)
         return val
-    def SetBackgroundColour(self,arg0):
-        val = windowsc.wxWindow_SetBackgroundColour(self.this,arg0.this)
+    def Lower(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Lower,(self,) + _args, _kwargs)
         return val
-    def SetConstraints(self,arg0):
-        val = windowsc.wxWindow_SetConstraints(self.this,arg0.this)
+    def MakeModal(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_MakeModal,(self,) + _args, _kwargs)
         return val
-    def SetFocus(self):
-        val = windowsc.wxWindow_SetFocus(self.this)
+    def MoveXY(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_MoveXY,(self,) + _args, _kwargs)
         return val
-    def SetFont(self,arg0):
-        val = windowsc.wxWindow_SetFont(self.this,arg0.this)
+    def Move(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Move,(self,) + _args, _kwargs)
         return val
-    def SetForegroundColour(self,arg0):
-        val = windowsc.wxWindow_SetForegroundColour(self.this,arg0.this)
+    def PopEventHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_PopEventHandler,(self,) + _args, _kwargs)
+        if val: val = wxEvtHandlerPtr(val) 
         return val
-    def SetId(self,arg0):
-        val = windowsc.wxWindow_SetId(self.this,arg0)
+    def PushEventHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_PushEventHandler,(self,) + _args, _kwargs)
         return val
-    def SetName(self,arg0):
-        val = windowsc.wxWindow_SetName(self.this,arg0)
+    def PopupMenuXY(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_PopupMenuXY,(self,) + _args, _kwargs)
         return val
-    def SetScrollbar(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(windowsc.wxWindow_SetScrollbar,(self.this,arg0,arg1,arg2,arg3,)+args)
+    def PopupMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_PopupMenu,(self,) + _args, _kwargs)
         return val
-    def SetScrollPos(self,arg0,arg1,*args):
-        val = apply(windowsc.wxWindow_SetScrollPos,(self.this,arg0,arg1,)+args)
+    def Raise(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Raise,(self,) + _args, _kwargs)
         return val
-    def SetDimensions(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(windowsc.wxWindow_SetDimensions,(self.this,arg0,arg1,arg2,arg3,)+args)
+    def Refresh(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Refresh,(self,) + _args, _kwargs)
         return val
-    def SetSize(self,arg0):
-        val = windowsc.wxWindow_SetSize(self.this,arg0.this)
+    def ReleaseMouse(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ReleaseMouse,(self,) + _args, _kwargs)
         return val
-    def SetPosition(self,arg0):
-        val = windowsc.wxWindow_SetPosition(self.this,arg0.this)
+    def RemoveChild(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_RemoveChild,(self,) + _args, _kwargs)
         return val
-    def SetSizeHints(self,*args):
-        val = apply(windowsc.wxWindow_SetSizeHints,(self.this,)+args)
+    def Reparent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Reparent,(self,) + _args, _kwargs)
         return val
-    def SetClientSizeWH(self,arg0,arg1):
-        val = windowsc.wxWindow_SetClientSizeWH(self.this,arg0,arg1)
+    def ScreenToClientXY(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ScreenToClientXY,(self,) + _args, _kwargs)
         return val
-    def SetClientSize(self,arg0):
-        val = windowsc.wxWindow_SetClientSize(self.this,arg0.this)
+    def ScreenToClient(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ScreenToClient,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
-    def SetCursor(self,arg0):
-        val = windowsc.wxWindow_SetCursor(self.this,arg0.this)
+    def ScrollWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ScrollWindow,(self,) + _args, _kwargs)
         return val
-    def SetTitle(self,arg0):
-        val = windowsc.wxWindow_SetTitle(self.this,arg0)
+    def SetAcceleratorTable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs)
         return val
-    def Show(self,arg0):
-        val = windowsc.wxWindow_Show(self.this,arg0)
+    def SetAutoLayout(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetAutoLayout,(self,) + _args, _kwargs)
         return val
-    def TransferDataFromWindow(self):
-        val = windowsc.wxWindow_TransferDataFromWindow(self.this)
+    def GetAutoLayout(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetAutoLayout,(self,) + _args, _kwargs)
         return val
-    def TransferDataToWindow(self):
-        val = windowsc.wxWindow_TransferDataToWindow(self.this)
+    def SetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetBackgroundColour,(self,) + _args, _kwargs)
         return val
-    def Validate(self):
-        val = windowsc.wxWindow_Validate(self.this)
+    def SetConstraints(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetConstraints,(self,) + _args, _kwargs)
         return val
-    def WarpPointer(self,arg0,arg1):
-        val = windowsc.wxWindow_WarpPointer(self.this,arg0,arg1)
+    def UnsetConstraints(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_UnsetConstraints,(self,) + _args, _kwargs)
         return val
-    def ConvertDialogPointToPixels(self,arg0):
-        val = windowsc.wxWindow_ConvertDialogPointToPixels(self.this,arg0.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def SetFocus(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetFocus,(self,) + _args, _kwargs)
         return val
-    def ConvertDialogSizeToPixels(self,arg0):
-        val = windowsc.wxWindow_ConvertDialogSizeToPixels(self.this,arg0.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def AcceptsFocus(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_AcceptsFocus,(self,) + _args, _kwargs)
         return val
-    def DLG_PNT(self,arg0):
-        val = windowsc.wxWindow_DLG_PNT(self.this,arg0.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def SetFont(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetFont,(self,) + _args, _kwargs)
         return val
-    def DLG_SZE(self,arg0):
-        val = windowsc.wxWindow_DLG_SZE(self.this,arg0.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def SetForegroundColour(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetForegroundColour,(self,) + _args, _kwargs)
         return val
-    def ConvertPixelPointToDialog(self,arg0):
-        val = windowsc.wxWindow_ConvertPixelPointToDialog(self.this,arg0.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def SetId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetId,(self,) + _args, _kwargs)
         return val
-    def ConvertPixelSizeToDialog(self,arg0):
-        val = windowsc.wxWindow_ConvertPixelSizeToDialog(self.this,arg0.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def SetName(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetName,(self,) + _args, _kwargs)
         return val
-    def SetToolTipString(self,arg0):
-        val = windowsc.wxWindow_SetToolTipString(self.this,arg0)
+    def SetScrollbar(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetScrollbar,(self,) + _args, _kwargs)
         return val
-    def SetToolTip(self,arg0):
-        val = windowsc.wxWindow_SetToolTip(self.this,arg0.this)
+    def SetScrollPos(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetScrollPos,(self,) + _args, _kwargs)
         return val
-    def GetToolTip(self):
-        val = windowsc.wxWindow_GetToolTip(self.this)
-        val = wxToolTipPtr(val)
+    def SetDimensions(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetDimensions,(self,) + _args, _kwargs)
+        return val
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetSize,(self,) + _args, _kwargs)
+        return val
+    def SetPosition(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetPosition,(self,) + _args, _kwargs)
+        return val
+    def SetSizeHints(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetSizeHints,(self,) + _args, _kwargs)
+        return val
+    def SetClientSizeWH(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetClientSizeWH,(self,) + _args, _kwargs)
+        return val
+    def SetClientSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetClientSize,(self,) + _args, _kwargs)
+        return val
+    def SetCursor(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetCursor,(self,) + _args, _kwargs)
+        return val
+    def SetEventHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetEventHandler,(self,) + _args, _kwargs)
+        return val
+    def SetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetTitle,(self,) + _args, _kwargs)
+        return val
+    def Show(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Show,(self,) + _args, _kwargs)
+        return val
+    def TransferDataFromWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_TransferDataFromWindow,(self,) + _args, _kwargs)
+        return val
+    def TransferDataToWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_TransferDataToWindow,(self,) + _args, _kwargs)
+        return val
+    def Validate(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Validate,(self,) + _args, _kwargs)
+        return val
+    def WarpPointer(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_WarpPointer,(self,) + _args, _kwargs)
+        return val
+    def ConvertDialogPointToPixels(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ConvertDialogPointToPixels,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
+        return val
+    def ConvertDialogSizeToPixels(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ConvertDialogSizeToPixels,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def DLG_PNT(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_DLG_PNT,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
+        return val
+    def DLG_SZE(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_DLG_SZE,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def ConvertPixelPointToDialog(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ConvertPixelPointToDialog,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
+        return val
+    def ConvertPixelSizeToDialog(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_ConvertPixelSizeToDialog,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def SetToolTipString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetToolTipString,(self,) + _args, _kwargs)
+        return val
+    def SetToolTip(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetToolTip,(self,) + _args, _kwargs)
+        return val
+    def GetToolTip(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetToolTip,(self,) + _args, _kwargs)
+        if val: val = wxToolTipPtr(val) 
+        return val
+    def SetSizer(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetSizer,(self,) + _args, _kwargs)
+        return val
+    def GetValidator(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetValidator,(self,) + _args, _kwargs)
+        if val: val = wxValidatorPtr(val) 
+        return val
+    def SetValidator(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetValidator,(self,) + _args, _kwargs)
+        return val
+    def SetDropTarget(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetDropTarget,(self,) + _args, _kwargs)
+        _args[0].thisown = 0
+        return val
+    def GetDropTarget(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetDropTarget,(self,) + _args, _kwargs)
+        if val: val = wxDropTargetPtr(val) 
+        return val
+    def GetBestSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetBestSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def SetCaret(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetCaret,(self,) + _args, _kwargs)
+        return val
+    def GetCaret(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs)
+        if val: val = wxCaretPtr(val) 
         return val
     def __repr__(self):
-        return "<C wxWindow instance>"
+        return "<C wxWindow instance at %s>" % (self.this,)
+    # replaces broken shadow method
+    def GetCaret(self, *_args, **_kwargs):
+        from misc2 import wxCaretPtr
+        val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs)
+        if val: val = wxCaretPtr(val)
+        return val
+
 class wxWindow(wxWindowPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxWindow,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxWindow,_args,_kwargs)
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
@@ -354,20 +511,28 @@ class wxPanelPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def InitDialog(self):
-        val = windowsc.wxPanel_InitDialog(self.this)
+    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)
+        if val: val = wxButtonPtr(val) 
+        return val
+    def SetDefaultItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxPanel_SetDefaultItem,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxPanel instance>"
+        return "<C wxPanel instance at %s>" % (self.this,)
+    
+    def GetDefaultItem(self):
+        import controls
+        val = windowsc.wxPanel_GetDefaultItem(self.this)
+        val = controls.wxButtonPtr(val)
+        return val
+
 class wxPanel(wxPanelPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxPanel,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxPanel,_args,_kwargs)
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
@@ -378,98 +543,105 @@ class wxDialogPtr(wxPanelPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def Centre(self,*args):
-        val = apply(windowsc.wxDialog_Centre,(self.this,)+args)
+    def Centre(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_Centre,(self,) + _args, _kwargs)
         return val
-    def EndModal(self,arg0):
-        val = windowsc.wxDialog_EndModal(self.this,arg0)
+    def EndModal(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_EndModal,(self,) + _args, _kwargs)
         return val
-    def GetTitle(self):
-        val = windowsc.wxDialog_GetTitle(self.this)
+    def GetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_GetTitle,(self,) + _args, _kwargs)
         return val
-    def Iconize(self,arg0):
-        val = windowsc.wxDialog_Iconize(self.this,arg0)
+    def Iconize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_Iconize,(self,) + _args, _kwargs)
         return val
-    def IsIconized(self):
-        val = windowsc.wxDialog_IsIconized(self.this)
+    def IsIconized(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_IsIconized,(self,) + _args, _kwargs)
         return val
-    def SetModal(self,arg0):
-        val = windowsc.wxDialog_SetModal(self.this,arg0)
+    def SetModal(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_SetModal,(self,) + _args, _kwargs)
         return val
-    def IsModal(self):
-        val = windowsc.wxDialog_IsModal(self.this)
+    def IsModal(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_IsModal,(self,) + _args, _kwargs)
         return val
-    def SetTitle(self,arg0):
-        val = windowsc.wxDialog_SetTitle(self.this,arg0)
+    def SetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_SetTitle,(self,) + _args, _kwargs)
         return val
-    def Show(self,arg0):
-        val = windowsc.wxDialog_Show(self.this,arg0)
+    def Show(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_Show,(self,) + _args, _kwargs)
         return val
-    def ShowModal(self):
-        val = windowsc.wxDialog_ShowModal(self.this)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_ShowModal,(self,) + _args, _kwargs)
         return val
-    def GetReturnCode(self):
-        val = windowsc.wxDialog_GetReturnCode(self.this)
+    def GetReturnCode(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_GetReturnCode,(self,) + _args, _kwargs)
         return val
-    def SetReturnCode(self,arg0):
-        val = windowsc.wxDialog_SetReturnCode(self.this,arg0)
+    def SetReturnCode(self, *_args, **_kwargs):
+        val = apply(windowsc.wxDialog_SetReturnCode,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxDialog instance>"
+        return "<C wxDialog instance at %s>" % (self.this,)
 class wxDialog(wxDialogPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxDialog,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxDialog,_args,_kwargs)
         self.thisown = 1
         wx._StdDialogCallbacks(self)
 
 
 
 
-class wxScrolledWindowPtr(wxWindowPtr):
+class wxScrolledWindowPtr(wxPanelPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def EnableScrolling(self,arg0,arg1):
-        val = windowsc.wxScrolledWindow_EnableScrolling(self.this,arg0,arg1)
+    def EnableScrolling(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_EnableScrolling,(self,) + _args, _kwargs)
+        return val
+    def GetScrollPageSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_GetScrollPageSize,(self,) + _args, _kwargs)
+        return val
+    def GetScrollPixelsPerUnit(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_GetScrollPixelsPerUnit,(self,) + _args, _kwargs)
+        return val
+    def GetTargetWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_GetTargetWindow,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
+        return val
+    def GetVirtualSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_GetVirtualSize,(self,) + _args, _kwargs)
         return val
-    def GetScrollPixelsPerUnit(self):
-        val = windowsc.wxScrolledWindow_GetScrollPixelsPerUnit(self.this)
+    def IsRetained(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_IsRetained,(self,) + _args, _kwargs)
         return val
-    def GetVirtualSize(self):
-        val = windowsc.wxScrolledWindow_GetVirtualSize(self.this)
+    def PrepareDC(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_PrepareDC,(self,) + _args, _kwargs)
         return val
-    def IsRetained(self):
-        val = windowsc.wxScrolledWindow_IsRetained(self.this)
+    def Scroll(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_Scroll,(self,) + _args, _kwargs)
         return val
-    def PrepareDC(self,arg0):
-        val = windowsc.wxScrolledWindow_PrepareDC(self.this,arg0.this)
+    def SetScrollbars(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_SetScrollbars,(self,) + _args, _kwargs)
         return val
-    def Scroll(self,arg0,arg1):
-        val = windowsc.wxScrolledWindow_Scroll(self.this,arg0,arg1)
+    def SetScrollPageSize(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_SetScrollPageSize,(self,) + _args, _kwargs)
         return val
-    def SetScrollbars(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(windowsc.wxScrolledWindow_SetScrollbars,(self.this,arg0,arg1,arg2,arg3,)+args)
+    def SetTargetWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_SetTargetWindow,(self,) + _args, _kwargs)
         return val
-    def ViewStart(self):
-        val = windowsc.wxScrolledWindow_ViewStart(self.this)
+    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
+    def CalcUnscrolledPosition(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_CalcUnscrolledPosition,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxScrolledWindow instance>"
+        return "<C wxScrolledWindow instance at %s>" % (self.this,)
 class wxScrolledWindow(wxScrolledWindowPtr):
-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxScrolledWindow,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxScrolledWindow,_args,_kwargs)
         self.thisown = 1
         wx._StdWindowCallbacks(self)
         wx._StdOnScrollCallbacks(self)
@@ -481,120 +653,200 @@ class wxMenuPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def Append(self,arg0,arg1,*args):
-        val = apply(windowsc.wxMenu_Append,(self.this,arg0,arg1,)+args)
+    def Append(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Append,(self,) + _args, _kwargs)
+        return val
+    def AppendMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_AppendMenu,(self,) + _args, _kwargs)
+        return val
+    def AppendItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_AppendItem,(self,) + _args, _kwargs)
+        return val
+    def AppendSeparator(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_AppendSeparator,(self,) + _args, _kwargs)
+        return val
+    def Break(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Break,(self,) + _args, _kwargs)
+        return val
+    def Check(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Check,(self,) + _args, _kwargs)
+        return val
+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_IsChecked,(self,) + _args, _kwargs)
         return val
-    def AppendMenu(self,arg0,arg1,arg2,*args):
-        val = apply(windowsc.wxMenu_AppendMenu,(self.this,arg0,arg1,arg2.this,)+args)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Enable,(self,) + _args, _kwargs)
         return val
-    def AppendSeparator(self):
-        val = windowsc.wxMenu_AppendSeparator(self.this)
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_IsEnabled,(self,) + _args, _kwargs)
         return val
-    def Break(self):
-        val = windowsc.wxMenu_Break(self.this)
+    def FindItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_FindItem,(self,) + _args, _kwargs)
         return val
-    def Check(self,arg0,arg1):
-        val = windowsc.wxMenu_Check(self.this,arg0,arg1)
+    def FindItemById(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_FindItemById,(self,) + _args, _kwargs)
+        if val: val = wxMenuItemPtr(val) 
         return val
-    def Enable(self,arg0,arg1):
-        val = windowsc.wxMenu_Enable(self.this,arg0,arg1)
+    def GetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetTitle,(self,) + _args, _kwargs)
         return val
-    def FindItem(self,arg0):
-        val = windowsc.wxMenu_FindItem(self.this,arg0)
+    def SetTitle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_SetTitle,(self,) + _args, _kwargs)
         return val
-    def GetTitle(self):
-        val = windowsc.wxMenu_GetTitle(self.this)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetLabel,(self,) + _args, _kwargs)
         return val
-    def SetTitle(self,arg0):
-        val = windowsc.wxMenu_SetTitle(self.this,arg0)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_SetLabel,(self,) + _args, _kwargs)
         return val
-    def FindItemForId(self,arg0):
-        val = windowsc.wxMenu_FindItemForId(self.this,arg0)
-        val = wxMenuItemPtr(val)
+    def GetHelpString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetHelpString,(self,) + _args, _kwargs)
         return val
-    def GetHelpString(self,arg0):
-        val = windowsc.wxMenu_GetHelpString(self.this,arg0)
+    def SetHelpString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_SetHelpString,(self,) + _args, _kwargs)
         return val
-    def GetLabel(self,arg0):
-        val = windowsc.wxMenu_GetLabel(self.this,arg0)
+    def UpdateUI(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_UpdateUI,(self,) + _args, _kwargs)
         return val
-    def SetHelpString(self,arg0,arg1):
-        val = windowsc.wxMenu_SetHelpString(self.this,arg0,arg1)
+    def Delete(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Delete,(self,) + _args, _kwargs)
         return val
-    def IsChecked(self,arg0):
-        val = windowsc.wxMenu_IsChecked(self.this,arg0)
+    def DeleteItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_DeleteItem,(self,) + _args, _kwargs)
         return val
-    def IsEnabled(self,arg0):
-        val = windowsc.wxMenu_IsEnabled(self.this,arg0)
+    def Insert(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Insert,(self,) + _args, _kwargs)
         return val
-    def SetLabel(self,arg0,arg1):
-        val = windowsc.wxMenu_SetLabel(self.this,arg0,arg1)
+    def Remove(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Remove,(self,) + _args, _kwargs)
+        if val: val = wxMenuItemPtr(val) 
+        return val
+    def RemoveItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_RemoveItem,(self,) + _args, _kwargs)
+        if val: val = wxMenuItemPtr(val) 
+        return val
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Destroy,(self,) + _args, _kwargs)
+        return val
+    def DestroyId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_DestroyId,(self,) + _args, _kwargs)
+        return val
+    def DestroyItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_DestroyItem,(self,) + _args, _kwargs)
+        return val
+    def GetMenuItemCount(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetMenuItemCount,(self,) + _args, _kwargs)
+        return val
+    def GetMenuItems(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetMenuItems,(self,) + _args, _kwargs)
+        return val
+    def SetEventHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_SetEventHandler,(self,) + _args, _kwargs)
+        return val
+    def GetEventHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetEventHandler,(self,) + _args, _kwargs)
+        if val: val = wxEvtHandlerPtr(val) 
+        return val
+    def SetInvokingWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_SetInvokingWindow,(self,) + _args, _kwargs)
+        return val
+    def GetInvokingWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetInvokingWindow,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
+        return val
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetStyle,(self,) + _args, _kwargs)
+        return val
+    def IsAttached(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_IsAttached,(self,) + _args, _kwargs)
+        return val
+    def SetParent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_SetParent,(self,) + _args, _kwargs)
+        return val
+    def GetParent(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetParent,(self,) + _args, _kwargs)
+        if val: val = wxMenuPtr(val) 
         return val
     def __repr__(self):
-        return "<C wxMenu instance>"
+        return "<C wxMenu instance at %s>" % (self.this,)
 class wxMenu(wxMenuPtr):
-    def __init__(self,*args) :
-        self.this = apply(windowsc.new_wxMenu,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxMenu,_args,_kwargs)
         self.thisown = 1
 
 
 
 
-class wxPyMenuPtr(wxMenuPtr):
+class wxMenuBarPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
-        if self.thisown == 1 :
-            windowsc.delete_wxPyMenu(self.this)
-    def __repr__(self):
-        return "<C wxPyMenu instance>"
-class wxPyMenu(wxPyMenuPtr):
-    def __init__(self,*args) :
-        self.this = apply(windowsc.new_wxPyMenu,()+args)
-        self.thisown = 1
-
-
-
-
-class wxMenuBarPtr(wxEvtHandlerPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def Append(self,arg0,arg1):
-        val = windowsc.wxMenuBar_Append(self.this,arg0.this,arg1)
+    def Append(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Append,(self,) + _args, _kwargs)
+        return val
+    def Insert(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Insert,(self,) + _args, _kwargs)
+        return val
+    def GetMenuCount(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetMenuCount,(self,) + _args, _kwargs)
+        return val
+    def GetMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetMenu,(self,) + _args, _kwargs)
+        if val: val = wxMenuPtr(val) 
+        return val
+    def Replace(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Replace,(self,) + _args, _kwargs)
+        if val: val = wxMenuPtr(val) 
+        return val
+    def Remove(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Remove,(self,) + _args, _kwargs)
+        if val: val = wxMenuPtr(val) 
+        return val
+    def EnableTop(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_EnableTop,(self,) + _args, _kwargs)
+        return val
+    def SetLabelTop(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_SetLabelTop,(self,) + _args, _kwargs)
+        return val
+    def GetLabelTop(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetLabelTop,(self,) + _args, _kwargs)
+        return val
+    def FindMenuItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_FindMenuItem,(self,) + _args, _kwargs)
         return val
-    def Check(self,arg0,arg1):
-        val = windowsc.wxMenuBar_Check(self.this,arg0,arg1)
+    def FindItemById(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_FindItemById,(self,) + _args, _kwargs)
+        if val: val = wxMenuItemPtr(val) 
         return val
-    def Checked(self,arg0):
-        val = windowsc.wxMenuBar_Checked(self.this,arg0)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Enable,(self,) + _args, _kwargs)
         return val
-    def Enable(self,arg0,arg1):
-        val = windowsc.wxMenuBar_Enable(self.this,arg0,arg1)
+    def Check(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Check,(self,) + _args, _kwargs)
         return val
-    def Enabled(self,arg0):
-        val = windowsc.wxMenuBar_Enabled(self.this,arg0)
+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_IsChecked,(self,) + _args, _kwargs)
         return val
-    def FindMenuItem(self,arg0,arg1):
-        val = windowsc.wxMenuBar_FindMenuItem(self.this,arg0,arg1)
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_IsEnabled,(self,) + _args, _kwargs)
         return val
-    def FindItemForId(self,arg0):
-        val = windowsc.wxMenuBar_FindItemForId(self.this,arg0)
-        val = wxMenuItemPtr(val)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_SetLabel,(self,) + _args, _kwargs)
         return val
-    def GetMenuCount(self):
-        val = windowsc.wxMenuBar_GetMenuCount(self.this)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetLabel,(self,) + _args, _kwargs)
         return val
-    def GetMenu(self,arg0):
-        val = windowsc.wxMenuBar_GetMenu(self.this,arg0)
-        val = wxMenuPtr(val)
+    def SetHelpString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_SetHelpString,(self,) + _args, _kwargs)
+        return val
+    def GetHelpString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetHelpString,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxMenuBar instance>"
+        return "<C wxMenuBar instance at %s>" % (self.this,)
 class wxMenuBar(wxMenuBarPtr):
-    def __init__(self) :
-        self.this = windowsc.new_wxMenuBar()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxMenuBar,_args,_kwargs)
         self.thisown = 1
 
 
@@ -604,48 +856,77 @@ class wxMenuItemPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def IsSeparator(self):
-        val = windowsc.wxMenuItem_IsSeparator(self.this)
+    def GetMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetMenu,(self,) + _args, _kwargs)
+        if val: val = wxMenuPtr(val) 
+        return val
+    def SetId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetId,(self,) + _args, _kwargs)
+        return val
+    def GetId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetId,(self,) + _args, _kwargs)
+        return val
+    def IsSeparator(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsSeparator,(self,) + _args, _kwargs)
+        return val
+    def SetText(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetText,(self,) + _args, _kwargs)
+        return val
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetLabel,(self,) + _args, _kwargs)
+        return val
+    def GetText(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetText,(self,) + _args, _kwargs)
+        return val
+    def SetCheckable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetCheckable,(self,) + _args, _kwargs)
         return val
-    def IsEnabled(self):
-        val = windowsc.wxMenuItem_IsEnabled(self.this)
+    def IsCheckable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsCheckable,(self,) + _args, _kwargs)
         return val
-    def IsChecked(self):
-        val = windowsc.wxMenuItem_IsChecked(self.this)
+    def IsSubMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsSubMenu,(self,) + _args, _kwargs)
         return val
-    def IsCheckable(self):
-        val = windowsc.wxMenuItem_IsCheckable(self.this)
+    def SetSubMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetSubMenu,(self,) + _args, _kwargs)
         return val
-    def GetId(self):
-        val = windowsc.wxMenuItem_GetId(self.this)
+    def GetSubMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetSubMenu,(self,) + _args, _kwargs)
+        if val: val = wxMenuPtr(val) 
         return val
-    def GetSubMenu(self):
-        val = windowsc.wxMenuItem_GetSubMenu(self.this)
-        val = wxMenuPtr(val)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_Enable,(self,) + _args, _kwargs)
         return val
-    def SetName(self,arg0):
-        val = windowsc.wxMenuItem_SetName(self.this,arg0)
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsEnabled,(self,) + _args, _kwargs)
         return val
-    def GetName(self):
-        val = windowsc.wxMenuItem_GetName(self.this)
+    def Check(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_Check,(self,) + _args, _kwargs)
         return val
-    def GetHelp(self):
-        val = windowsc.wxMenuItem_GetHelp(self.this)
+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsChecked,(self,) + _args, _kwargs)
         return val
-    def SetHelp(self,arg0):
-        val = windowsc.wxMenuItem_SetHelp(self.this,arg0)
+    def Toggle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_Toggle,(self,) + _args, _kwargs)
         return val
-    def Enable(self,*args):
-        val = apply(windowsc.wxMenuItem_Enable,(self.this,)+args)
+    def SetHelp(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetHelp,(self,) + _args, _kwargs)
         return val
-    def Check(self,*args):
-        val = apply(windowsc.wxMenuItem_Check,(self.this,)+args)
+    def GetHelp(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetHelp,(self,) + _args, _kwargs)
+        return val
+    def GetAccel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetAccel,(self,) + _args, _kwargs)
+        if val: val = wxAcceleratorEntryPtr(val) 
+        return val
+    def SetAccel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetAccel,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxMenuItem instance>"
+        return "<C wxMenuItem instance at %s>" % (self.this,)
 class wxMenuItem(wxMenuItemPtr):
-    def __init__(self) :
-        self.this = windowsc.new_wxMenuItem()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(windowsc.new_wxMenuItem,_args,_kwargs)
         self.thisown = 1
 
 
@@ -655,6 +936,16 @@ class wxMenuItem(wxMenuItemPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
+wxValidator_IsSilent = windowsc.wxValidator_IsSilent
+
+wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError
+
+wxWindow_NewControlId = windowsc.wxWindow_NewControlId
+
+wxWindow_NextControlId = windowsc.wxWindow_NextControlId
+
+wxWindow_PrevControlId = windowsc.wxWindow_PrevControlId
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------