]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/gtk/misc2.py
Calling a virtual function from a destructor is not good:
[wxWidgets.git] / wxPython / src / gtk / misc2.py
index e283381decaaef370e30f56689d26eff088fac23..0780c1886a0d9b00c2a7681ad7f9355585fe2306 100644 (file)
@@ -16,6 +16,48 @@ from events import *
 from streams import *
 
 from utils import *
+
+# Art clients
+wxART_TOOLBAR              = 'wxART_TOOLBAR_C'
+wxART_MENU                 = 'wxART_MENU_C'
+wxART_FRAME_ICON           = 'wxART_FRAME_ICON_C'
+wxART_CMN_DIALOG           = 'wxART_CMN_DIALOG_C'
+wxART_HELP_BROWSER         = 'wxART_HELP_BROWSER_C'
+wxART_MESSAGE_BOX          = 'wxART_MESSAGE_BOX_C'
+wxART_OTHER                = 'wxART_OTHER_C'
+
+# Art IDs
+wxART_ADD_BOOKMARK         = 'wxART_ADD_BOOKMARK'
+wxART_DEL_BOOKMARK         = 'wxART_DEL_BOOKMARK'
+wxART_HELP_SIDE_PANEL      = 'wxART_HELP_SIDE_PANEL'
+wxART_HELP_SETTINGS        = 'wxART_HELP_SETTINGS'
+wxART_HELP_BOOK            = 'wxART_HELP_BOOK'
+wxART_HELP_FOLDER          = 'wxART_HELP_FOLDER'
+wxART_HELP_PAGE            = 'wxART_HELP_PAGE'
+wxART_GO_BACK              = 'wxART_GO_BACK'
+wxART_GO_FORWARD           = 'wxART_GO_FORWARD'
+wxART_GO_UP                = 'wxART_GO_UP'
+wxART_GO_DOWN              = 'wxART_GO_DOWN'
+wxART_GO_TO_PARENT         = 'wxART_GO_TO_PARENT'
+wxART_GO_HOME              = 'wxART_GO_HOME'
+wxART_FILE_OPEN            = 'wxART_FILE_OPEN'
+wxART_PRINT                = 'wxART_PRINT'
+wxART_HELP                 = 'wxART_HELP'
+wxART_TIP                  = 'wxART_TIP'
+wxART_REPORT_VIEW          = 'wxART_REPORT_VIEW'
+wxART_LIST_VIEW            = 'wxART_LIST_VIEW'
+wxART_NEW_DIR              = 'wxART_NEW_DIR'
+wxART_FOLDER               = 'wxART_FOLDER'
+wxART_GO_DIR_UP            = 'wxART_GO_DIR_UP'
+wxART_EXECUTABLE_FILE      = 'wxART_EXECUTABLE_FILE'
+wxART_NORMAL_FILE          = 'wxART_NORMAL_FILE'
+wxART_TICK_MARK            = 'wxART_TICK_MARK'
+wxART_CROSS_MARK           = 'wxART_CROSS_MARK'
+wxART_ERROR                = 'wxART_ERROR'
+wxART_QUESTION             = 'wxART_QUESTION'
+wxART_WARNING              = 'wxART_WARNING'
+wxART_INFORMATION          = 'wxART_INFORMATION'
+
 class wxSystemSettingsPtr :
     def __init__(self,this):
         self.this = this
@@ -56,9 +98,12 @@ class wxCaretPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxCaret(self)
+    def __del__(self, delfunc=misc2c.delete_wxCaret):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def IsOk(self, *_args, **_kwargs):
         val = apply(misc2c.wxCaret_IsOk,(self,) + _args, _kwargs)
         return val
@@ -114,9 +159,12 @@ class wxBusyCursorPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxBusyCursor(self)
+    def __del__(self, delfunc=misc2c.delete_wxBusyCursor):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxBusyCursor instance at %s>" % (self.this,)
 class wxBusyCursor(wxBusyCursorPtr):
@@ -131,9 +179,12 @@ class wxWindowDisablerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxWindowDisabler(self)
+    def __del__(self, delfunc=misc2c.delete_wxWindowDisabler):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxWindowDisabler instance at %s>" % (self.this,)
 class wxWindowDisabler(wxWindowDisablerPtr):
