Some little tweaks and cleanups.

[wxWidgets.git] / wxPython / src / msw / misc2.py

diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py
index b83609248956b9c29c4e84a961d3c07f3a64ba93..3d7239666a5c968402df739ea32d645a312c0bb6 100644 (file)
--- a/wxPython/src/msw/misc2.py
+++ b/wxPython/src/msw/misc2.py
@@ -12,7 +12,22 @@ from clip_dnd import *
 from events import *
 
 from streams import *
-class wxToolTipPtr :
+
+from utils import *
+class wxSystemSettingsPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxSystemSettings instance at %s>" % (self.this,)
+class wxSystemSettings(wxSystemSettingsPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxToolTipPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -24,7 +39,6 @@ class wxToolTipPtr :
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = apply(misc2c.wxToolTip_GetWindow,(self,) + _args, _kwargs)
-        if val: val = wxWindowPtr(val) 
         return val
     def __repr__(self):
         return "<C wxToolTip instance at %s>" % (self.this,)
@@ -65,7 +79,6 @@ class wxCaretPtr :
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = apply(misc2c.wxCaret_GetWindow,(self,) + _args, _kwargs)
-        if val: val = wxWindowPtr(val) 
         return val
     def MoveXY(self, *_args, **_kwargs):
         val = apply(misc2c.wxCaret_MoveXY,(self,) + _args, _kwargs)
@@ -102,8 +115,8 @@ class wxFontEnumeratorPtr :
     def __del__(self,misc2c=misc2c):
         if self.thisown == 1 :
             misc2c.delete_wxFontEnumerator(self)
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(misc2c.wxFontEnumerator__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFontEnumerator__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def EnumerateFacenames(self, *_args, **_kwargs):
         val = apply(misc2c.wxFontEnumerator_EnumerateFacenames,(self,) + _args, _kwargs)
@@ -123,7 +136,7 @@ class wxFontEnumerator(wxFontEnumeratorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(misc2c.new_wxFontEnumerator,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxFontEnumerator)
+        self._setCallbackInfo(self, wxFontEnumerator, 0)
 
 
 
@@ -215,13 +228,16 @@ class wxPyTipProvider(wxPyTipProviderPtr):
 
 
 
-class wxDragImagePtr :
+class wxDragImagePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __del__(self,misc2c=misc2c):
         if self.thisown == 1 :
             misc2c.delete_wxDragImage(self)
+    def SetBackingBitmap(self, *_args, **_kwargs):
+        val = apply(misc2c.wxDragImage_SetBackingBitmap,(self,) + _args, _kwargs)
+        return val
     def BeginDrag(self, *_args, **_kwargs):
         val = apply(misc2c.wxDragImage_BeginDrag,(self,) + _args, _kwargs)
         return val
@@ -256,8 +272,28 @@ class wxDragImage(wxDragImagePtr):
 
 
 
+def wxDragIcon(*_args,**_kwargs):
+    val = wxDragImagePtr(apply(misc2c.new_wxDragIcon,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+def wxDragString(*_args,**_kwargs):
+    val = wxDragImagePtr(apply(misc2c.new_wxDragString,_args,_kwargs))
+    val.thisown = 1
+    return val
 
-class wxPyTimerPtr :
+def wxDragTreeItem(*_args,**_kwargs):
+    val = wxDragImagePtr(apply(misc2c.new_wxDragTreeItem,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+def wxDragListItem(*_args,**_kwargs):
+    val = wxDragImagePtr(apply(misc2c.new_wxDragListItem,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+
+class wxPyTimerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -292,6 +328,35 @@ class wxPyTimer(wxPyTimerPtr):
 
 
 
+class wxStopWatchPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,misc2c=misc2c):
+        if self.thisown == 1 :
+            misc2c.delete_wxStopWatch(self)
+    def Start(self, *_args, **_kwargs):
+        val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs)
+        return val
+    def Pause(self, *_args, **_kwargs):
+        val = apply(misc2c.wxStopWatch_Pause,(self,) + _args, _kwargs)
+        return val
+    def Resume(self, *_args, **_kwargs):
+        val = apply(misc2c.wxStopWatch_Resume,(self,) + _args, _kwargs)
+        return val
+    def Time(self, *_args, **_kwargs):
+        val = apply(misc2c.wxStopWatch_Time,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxStopWatch instance at %s>" % (self.this,)
+class wxStopWatch(wxStopWatchPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxStopWatch,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxLogPtr :
     def __init__(self,this):
         self.this = this
@@ -308,6 +373,9 @@ class wxLogPtr :
     def GetVerbose(self, *_args, **_kwargs):
         val = apply(misc2c.wxLog_GetVerbose,(self,) + _args, _kwargs)
         return val
+    def TimeStamp(self, *_args, **_kwargs):
+        val = apply(misc2c.wxLog_TimeStamp,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxLog instance at %s>" % (self.this,)
 class wxLog(wxLogPtr):
@@ -369,7 +437,6 @@ class wxLogWindowPtr(wxLogPtr):
         return val
     def GetFrame(self, *_args, **_kwargs):
         val = apply(misc2c.wxLogWindow_GetFrame,(self,) + _args, _kwargs)
-        if val: val = wxFramePtr(val) 
         return val
     def GetOldLog(self, *_args, **_kwargs):
         val = apply(misc2c.wxLogWindow_GetOldLog,(self,) + _args, _kwargs)
@@ -408,6 +475,54 @@ class wxLogNull(wxLogNullPtr):
 
 
 
+class wxLogChainPtr(wxLogPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetLog(self, *_args, **_kwargs):
+        val = apply(misc2c.wxLogChain_SetLog,(self,) + _args, _kwargs)
+        return val
+    def PassMessages(self, *_args, **_kwargs):
+        val = apply(misc2c.wxLogChain_PassMessages,(self,) + _args, _kwargs)
+        return val
+    def IsPassingMessages(self, *_args, **_kwargs):
+        val = apply(misc2c.wxLogChain_IsPassingMessages,(self,) + _args, _kwargs)
+        return val
+    def GetOldLog(self, *_args, **_kwargs):
+        val = apply(misc2c.wxLogChain_GetOldLog,(self,) + _args, _kwargs)
+        if val: val = wxLogPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxLogChain instance at %s>" % (self.this,)
+class wxLogChain(wxLogChainPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxLogChain,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxPyLogPtr(wxLogPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(misc2c.wxPyLog__setCallbackInfo,(self,) + _args, _kwargs)
+        return val
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(misc2c.wxPyLog_Destroy,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyLog instance at %s>" % (self.this,)
+class wxPyLog(wxPyLogPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxPyLog,_args,_kwargs)
+        self.thisown = 1
+        self._setCallbackInfo(self, wxPyLog)
+
+
+
+
 class wxProcessEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
@@ -449,8 +564,8 @@ class wxProcessPtr(wxEvtHandlerPtr):
     def Destroy(self, *_args, **_kwargs):
         val = apply(misc2c.wxProcess_Destroy,(self,) + _args, _kwargs)
         return val
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(misc2c.wxProcess__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(misc2c.wxProcess__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def base_OnTerminate(self, *_args, **_kwargs):
         val = apply(misc2c.wxProcess_base_OnTerminate,(self,) + _args, _kwargs)
@@ -483,15 +598,18 @@ class wxProcess(wxProcessPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(misc2c.new_wxProcess,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxProcess)
+        self._setCallbackInfo(self, wxProcess)
 
 
 
 
-class wxJoystickPtr :
+class wxJoystickPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def __del__(self,misc2c=misc2c):
+        if self.thisown == 1 :
+            misc2c.delete_wxJoystick(self)
     def GetPosition(self, *_args, **_kwargs):
         val = apply(misc2c.wxJoystick_GetPosition,(self,) + _args, _kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
@@ -629,12 +747,256 @@ class wxJoystick(wxJoystickPtr):
 
 
 
+class wxWavePtr(wxObjectPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,misc2c=misc2c):
+        if self.thisown == 1 :
+            misc2c.delete_wxWave(self)
+    def IsOk(self, *_args, **_kwargs):
+        val = apply(misc2c.wxWave_IsOk,(self,) + _args, _kwargs)
+        return val
+    def Play(self, *_args, **_kwargs):
+        val = apply(misc2c.wxWave_Play,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxWave instance at %s>" % (self.this,)
+class wxWave(wxWavePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxWave,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxFileTypeInfoPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def IsValid(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_IsValid,(self,) + _args, _kwargs)
+        return val
+    def SetIcon(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_SetIcon,(self,) + _args, _kwargs)
+        return val
+    def SetShortDesc(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_SetShortDesc,(self,) + _args, _kwargs)
+        return val
+    def GetMimeType(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_GetMimeType,(self,) + _args, _kwargs)
+        return val
+    def GetOpenCommand(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_GetOpenCommand,(self,) + _args, _kwargs)
+        return val
+    def GetPrintCommand(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_GetPrintCommand,(self,) + _args, _kwargs)
+        return val
+    def GetShortDesc(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_GetShortDesc,(self,) + _args, _kwargs)
+        return val
+    def GetDescription(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_GetDescription,(self,) + _args, _kwargs)
+        return val
+    def GetExtensions(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_GetExtensions,(self,) + _args, _kwargs)
+        return val
+    def GetExtensionsCount(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_GetExtensionsCount,(self,) + _args, _kwargs)
+        return val
+    def GetIconFile(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_GetIconFile,(self,) + _args, _kwargs)
+        return val
+    def GetIconIndex(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileTypeInfo_GetIconIndex,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxFileTypeInfo instance at %s>" % (self.this,)
+class wxFileTypeInfo(wxFileTypeInfoPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxFileTypeInfo,_args,_kwargs)
+        self.thisown = 1
+
+
+
+def wxFileTypeInfoSequence(*_args,**_kwargs):
+    val = wxFileTypeInfoPtr(apply(misc2c.new_wxFileTypeInfoSequence,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+def wxNullFileTypeInfo(*_args,**_kwargs):
+    val = wxFileTypeInfoPtr(apply(misc2c.new_wxNullFileTypeInfo,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+
+class wxFileTypePtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetMimeType(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_GetMimeType,(self,) + _args, _kwargs)
+        return val
+    def GetMimeTypes(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_GetMimeTypes,(self,) + _args, _kwargs)
+        return val
+    def GetExtensions(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_GetExtensions,(self,) + _args, _kwargs)
+        return val
+    def GetIcon(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_GetIcon,(self,) + _args, _kwargs)
+        if val: val = wxIconPtr(val) ; val.thisown = 1
+        return val
+    def GetIconInfo(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_GetIconInfo,(self,) + _args, _kwargs)
+        return val
+    def GetDescription(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_GetDescription,(self,) + _args, _kwargs)
+        return val
+    def GetOpenCommand(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_GetOpenCommand,(self,) + _args, _kwargs)
+        return val
+    def GetPrintCommand(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_GetPrintCommand,(self,) + _args, _kwargs)
+        return val
+    def GetAllCommands(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_GetAllCommands,(self,) + _args, _kwargs)
+        return val
+    def SetCommand(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_SetCommand,(self,) + _args, _kwargs)
+        return val
+    def SetDefaultIcon(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_SetDefaultIcon,(self,) + _args, _kwargs)
+        return val
+    def Unassociate(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileType_Unassociate,(self,) + _args, _kwargs)
+        return val
+    def __del__(self,misc2c=misc2c):
+        if self.thisown == 1 :
+            misc2c.delete_wxFileType(self)
+    def __repr__(self):
+        return "<C wxFileType instance at %s>" % (self.this,)
+class wxFileType(wxFileTypePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxFileType,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxMimeTypesManagerPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Initialize(self, *_args, **_kwargs):
+        val = apply(misc2c.wxMimeTypesManager_Initialize,(self,) + _args, _kwargs)
+        return val
+    def ClearData(self, *_args, **_kwargs):
+        val = apply(misc2c.wxMimeTypesManager_ClearData,(self,) + _args, _kwargs)
+        return val
+    def GetFileTypeFromExtension(self, *_args, **_kwargs):
+        val = apply(misc2c.wxMimeTypesManager_GetFileTypeFromExtension,(self,) + _args, _kwargs)
+        if val: val = wxFileTypePtr(val) ; val.thisown = 1
+        return val
+    def GetFileTypeFromMimeType(self, *_args, **_kwargs):
+        val = apply(misc2c.wxMimeTypesManager_GetFileTypeFromMimeType,(self,) + _args, _kwargs)
+        if val: val = wxFileTypePtr(val) ; val.thisown = 1
+        return val
+    def ReadMailcap(self, *_args, **_kwargs):
+        val = apply(misc2c.wxMimeTypesManager_ReadMailcap,(self,) + _args, _kwargs)
+        return val
+    def ReadMimeTypes(self, *_args, **_kwargs):
+        val = apply(misc2c.wxMimeTypesManager_ReadMimeTypes,(self,) + _args, _kwargs)
+        return val
+    def EnumAllFileTypes(self, *_args, **_kwargs):
+        val = apply(misc2c.wxMimeTypesManager_EnumAllFileTypes,(self,) + _args, _kwargs)
+        return val
+    def AddFallback(self, *_args, **_kwargs):
+        val = apply(misc2c.wxMimeTypesManager_AddFallback,(self,) + _args, _kwargs)
+        return val
+    def Associate(self, *_args, **_kwargs):
+        val = apply(misc2c.wxMimeTypesManager_Associate,(self,) + _args, _kwargs)
+        if val: val = wxFileTypePtr(val) ; val.thisown = 1
+        return val
+    def Unassociate(self, *_args, **_kwargs):
+        val = apply(misc2c.wxMimeTypesManager_Unassociate,(self,) + _args, _kwargs)
+        return val
+    def __del__(self,misc2c=misc2c):
+        if self.thisown == 1 :
+            misc2c.delete_wxMimeTypesManager(self)
+    def __repr__(self):
+        return "<C wxMimeTypesManager instance at %s>" % (self.this,)
+class wxMimeTypesManager(wxMimeTypesManagerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxMimeTypesManager,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxFileHistoryPtr(wxObjectPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,misc2c=misc2c):
+        if self.thisown == 1 :
+            misc2c.delete_wxFileHistory(self)
+    def AddFileToHistory(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_AddFileToHistory,(self,) + _args, _kwargs)
+        return val
+    def RemoveFileFromHistory(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_RemoveFileFromHistory,(self,) + _args, _kwargs)
+        return val
+    def GetMaxFiles(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_GetMaxFiles,(self,) + _args, _kwargs)
+        return val
+    def UseMenu(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_UseMenu,(self,) + _args, _kwargs)
+        return val
+    def RemoveMenu(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_RemoveMenu,(self,) + _args, _kwargs)
+        return val
+    def Load(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_Load,(self,) + _args, _kwargs)
+        return val
+    def Save(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_Save,(self,) + _args, _kwargs)
+        return val
+    def AddFilesToMenu(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_AddFilesToMenu,(self,) + _args, _kwargs)
+        return val
+    def AddFilesToSingleMenu(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_AddFilesToSingleMenu,(self,) + _args, _kwargs)
+        return val
+    def GetHistoryFile(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_GetHistoryFile,(self,) + _args, _kwargs)
+        return val
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_GetCount,(self,) + _args, _kwargs)
+        return val
+    def GetNoHistoryFiles(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_GetNoHistoryFiles,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxFileHistory instance at %s>" % (self.this,)
+class wxFileHistory(wxFileHistoryPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxFileHistory,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 wxFileSelector = misc2c.wxFileSelector
 
+wxLoadFileSelector = misc2c.wxLoadFileSelector
+
+wxSaveFileSelector = misc2c.wxSaveFileSelector
+
 wxGetTextFromUser = misc2c.wxGetTextFromUser
 
 wxGetPasswordFromUser = misc2c.wxGetPasswordFromUser
@@ -667,25 +1029,41 @@ def wxGetDisplaySizeMM(*_args, **_kwargs):
     if val: val = wxSizePtr(val); val.thisown = 1
     return val
 
+wxClientDisplayRect = misc2c.wxClientDisplayRect
+
+def wxGetClientDisplayRect(*_args, **_kwargs):
+    val = apply(misc2c.wxGetClientDisplayRect,_args,_kwargs)
+    if val: val = wxRectPtr(val); val.thisown = 1
+    return val
+
 wxSetCursor = misc2c.wxSetCursor
 
 def wxFindWindowByLabel(*_args, **_kwargs):
     val = apply(misc2c.wxFindWindowByLabel,_args,_kwargs)
-    if val: val = wxWindowPtr(val)
     return val
 
 def wxFindWindowByName(*_args, **_kwargs):
     val = apply(misc2c.wxFindWindowByName,_args,_kwargs)
-    if val: val = wxWindowPtr(val)
     return val
 
 wxBeginBusyCursor = misc2c.wxBeginBusyCursor
 
 def wxGetActiveWindow(*_args, **_kwargs):
     val = apply(misc2c.wxGetActiveWindow,_args,_kwargs)
-    if val: val = wxWindowPtr(val)
     return val
 
+def wxGenericFindWindowAtPoint(*_args, **_kwargs):
+    val = apply(misc2c.wxGenericFindWindowAtPoint,_args,_kwargs)
+    return val
+
+def wxFindWindowAtPoint(*_args, **_kwargs):
+    val = apply(misc2c.wxFindWindowAtPoint,_args,_kwargs)
+    return val
+
+wxCheckForInterrupt = misc2c.wxCheckForInterrupt
+
+wxFlushEvents = misc2c.wxFlushEvents
+
 wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
 
 wxResourceClear = misc2c.wxResourceClear
@@ -702,7 +1080,6 @@ def wxResourceCreateIcon(*_args, **_kwargs):
 
 def wxResourceCreateMenuBar(*_args, **_kwargs):
     val = apply(misc2c.wxResourceCreateMenuBar,_args,_kwargs)
-    if val: val = wxMenuBarPtr(val)
     return val
 
 wxResourceGetIdentifier = misc2c.wxResourceGetIdentifier
@@ -713,22 +1090,6 @@ wxResourceParseFile = misc2c.wxResourceParseFile
 
 wxResourceParseString = misc2c.wxResourceParseString
 
-def wxSystemSettings_GetSystemColour(*_args, **_kwargs):
-    val = apply(misc2c.wxSystemSettings_GetSystemColour,_args,_kwargs)
-    if val: val = wxColourPtr(val); val.thisown = 1
-    return val
-
-def wxSystemSettings_GetSystemFont(*_args, **_kwargs):
-    val = apply(misc2c.wxSystemSettings_GetSystemFont,_args,_kwargs)
-    if val: val = wxFontPtr(val); val.thisown = 1
-    return val
-
-wxSystemSettings_GetSystemMetric = misc2c.wxSystemSettings_GetSystemMetric
-
-wxToolTip_Enable = misc2c.wxToolTip_Enable
-
-wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay
-
 wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime
 
 wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime
@@ -754,26 +1115,6 @@ def wxCreateFileTipProvider(*_args, **_kwargs):
     if val: val = wxTipProviderPtr(val); val.thisown = 1
     return val
 
-def wxDragIcon(*_args, **_kwargs):
-    val = apply(misc2c.wxDragIcon,_args,_kwargs)
-    if val: val = wxDragImagePtr(val); val.thisown = 1
-    return val
-
-def wxDragString(*_args, **_kwargs):
-    val = apply(misc2c.wxDragString,_args,_kwargs)
-    if val: val = wxDragImagePtr(val); val.thisown = 1
-    return val
-
-def wxDragTreeItem(*_args, **_kwargs):
-    val = apply(misc2c.wxDragTreeItem,_args,_kwargs)
-    if val: val = wxDragImagePtr(val); val.thisown = 1
-    return val
-
-def wxDragListItem(*_args, **_kwargs):
-    val = apply(misc2c.wxDragListItem,_args,_kwargs)
-    if val: val = wxDragImagePtr(val); val.thisown = 1
-    return val
-
 wxSysErrorCode = misc2c.wxSysErrorCode
 
 wxSysErrorMsg = misc2c.wxSysErrorMsg
@@ -798,6 +1139,29 @@ wxLogSysError = misc2c.wxLogSysError
 
 wxExecute = misc2c.wxExecute
 
+def wxWaveData(*_args, **_kwargs):
+    val = apply(misc2c.wxWaveData,_args,_kwargs)
+    if val: val = wxWavePtr(val); val.thisown = 1
+    return val
+
+def wxSystemSettings_GetColour(*_args, **_kwargs):
+    val = apply(misc2c.wxSystemSettings_GetColour,_args,_kwargs)
+    if val: val = wxColourPtr(val); val.thisown = 1
+    return val
+
+def wxSystemSettings_GetFont(*_args, **_kwargs):
+    val = apply(misc2c.wxSystemSettings_GetFont,_args,_kwargs)
+    if val: val = wxFontPtr(val); val.thisown = 1
+    return val
+
+wxSystemSettings_GetMetric = misc2c.wxSystemSettings_GetMetric
+
+wxSystemSettings_HasFeature = misc2c.wxSystemSettings_HasFeature
+
+wxToolTip_Enable = misc2c.wxToolTip_Enable
+
+wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay
+
 wxLog_IsEnabled = misc2c.wxLog_IsEnabled
 
 wxLog_EnableLogging = misc2c.wxLog_EnableLogging
@@ -828,24 +1192,24 @@ wxLog_AddTraceMask = misc2c.wxLog_AddTraceMask
 
 wxLog_RemoveTraceMask = misc2c.wxLog_RemoveTraceMask
 
+wxLog_ClearTraceMasks = misc2c.wxLog_ClearTraceMasks
+
+wxLog_SetTimestamp = misc2c.wxLog_SetTimestamp
+
+wxLog_GetTimestamp = misc2c.wxLog_GetTimestamp
+
 wxLog_GetTraceMask = misc2c.wxLog_GetTraceMask
 
 wxLog_IsAllowedTraceMask = misc2c.wxLog_IsAllowedTraceMask
 
+wxFileType_ExpandCommand = misc2c.wxFileType_ExpandCommand
+
+wxMimeTypesManager_IsOfType = misc2c.wxMimeTypesManager_IsOfType
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
-wxSYS_WHITE_BRUSH = misc2c.wxSYS_WHITE_BRUSH
-wxSYS_LTGRAY_BRUSH = misc2c.wxSYS_LTGRAY_BRUSH
-wxSYS_GRAY_BRUSH = misc2c.wxSYS_GRAY_BRUSH
-wxSYS_DKGRAY_BRUSH = misc2c.wxSYS_DKGRAY_BRUSH
-wxSYS_BLACK_BRUSH = misc2c.wxSYS_BLACK_BRUSH
-wxSYS_NULL_BRUSH = misc2c.wxSYS_NULL_BRUSH
-wxSYS_HOLLOW_BRUSH = misc2c.wxSYS_HOLLOW_BRUSH
-wxSYS_WHITE_PEN = misc2c.wxSYS_WHITE_PEN
-wxSYS_BLACK_PEN = misc2c.wxSYS_BLACK_PEN
-wxSYS_NULL_PEN = misc2c.wxSYS_NULL_PEN
 wxSYS_OEM_FIXED_FONT = misc2c.wxSYS_OEM_FIXED_FONT
 wxSYS_ANSI_FIXED_FONT = misc2c.wxSYS_ANSI_FIXED_FONT
 wxSYS_ANSI_VAR_FONT = misc2c.wxSYS_ANSI_VAR_FONT
@@ -856,6 +1220,7 @@ wxSYS_SYSTEM_FIXED_FONT = misc2c.wxSYS_SYSTEM_FIXED_FONT
 wxSYS_DEFAULT_GUI_FONT = misc2c.wxSYS_DEFAULT_GUI_FONT
 wxSYS_COLOUR_SCROLLBAR = misc2c.wxSYS_COLOUR_SCROLLBAR
 wxSYS_COLOUR_BACKGROUND = misc2c.wxSYS_COLOUR_BACKGROUND
+wxSYS_COLOUR_DESKTOP = misc2c.wxSYS_COLOUR_DESKTOP
 wxSYS_COLOUR_ACTIVECAPTION = misc2c.wxSYS_COLOUR_ACTIVECAPTION
 wxSYS_COLOUR_INACTIVECAPTION = misc2c.wxSYS_COLOUR_INACTIVECAPTION
 wxSYS_COLOUR_MENU = misc2c.wxSYS_COLOUR_MENU
@@ -870,21 +1235,27 @@ wxSYS_COLOUR_APPWORKSPACE = misc2c.wxSYS_COLOUR_APPWORKSPACE
 wxSYS_COLOUR_HIGHLIGHT = misc2c.wxSYS_COLOUR_HIGHLIGHT
 wxSYS_COLOUR_HIGHLIGHTTEXT = misc2c.wxSYS_COLOUR_HIGHLIGHTTEXT
 wxSYS_COLOUR_BTNFACE = misc2c.wxSYS_COLOUR_BTNFACE
+wxSYS_COLOUR_3DFACE = misc2c.wxSYS_COLOUR_3DFACE
 wxSYS_COLOUR_BTNSHADOW = misc2c.wxSYS_COLOUR_BTNSHADOW
+wxSYS_COLOUR_3DSHADOW = misc2c.wxSYS_COLOUR_3DSHADOW
 wxSYS_COLOUR_GRAYTEXT = misc2c.wxSYS_COLOUR_GRAYTEXT
 wxSYS_COLOUR_BTNTEXT = misc2c.wxSYS_COLOUR_BTNTEXT
 wxSYS_COLOUR_INACTIVECAPTIONTEXT = misc2c.wxSYS_COLOUR_INACTIVECAPTIONTEXT
 wxSYS_COLOUR_BTNHIGHLIGHT = misc2c.wxSYS_COLOUR_BTNHIGHLIGHT
+wxSYS_COLOUR_BTNHILIGHT = misc2c.wxSYS_COLOUR_BTNHILIGHT
+wxSYS_COLOUR_3DHIGHLIGHT = misc2c.wxSYS_COLOUR_3DHIGHLIGHT
+wxSYS_COLOUR_3DHILIGHT = misc2c.wxSYS_COLOUR_3DHILIGHT
 wxSYS_COLOUR_3DDKSHADOW = misc2c.wxSYS_COLOUR_3DDKSHADOW
 wxSYS_COLOUR_3DLIGHT = misc2c.wxSYS_COLOUR_3DLIGHT
 wxSYS_COLOUR_INFOTEXT = misc2c.wxSYS_COLOUR_INFOTEXT
 wxSYS_COLOUR_INFOBK = misc2c.wxSYS_COLOUR_INFOBK
-wxSYS_COLOUR_DESKTOP = misc2c.wxSYS_COLOUR_DESKTOP
-wxSYS_COLOUR_3DFACE = misc2c.wxSYS_COLOUR_3DFACE
-wxSYS_COLOUR_3DSHADOW = misc2c.wxSYS_COLOUR_3DSHADOW
-wxSYS_COLOUR_3DHIGHLIGHT = misc2c.wxSYS_COLOUR_3DHIGHLIGHT
-wxSYS_COLOUR_3DHILIGHT = misc2c.wxSYS_COLOUR_3DHILIGHT
-wxSYS_COLOUR_BTNHILIGHT = misc2c.wxSYS_COLOUR_BTNHILIGHT
+wxSYS_COLOUR_LISTBOX = misc2c.wxSYS_COLOUR_LISTBOX
+wxSYS_COLOUR_HOTLIGHT = misc2c.wxSYS_COLOUR_HOTLIGHT
+wxSYS_COLOUR_GRADIENTACTIVECAPTION = misc2c.wxSYS_COLOUR_GRADIENTACTIVECAPTION
+wxSYS_COLOUR_GRADIENTINACTIVECAPTION = misc2c.wxSYS_COLOUR_GRADIENTINACTIVECAPTION
+wxSYS_COLOUR_MENUHILIGHT = misc2c.wxSYS_COLOUR_MENUHILIGHT
+wxSYS_COLOUR_MENUBAR = misc2c.wxSYS_COLOUR_MENUBAR
+wxSYS_COLOUR_MAX = misc2c.wxSYS_COLOUR_MAX
 wxSYS_MOUSE_BUTTONS = misc2c.wxSYS_MOUSE_BUTTONS
 wxSYS_BORDER_X = misc2c.wxSYS_BORDER_X
 wxSYS_BORDER_Y = misc2c.wxSYS_BORDER_Y
@@ -922,6 +1293,8 @@ wxSYS_NETWORK_PRESENT = misc2c.wxSYS_NETWORK_PRESENT
 wxSYS_PENWINDOWS_PRESENT = misc2c.wxSYS_PENWINDOWS_PRESENT
 wxSYS_SHOW_SOUNDS = misc2c.wxSYS_SHOW_SOUNDS
 wxSYS_SWAP_BUTTONS = misc2c.wxSYS_SWAP_BUTTONS
+wxSYS_CAN_DRAW_FRAME_DECORATIONS = misc2c.wxSYS_CAN_DRAW_FRAME_DECORATIONS
+wxSYS_CAN_ICONIZE_FRAME = misc2c.wxSYS_CAN_ICONIZE_FRAME
 wxLOG_FatalError = misc2c.wxLOG_FatalError
 wxLOG_Error = misc2c.wxLOG_Error
 wxLOG_Warning = misc2c.wxLOG_Warning
@@ -933,3 +1306,10 @@ wxLOG_Trace = misc2c.wxLOG_Trace
 wxLOG_Progress = misc2c.wxLOG_Progress
 wxLOG_User = misc2c.wxLOG_User
 wxEVT_END_PROCESS = misc2c.wxEVT_END_PROCESS
+wxMAILCAP_STANDARD = misc2c.wxMAILCAP_STANDARD
+wxMAILCAP_NETSCAPE = misc2c.wxMAILCAP_NETSCAPE
+wxMAILCAP_KDE = misc2c.wxMAILCAP_KDE
+wxMAILCAP_GNOME = misc2c.wxMAILCAP_GNOME
+wxMAILCAP_ALL = misc2c.wxMAILCAP_ALL
+cvar = misc2c.cvar
+wxTheMimeTypesManager = wxMimeTypesManagerPtr(misc2c.cvar.wxTheMimeTypesManager)