X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d99702e4b41ed8b4110325e3dd9d710b5d32562..4afd752902ae7c44f4b3dc2edb11d7c24f95ed54:/utils/wxPython/src/msw/windows.py

diff --git a/utils/wxPython/src/msw/windows.py b/utils/wxPython/src/msw/windows.py
index 8ae94d6bb0..093d5cad01 100644
--- a/utils/wxPython/src/msw/windows.py
+++ b/utils/wxPython/src/msw/windows.py
@@ -4,6 +4,8 @@ import windowsc
 from misc import *
 
 from gdi import *
+
+from clip_dnd import *
 import wx
 
 def wxDLG_PNT(win, point_or_x, y=None):
@@ -25,6 +27,26 @@ class wxEvtHandlerPtr :
     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
@@ -37,6 +59,52 @@ 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
@@ -93,6 +161,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
         val = apply(windowsc.wxWindow_GetBackgroundColour,(self,) + _args, _kwargs)
         if val: val = wxColourPtr(val) ; val.thisown = 1
         return val
+    def GetChildren(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetChildren,(self,) + _args, _kwargs)
+        return val
     def GetCharHeight(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetCharHeight,(self,) + _args, _kwargs)
         return val
@@ -110,6 +181,10 @@ class wxWindowPtr(wxEvtHandlerPtr):
         val = apply(windowsc.wxWindow_GetConstraints,(self,) + _args, _kwargs)
         if val: val = wxLayoutConstraintsPtr(val) 
         return val
+    def GetEventHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetEventHandler,(self,) + _args, _kwargs)
+        if val: val = wxEvtHandlerPtr(val) 
+        return val
     def GetFont(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetFont,(self,) + _args, _kwargs)
         if val: val = wxFontPtr(val) 
@@ -122,6 +197,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
         val = apply(windowsc.wxWindow_GetGrandParent,(self,) + _args, _kwargs)
         if val: val = wxWindowPtr(val) 
         return val
+    def GetHandle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetHandle,(self,) + _args, _kwargs)
+        return val
     def GetId(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetId,(self,) + _args, _kwargs)
         return val
@@ -217,6 +295,13 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Move(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Move,(self,) + _args, _kwargs)
         return val
+    def PopEventHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_PopEventHandler,(self,) + _args, _kwargs)
+        if val: val = wxEvtHandlerPtr(val) 
+        return val
+    def PushEventHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_PushEventHandler,(self,) + _args, _kwargs)
+        return val
     def PopupMenuXY(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_PopupMenuXY,(self,) + _args, _kwargs)
         return val
@@ -251,15 +336,24 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetAutoLayout(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetAutoLayout,(self,) + _args, _kwargs)
         return val
+    def GetAutoLayout(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetAutoLayout,(self,) + _args, _kwargs)
+        return val
     def SetBackgroundColour(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetBackgroundColour,(self,) + _args, _kwargs)
         return val
     def SetConstraints(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetConstraints,(self,) + _args, _kwargs)
         return val
+    def UnsetConstraints(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_UnsetConstraints,(self,) + _args, _kwargs)
+        return val
     def SetFocus(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetFocus,(self,) + _args, _kwargs)
         return val
+    def AcceptsFocus(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_AcceptsFocus,(self,) + _args, _kwargs)
+        return val
     def SetFont(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetFont,(self,) + _args, _kwargs)
         return val
@@ -299,6 +393,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
     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
@@ -351,6 +448,28 @@ class wxWindowPtr(wxEvtHandlerPtr):
         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 __repr__(self):
         return "<C wxWindow instance at %s>" % (self.this,)
 class wxWindow(wxWindowPtr):
@@ -470,9 +589,18 @@ class wxScrolledWindowPtr(wxPanelPtr):
     def SetScrollbars(self, *_args, **_kwargs):
         val = apply(windowsc.wxScrolledWindow_SetScrollbars,(self,) + _args, _kwargs)
         return val