@@ -148,9 +199,12 @@ class wxMutexGuiLockerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxMutexGuiLocker(self)
+    def __del__(self, delfunc=misc2c.delete_wxMutexGuiLocker):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxMutexGuiLocker instance at %s>" % (self.this,)
 class wxMutexGuiLocker(wxMutexGuiLockerPtr):
@@ -165,15 +219,21 @@ class wxTipProviderPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxTipProvider(self)
+    def __del__(self, delfunc=misc2c.delete_wxTipProvider):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetTip(self, *_args, **_kwargs):
         val = apply(misc2c.wxTipProvider_GetTip,(self,) + _args, _kwargs)
         return val
     def GetCurrentTip(self, *_args, **_kwargs):
         val = apply(misc2c.wxTipProvider_GetCurrentTip,(self,) + _args, _kwargs)
         return val
+    def PreprocessTip(self, *_args, **_kwargs):
+        val = apply(misc2c.wxTipProvider_PreprocessTip,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxTipProvider instance at %s>" % (self.this,)
 class wxTipProvider(wxTipProviderPtr):
@@ -187,12 +247,16 @@ class wxPyTipProviderPtr(wxTipProviderPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(misc2c.wxPyTipProvider__setCallbackInfo,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxPyTipProvider instance at %s>" % (self.this,)
 class wxPyTipProvider(wxPyTipProviderPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(misc2c.new_wxPyTipProvider,_args,_kwargs)
         self.thisown = 1
+        self._setCallbackInfo(self, wxPyTipProvider)
 
 
 
@@ -201,17 +265,20 @@ 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 __del__(self, delfunc=misc2c.delete_wxDragImage):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     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
-    def BeginDrag2(self, *_args, **_kwargs):
-        val = apply(misc2c.wxDragImage_BeginDrag2,(self,) + _args, _kwargs)
+    def BeginDragBounded(self, *_args, **_kwargs):
+        val = apply(misc2c.wxDragImage_BeginDragBounded,(self,) + _args, _kwargs)
         return val
     def EndDrag(self, *_args, **_kwargs):
         val = apply(misc2c.wxDragImage_EndDrag,(self,) + _args, _kwargs)
@@ -234,6 +301,7 @@ class wxDragImagePtr(wxObjectPtr):
         return val
     def __repr__(self):
         return "<C wxDragImage instance at %s>" % (self.this,)
+    BeginDrag2 = BeginDragBounded
 class wxDragImage(wxDragImagePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(misc2c.new_wxDragImage,_args,_kwargs)
@@ -266,9 +334,12 @@ class wxPyTimerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxPyTimer(self)
+    def __del__(self, delfunc=misc2c.delete_wxPyTimer):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetInterval(self, *_args, **_kwargs):
         val = apply(misc2c.wxPyTimer_GetInterval,(self,) + _args, _kwargs)
         return val
@@ -301,9 +372,12 @@ 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 __del__(self, delfunc=misc2c.delete_wxStopWatch):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def Start(self, *_args, **_kwargs):
         val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs)
         return val
@@ -455,9 +529,12 @@ class wxLogNullPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxLogNull(self)
+    def __del__(self, delfunc=misc2c.delete_wxLogNull):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxLogNull instance at %s>" % (self.this,)
 class wxLogNull(wxLogNullPtr):
@@ -558,6 +635,15 @@ class wxProcessPtr(wxEvtHandlerPtr):
     def CloseOutput(self, *_args, **_kwargs):
         val = apply(misc2c.wxProcess_CloseOutput,(self,) + _args, _kwargs)
         return val
+    def IsInputOpened(self, *_args, **_kwargs):
+        val = apply(misc2c.wxProcess_IsInputOpened,(self,) + _args, _kwargs)
+        return val
+    def IsInputAvailable(self, *_args, **_kwargs):
+        val = apply(misc2c.wxProcess_IsInputAvailable,(self,) + _args, _kwargs)
+        return val
+    def IsErrorAvailable(self, *_args, **_kwargs):
+        val = apply(misc2c.wxProcess_IsErrorAvailable,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxProcess instance at %s>" % (self.this,)
 class wxProcess(wxProcessPtr):
@@ -573,9 +659,12 @@ 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 __del__(self, delfunc=misc2c.delete_wxJoystick):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetPosition(self, *_args, **_kwargs):
         val = apply(misc2c.wxJoystick_GetPosition,(self,) + _args, _kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
@@ -717,9 +806,12 @@ 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 __del__(self, delfunc=misc2c.delete_wxWave):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def IsOk(self, *_args, **_kwargs):
         val = apply(misc2c.wxWave_IsOk,(self,) + _args, _kwargs)
         return val
@@ -837,9 +929,12 @@ class wxFileTypePtr :
     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 __del__(self, delfunc=misc2c.delete_wxFileType):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxFileType instance at %s>" % (self.this,)
 class wxFileType(wxFileTypePtr):
@@ -887,9 +982,12 @@ class wxMimeTypesManagerPtr :
     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 __del__(self, delfunc=misc2c.delete_wxMimeTypesManager):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxMimeTypesManager instance at %s>" % (self.this,)
 class wxMimeTypesManager(wxMimeTypesManagerPtr):
@@ -922,9 +1020,12 @@ 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 __del__(self, delfunc=misc2c.delete_wxFileHistory):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def AddFileToHistory(self, *_args, **_kwargs):
         val = apply(misc2c.wxFileHistory_AddFileToHistory,(self,) + _args, _kwargs)
         return val
@@ -971,6 +1072,95 @@ class wxFileHistory(wxFileHistoryPtr):
 
 
 
+class wxEffectsPtr(wxObjectPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetHighlightColour(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_GetHighlightColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def GetLightShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_GetLightShadow,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def GetFaceColour(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_GetFaceColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def GetMediumShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_GetMediumShadow,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def GetDarkShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_GetDarkShadow,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def SetHighlightColour(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_SetHighlightColour,(self,) + _args, _kwargs)
+        return val
+    def SetLightShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_SetLightShadow,(self,) + _args, _kwargs)
+        return val
+    def SetFaceColour(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_SetFaceColour,(self,) + _args, _kwargs)
+        return val
+    def SetMediumShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_SetMediumShadow,(self,) + _args, _kwargs)
+        return val
+    def SetDarkShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_SetDarkShadow,(self,) + _args, _kwargs)
+        return val
+    def Set(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_Set,(self,) + _args, _kwargs)
+        return val
+    def DrawSunkenEdge(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_DrawSunkenEdge,(self,) + _args, _kwargs)
+        return val
+    def TileBitmap(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_TileBitmap,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxEffects instance at %s>" % (self.this,)
+class wxEffects(wxEffectsPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxEffects,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxSingleInstanceCheckerPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self, delfunc=misc2c.delete_wxSingleInstanceChecker):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
+    def Create(self, *_args, **_kwargs):
+        val = apply(misc2c.wxSingleInstanceChecker_Create,(self,) + _args, _kwargs)
+        return val
+    def IsAnotherRunning(self, *_args, **_kwargs):
+        val = apply(misc2c.wxSingleInstanceChecker_IsAnotherRunning,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxSingleInstanceChecker instance at %s>" % (self.this,)
+class wxSingleInstanceChecker(wxSingleInstanceCheckerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxSingleInstanceChecker,_args,_kwargs)
+        self.thisown = 1
+
+
+
+def wxPreSingleInstanceChecker(*_args,**_kwargs):
+    val = wxSingleInstanceCheckerPtr(apply(misc2c.new_wxPreSingleInstanceChecker,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------
@@ -1042,32 +1232,6 @@ def wxGetTopLevelParent(*_args, **_kwargs):
     val = apply(misc2c.wxGetTopLevelParent,_args,_kwargs)
     return val
 
-wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
-
-wxResourceClear = misc2c.wxResourceClear
-
-def wxResourceCreateBitmap(*_args, **_kwargs):
-    val = apply(misc2c.wxResourceCreateBitmap,_args,_kwargs)
-    if val: val = wxBitmapPtr(val); val.thisown = 1
-    return val
-
-def wxResourceCreateIcon(*_args, **_kwargs):
-    val = apply(misc2c.wxResourceCreateIcon,_args,_kwargs)
-    if val: val = wxIconPtr(val); val.thisown = 1
-    return val
-
-def wxResourceCreateMenuBar(*_args, **_kwargs):
-    val = apply(misc2c.wxResourceCreateMenuBar,_args,_kwargs)
-    return val
-
-wxResourceGetIdentifier = misc2c.wxResourceGetIdentifier
-
-wxResourceParseData = misc2c.wxResourceParseData
-
-wxResourceParseFile = misc2c.wxResourceParseFile
-
-wxResourceParseString = misc2c.wxResourceParseString
-
 wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime
 
 wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime
@@ -1105,6 +1269,8 @@ wxLogMessage = misc2c.wxLogMessage
 
 wxLogInfo = misc2c.wxLogInfo
 
+wxLogDebug = misc2c.wxLogDebug
+
 wxLogVerbose = misc2c.wxLogVerbose
 
 wxLogStatus = misc2c.wxLogStatus
@@ -1184,6 +1350,8 @@ wxLog_RemoveTraceMask = misc2c.wxLog_RemoveTraceMask
 
 wxLog_ClearTraceMasks = misc2c.wxLog_ClearTraceMasks
 
+wxLog_GetTraceMasks = misc2c.wxLog_GetTraceMasks
+
 wxLog_SetTimestamp = misc2c.wxLog_SetTimestamp
 
 wxLog_GetTimestamp = misc2c.wxLog_GetTimestamp
@@ -1192,6 +1360,19 @@ wxLog_GetTraceMask = misc2c.wxLog_GetTraceMask
 
 wxLog_IsAllowedTraceMask = misc2c.wxLog_IsAllowedTraceMask
 
+wxLog_SetLogLevel = misc2c.wxLog_SetLogLevel
+
+wxLog_GetLogLevel = misc2c.wxLog_GetLogLevel
+
+wxProcess_Kill = misc2c.wxProcess_Kill
+
+wxProcess_Exists = misc2c.wxProcess_Exists
+
+def wxProcess_Open(*_args, **_kwargs):
+    val = apply(misc2c.wxProcess_Open,_args,_kwargs)
+    if val: val = wxProcessPtr(val)
+    return val
+
 wxFileType_ExpandCommand = misc2c.wxFileType_ExpandCommand
 
 wxMimeTypesManager_IsOfType = misc2c.wxMimeTypesManager_IsOfType
@@ -1212,8 +1393,6 @@ def wxArtProvider_GetIcon(*_args, **_kwargs):
     if val: val = wxIconPtr(val); val.thisown = 1
     return val
 
-wxArtProvider_CleanUpProviders = misc2c.wxArtProvider_CleanUpProviders
-
 
 
 #-------------- VARIABLE WRAPPERS ------------------
@@ -1326,11 +1505,40 @@ wxTraceMemAlloc = misc2c.wxTraceMemAlloc
 wxTraceMessages = misc2c.wxTraceMessages
 wxTraceResAlloc = misc2c.wxTraceResAlloc
 wxTraceRefCount = misc2c.wxTraceRefCount
+wxKILL_OK = misc2c.wxKILL_OK
+wxKILL_BAD_SIGNAL = misc2c.wxKILL_BAD_SIGNAL
+wxKILL_ACCESS_DENIED = misc2c.wxKILL_ACCESS_DENIED
+wxKILL_NO_PROCESS = misc2c.wxKILL_NO_PROCESS
+wxKILL_ERROR = misc2c.wxKILL_ERROR
+wxSIGNONE = misc2c.wxSIGNONE
+wxSIGHUP = misc2c.wxSIGHUP
+wxSIGINT = misc2c.wxSIGINT
+wxSIGQUIT = misc2c.wxSIGQUIT
+wxSIGILL = misc2c.wxSIGILL
+wxSIGTRAP = misc2c.wxSIGTRAP
+wxSIGABRT = misc2c.wxSIGABRT
+wxSIGIOT = misc2c.wxSIGIOT
+wxSIGEMT = misc2c.wxSIGEMT
+wxSIGFPE = misc2c.wxSIGFPE
+wxSIGKILL = misc2c.wxSIGKILL
+wxSIGBUS = misc2c.wxSIGBUS
+wxSIGSEGV = misc2c.wxSIGSEGV
+wxSIGSYS = misc2c.wxSIGSYS
+wxSIGPIPE = misc2c.wxSIGPIPE
+wxSIGALRM = misc2c.wxSIGALRM
+wxSIGTERM = misc2c.wxSIGTERM
 wxEVT_END_PROCESS = misc2c.wxEVT_END_PROCESS
 wxEXEC_ASYNC = misc2c.wxEXEC_ASYNC
 wxEXEC_SYNC = misc2c.wxEXEC_SYNC
 wxEXEC_NOHIDE = misc2c.wxEXEC_NOHIDE
 wxEXEC_MAKE_GROUP_LEADER = misc2c.wxEXEC_MAKE_GROUP_LEADER
+wxJOYSTICK1 = misc2c.wxJOYSTICK1
+wxJOYSTICK2 = misc2c.wxJOYSTICK2
+wxJOY_BUTTON_ANY = misc2c.wxJOY_BUTTON_ANY
+wxJOY_BUTTON1 = misc2c.wxJOY_BUTTON1
+wxJOY_BUTTON2 = misc2c.wxJOY_BUTTON2
+wxJOY_BUTTON3 = misc2c.wxJOY_BUTTON3
+wxJOY_BUTTON4 = misc2c.wxJOY_BUTTON4
 wxMAILCAP_STANDARD = misc2c.wxMAILCAP_STANDARD
 wxMAILCAP_NETSCAPE = misc2c.wxMAILCAP_NETSCAPE
 wxMAILCAP_KDE = misc2c.wxMAILCAP_KDE
@@ -1338,40 +1546,3 @@ wxMAILCAP_GNOME = misc2c.wxMAILCAP_GNOME
 wxMAILCAP_ALL = misc2c.wxMAILCAP_ALL
 cvar = misc2c.cvar
 wxTheMimeTypesManager = wxMimeTypesManagerPtr(misc2c.cvar.wxTheMimeTypesManager)
-wxART_TOOLBAR = misc2c.wxART_TOOLBAR
-wxART_MENU = misc2c.wxART_MENU
-wxART_FRAME_ICON = misc2c.wxART_FRAME_ICON
-wxART_CMN_DIALOG = misc2c.wxART_CMN_DIALOG
-wxART_HELP_BROWSER = misc2c.wxART_HELP_BROWSER
-wxART_MESSAGE_BOX = misc2c.wxART_MESSAGE_BOX
-wxART_OTHER = misc2c.wxART_OTHER
-wxART_ADD_BOOKMARK = misc2c.wxART_ADD_BOOKMARK
-wxART_DEL_BOOKMARK = misc2c.wxART_DEL_BOOKMARK
-wxART_HELP_SIDE_PANEL = misc2c.wxART_HELP_SIDE_PANEL
-wxART_HELP_SETTINGS = misc2c.wxART_HELP_SETTINGS
-wxART_HELP_BOOK = misc2c.wxART_HELP_BOOK
-wxART_HELP_FOLDER = misc2c.wxART_HELP_FOLDER
-wxART_HELP_PAGE = misc2c.wxART_HELP_PAGE
-wxART_GO_BACK = misc2c.wxART_GO_BACK
-wxART_GO_FORWARD = misc2c.wxART_GO_FORWARD
-wxART_GO_UP = misc2c.wxART_GO_UP
-wxART_GO_DOWN = misc2c.wxART_GO_DOWN
-wxART_GO_TO_PARENT = misc2c.wxART_GO_TO_PARENT
-wxART_GO_HOME = misc2c.wxART_GO_HOME
-wxART_FILE_OPEN = misc2c.wxART_FILE_OPEN
-wxART_PRINT = misc2c.wxART_PRINT
-wxART_HELP = misc2c.wxART_HELP
-wxART_TIP = misc2c.wxART_TIP
-wxART_REPORT_VIEW = misc2c.wxART_REPORT_VIEW
-wxART_LIST_VIEW = misc2c.wxART_LIST_VIEW
-wxART_NEW_DIR = misc2c.wxART_NEW_DIR
-wxART_FOLDER = misc2c.wxART_FOLDER
-wxART_GO_DIR_UP = misc2c.wxART_GO_DIR_UP
-wxART_EXECUTABLE_FILE = misc2c.wxART_EXECUTABLE_FILE
-wxART_NORMAL_FILE = misc2c.wxART_NORMAL_FILE
-wxART_TICK_MARK = misc2c.wxART_TICK_MARK
-wxART_CROSS_MARK = misc2c.wxART_CROSS_MARK
-wxART_ERROR = misc2c.wxART_ERROR
-wxART_QUESTION = misc2c.wxART_QUESTION
-wxART_WARNING = misc2c.wxART_WARNING
-wxART_INFORMATION = misc2c.wxART_INFORMATION