+    def SetTargetWindow(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_SetTargetWindow,(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
+    def CalcUnscrolledPosition(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_CalcUnscrolledPosition,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxScrolledWindow instance at %s>" % (self.this,)
 class wxScrolledWindow(wxScrolledWindowPtr):
@@ -507,42 +635,101 @@ class wxMenuPtr(wxEvtHandlerPtr):
     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 Enable(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenu_Enable,(self,) + _args, _kwargs)
         return val
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_IsEnabled,(self,) + _args, _kwargs)
+        return val
     def FindItem(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenu_FindItem,(self,) + _args, _kwargs)
         return val
+    def FindItemById(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_FindItemById,(self,) + _args, _kwargs)
+        if val: val = wxMenuItemPtr(val) 
+        return val
     def GetTitle(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenu_GetTitle,(self,) + _args, _kwargs)
         return val
     def SetTitle(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenu_SetTitle,(self,) + _args, _kwargs)
         return val
-    def FindItemForId(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenu_FindItemForId,(self,) + _args, _kwargs)
-        if val: val = wxMenuItemPtr(val) 
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_GetLabel,(self,) + _args, _kwargs)
+        return val
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_SetLabel,(self,) + _args, _kwargs)
         return val
     def GetHelpString(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenu_GetHelpString,(self,) + _args, _kwargs)
         return val
-    def GetLabel(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenu_GetLabel,(self,) + _args, _kwargs)
-        return val
     def SetHelpString(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenu_SetHelpString,(self,) + _args, _kwargs)
         return val
-    def IsChecked(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenu_IsChecked,(self,) + _args, _kwargs)
+    def UpdateUI(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_UpdateUI,(self,) + _args, _kwargs)
         return val
-    def IsEnabled(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenu_IsEnabled,(self,) + _args, _kwargs)
+    def Delete(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Delete,(self,) + _args, _kwargs)
         return val
-    def SetLabel(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenu_SetLabel,(self,) + _args, _kwargs)
+    def DeleteItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_DeleteItem,(self,) + _args, _kwargs)
         return val
-    def UpdateUI(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenu_UpdateUI,(self,) + _args, _kwargs)
+    def Insert(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Insert,(self,) + _args, _kwargs)
+        return val
+    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 at %s>" % (self.this,)
@@ -554,59 +741,70 @@ class wxMenu(wxMenuPtr):
 
 
 
-class wxMenuBarPtr(wxEvtHandlerPtr):
+class wxMenuBarPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def Append(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenuBar_Append,(self,) + _args, _kwargs)
         return val
-    def Check(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_Check,(self,) + _args, _kwargs)
+    def Insert(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Insert,(self,) + _args, _kwargs)
         return val
-    def Checked(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_Checked,(self,) + _args, _kwargs)
+    def GetMenuCount(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetMenuCount,(self,) + _args, _kwargs)
         return val
-    def Enable(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_Enable,(self,) + _args, _kwargs)
+    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 Enabled(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_Enabled,(self,) + _args, _kwargs)
+    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 FindItemForId(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_FindItemForId,(self,) + _args, _kwargs)
+    def FindItemById(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_FindItemById,(self,) + _args, _kwargs)
         if val: val = wxMenuItemPtr(val) 
         return val
-    def EnableTop(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_EnableTop,(self,) + _args, _kwargs)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Enable,(self,) + _args, _kwargs)
         return val
-    def GetHelpString(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_GetHelpString,(self,) + _args, _kwargs)
+    def Check(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_Check,(self,) + _args, _kwargs)
         return val
-    def GetLabel(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_GetLabel,(self,) + _args, _kwargs)
+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_IsChecked,(self,) + _args, _kwargs)
         return val
-    def SetHelpString(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_SetHelpString,(self,) + _args, _kwargs)
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_IsEnabled,(self,) + _args, _kwargs)
         return val
     def SetLabel(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenuBar_SetLabel,(self,) + _args, _kwargs)
         return val
-    def GetLabelTop(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_GetLabelTop,(self,) + _args, _kwargs)
-        return val
-    def SetLabelTop(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_SetLabelTop,(self,) + _args, _kwargs)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetLabel,(self,) + _args, _kwargs)
         return val
-    def GetMenuCount(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_GetMenuCount,(self,) + _args, _kwargs)
+    def SetHelpString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_SetHelpString,(self,) + _args, _kwargs)
         return val
-    def GetMenu(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuBar_GetMenu,(self,) + _args, _kwargs)
-        if val: val = wxMenuPtr(val) 
+    def GetHelpString(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuBar_GetHelpString,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxMenuBar instance at %s>" % (self.this,)
@@ -622,79 +820,71 @@ class wxMenuItemPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    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 IsEnabled(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_IsEnabled,(self,) + _args, _kwargs)
+    def SetText(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetText,(self,) + _args, _kwargs)
         return val
-    def IsChecked(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_IsChecked,(self,) + _args, _kwargs)
+    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 IsCheckable(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenuItem_IsCheckable,(self,) + _args, _kwargs)
         return val
-    def GetId(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_GetId,(self,) + _args, _kwargs)
+    def IsSubMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsSubMenu,(self,) + _args, _kwargs)
+        return val
+    def SetSubMenu(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetSubMenu,(self,) + _args, _kwargs)
         return val
     def GetSubMenu(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenuItem_GetSubMenu,(self,) + _args, _kwargs)
         if val: val = wxMenuPtr(val) 
         return val
-    def SetName(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_SetName,(self,) + _args, _kwargs)
-        return val
-    def GetName(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_GetName,(self,) + _args, _kwargs)
-        return val
-    def GetHelp(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_GetHelp,(self,) + _args, _kwargs)
-        return val
-    def SetHelp(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_SetHelp,(self,) + _args, _kwargs)
-        return val
     def Enable(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenuItem_Enable,(self,) + _args, _kwargs)
         return val
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsEnabled,(self,) + _args, _kwargs)
+        return val
     def Check(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenuItem_Check,(self,) + _args, _kwargs)
         return val
-    def GetBackgroundColour(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_GetBackgroundColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetBitmap(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_GetBitmap,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) ; val.thisown = 1
-        return val
-    def GetFont(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_GetFont,(self,) + _args, _kwargs)
-        if val: val = wxFontPtr(val) 
-        return val
-    def GetMarginWidth(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_GetMarginWidth,(self,) + _args, _kwargs)
-        return val
-    def GetTextColour(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_GetTextColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def SetBackgroundColour(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_SetBackgroundColour,(self,) + _args, _kwargs)
+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_IsChecked,(self,) + _args, _kwargs)
         return val
-    def SetBitmaps(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_SetBitmaps,(self,) + _args, _kwargs)
+    def Toggle(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_Toggle,(self,) + _args, _kwargs)
         return val
-    def SetFont(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_SetFont,(self,) + _args, _kwargs)
+    def SetHelp(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetHelp,(self,) + _args, _kwargs)
         return val
-    def SetMarginWidth(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_SetMarginWidth,(self,) + _args, _kwargs)
+    def GetHelp(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetHelp,(self,) + _args, _kwargs)
         return val
-    def SetTextColour(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_SetTextColour,(self,) + _args, _kwargs)
+    def GetAccel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_GetAccel,(self,) + _args, _kwargs)
+        if val: val = wxAcceleratorEntryPtr(val) 
         return val
-    def DeleteSubMenu(self, *_args, **_kwargs):
-        val = apply(windowsc.wxMenuItem_DeleteSubMenu,(self,) + _args, _kwargs)
+    def SetAccel(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenuItem_SetAccel,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxMenuItem instance at %s>" % (self.this,)
@@ -710,6 +900,10 @@ class wxMenuItem(wxMenuItemPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
+wxValidator_IsSilent = windowsc.wxValidator_IsSilent
+
+wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError
+
 def wxWindow_FindFocus(*_args, **_kwargs):
     val = apply(windowsc.wxWindow_FindFocus,_args,_kwargs)
     if val: val = wxWindowPtr(val)