SWIGged update for wxGTK

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

diff --git a/wxPython/src/mac/misc2.py b/wxPython/src/mac/misc2.py
index 3e9fbe9a5498cb1b954092213b4ffd7ce629b839..48d481c649cbc86cf132347eb55789b5df70f172 100644 (file)
--- a/wxPython/src/mac/misc2.py
+++ b/wxPython/src/mac/misc2.py
@@ -7,6 +7,8 @@ from misc import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from clip_dnd import *
 
 from events import *
 from clip_dnd import *
 
 from events import *


@@ -14,6 +16,61 @@ from events import *
 from streams import *
 
 from utils 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
+        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
 class wxToolTipPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this


@@ -95,39 +152,6 @@ class wxCaret(wxCaretPtr):
 
 
 
 
 
 

-class wxFontEnumeratorPtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxFontEnumerator(self)
-    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)
-        return val
-    def EnumerateEncodings(self, *_args, **_kwargs):
-        val = apply(misc2c.wxFontEnumerator_EnumerateEncodings,(self,) + _args, _kwargs)
-        return val
-    def GetEncodings(self, *_args, **_kwargs):
-        val = apply(misc2c.wxFontEnumerator_GetEncodings,(self,) + _args, _kwargs)
-        return val
-    def GetFacenames(self, *_args, **_kwargs):
-        val = apply(misc2c.wxFontEnumerator_GetFacenames,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxFontEnumerator instance at %s>" % (self.this,)
-class wxFontEnumerator(wxFontEnumeratorPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(misc2c.new_wxFontEnumerator,_args,_kwargs)
-        self.thisown = 1
-        self._setCallbackInfo(self, wxFontEnumerator)
-
-
-
-

 class wxBusyCursorPtr :
     def __init__(self,this):
         self.this = this
 class wxBusyCursorPtr :
     def __init__(self,this):
         self.this = this


@@ -205,12 +229,16 @@ class wxPyTipProviderPtr(wxTipProviderPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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
     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)

 
 
 
 
 
 


@@ -319,6 +347,9 @@ class wxStopWatchPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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 Start(self, *_args, **_kwargs):
         val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs)
         return val


@@ -351,9 +382,6 @@ class wxLogPtr :
     def HasPendingMessages(self, *_args, **_kwargs):
         val = apply(misc2c.wxLog_HasPendingMessages,(self,) + _args, _kwargs)
         return val
     def HasPendingMessages(self, *_args, **_kwargs):
         val = apply(misc2c.wxLog_HasPendingMessages,(self,) + _args, _kwargs)
         return val

-    def SetVerbose(self, *_args, **_kwargs):
-        val = apply(misc2c.wxLog_SetVerbose,(self,) + _args, _kwargs)
-        return val

     def GetVerbose(self, *_args, **_kwargs):
         val = apply(misc2c.wxLog_GetVerbose,(self,) + _args, _kwargs)
         return val
     def GetVerbose(self, *_args, **_kwargs):
         val = apply(misc2c.wxLog_GetVerbose,(self,) + _args, _kwargs)
         return val


@@ -442,23 +470,6 @@ class wxLogWindow(wxLogWindowPtr):
 
 
 
 
 
 

-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 __repr__(self):
-        return "<C wxLogNull instance at %s>" % (self.this,)
-class wxLogNull(wxLogNullPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(misc2c.new_wxLogNull,_args,_kwargs)
-        self.thisown = 1
-
-
-
-

 class wxLogChainPtr(wxLogPtr):
     def __init__(self,this):
         self.this = this
 class wxLogChainPtr(wxLogPtr):
     def __init__(self,this):
         self.this = this


@@ -486,6 +497,23 @@ class wxLogChain(wxLogChainPtr):
 
 
 
 
 
 

+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 __repr__(self):
+        return "<C wxLogNull instance at %s>" % (self.this,)
+class wxLogNull(wxLogNullPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxLogNull,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

 class wxPyLogPtr(wxLogPtr):
     def __init__(self,this):
         self.this = this
 class wxPyLogPtr(wxLogPtr):
     def __init__(self,this):
         self.this = this


@@ -576,6 +604,15 @@ class wxProcessPtr(wxEvtHandlerPtr):
     def CloseOutput(self, *_args, **_kwargs):
         val = apply(misc2c.wxProcess_CloseOutput,(self,) + _args, _kwargs)
         return val
     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):
     def __repr__(self):
         return "<C wxProcess instance at %s>" % (self.this,)
 class wxProcess(wxProcessPtr):


@@ -918,6 +955,24 @@ class wxMimeTypesManager(wxMimeTypesManagerPtr):
 
 
 
 
 
 

+class wxArtProviderPtr(wxObjectPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(misc2c.wxArtProvider__setCallbackInfo,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxArtProvider instance at %s>" % (self.this,)
+class wxArtProvider(wxArtProviderPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxArtProvider,_args,_kwargs)
+        self.thisown = 1
+        self._setCallbackInfo(self, wxArtProvider)
+
+
+
+

 class wxFileHistoryPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
 class wxFileHistoryPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this


@@ -949,8 +1004,8 @@ class wxFileHistoryPtr(wxObjectPtr):
     def AddFilesToMenu(self, *_args, **_kwargs):
         val = apply(misc2c.wxFileHistory_AddFilesToMenu,(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)
+    def AddFilesToThisMenu(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_AddFilesToThisMenu,(self,) + _args, _kwargs)

         return val
     def GetHistoryFile(self, *_args, **_kwargs):
         val = apply(misc2c.wxFileHistory_GetHistoryFile,(self,) + _args, _kwargs)
         return val
     def GetHistoryFile(self, *_args, **_kwargs):
         val = apply(misc2c.wxFileHistory_GetHistoryFile,(self,) + _args, _kwargs)


@@ -977,6 +1032,12 @@ class wxFileHistory(wxFileHistoryPtr):
 
 wxFileSelector = misc2c.wxFileSelector
 
 
 wxFileSelector = misc2c.wxFileSelector
 

+wxLoadFileSelector = misc2c.wxLoadFileSelector
+
+wxSaveFileSelector = misc2c.wxSaveFileSelector
+
+wxDirSelector = misc2c.wxDirSelector
+

 wxGetTextFromUser = misc2c.wxGetTextFromUser
 
 wxGetPasswordFromUser = misc2c.wxGetPasswordFromUser
 wxGetTextFromUser = misc2c.wxGetTextFromUser
 
 wxGetPasswordFromUser = misc2c.wxGetPasswordFromUser


@@ -1018,14 +1079,6 @@ def wxGetClientDisplayRect(*_args, **_kwargs):
 
 wxSetCursor = misc2c.wxSetCursor
 
 
 wxSetCursor = misc2c.wxSetCursor
 

-def wxFindWindowByLabel(*_args, **_kwargs):
-    val = apply(misc2c.wxFindWindowByLabel,_args,_kwargs)
-    return val
-
-def wxFindWindowByName(*_args, **_kwargs):
-    val = apply(misc2c.wxFindWindowByName,_args,_kwargs)
-    return val
-

 wxBeginBusyCursor = misc2c.wxBeginBusyCursor
 
 def wxGetActiveWindow(*_args, **_kwargs):
 wxBeginBusyCursor = misc2c.wxBeginBusyCursor
 
 def wxGetActiveWindow(*_args, **_kwargs):


@@ -1040,6 +1093,10 @@ def wxFindWindowAtPoint(*_args, **_kwargs):
     val = apply(misc2c.wxFindWindowAtPoint,_args,_kwargs)
     return val
 
     val = apply(misc2c.wxFindWindowAtPoint,_args,_kwargs)
     return val
 

+def wxGetTopLevelParent(*_args, **_kwargs):
+    val = apply(misc2c.wxGetTopLevelParent,_args,_kwargs)
+    return val
+

 wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
 
 wxResourceClear = misc2c.wxResourceClear
 wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
 
 wxResourceClear = misc2c.wxResourceClear


@@ -1066,18 +1123,6 @@ wxResourceParseFile = misc2c.wxResourceParseFile
 
 wxResourceParseString = misc2c.wxResourceParseString
 
 
 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
-

 wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime
 
 wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime
 wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime
 
 wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime


@@ -1123,6 +1168,14 @@ wxLogStatusFrame = misc2c.wxLogStatusFrame
 
 wxLogSysError = misc2c.wxLogSysError
 
 
 wxLogSysError = misc2c.wxLogSysError
 

+wxLogTrace = misc2c.wxLogTrace
+
+wxLogTraceMask = misc2c.wxLogTraceMask
+
+wxLogGeneric = misc2c.wxLogGeneric
+
+wxSafeShowMessage = misc2c.wxSafeShowMessage
+

 wxExecute = misc2c.wxExecute
 
 def wxWaveData(*_args, **_kwargs):
 wxExecute = misc2c.wxExecute
 
 def wxWaveData(*_args, **_kwargs):


@@ -1130,6 +1183,24 @@ def wxWaveData(*_args, **_kwargs):
     if val: val = wxWavePtr(val); val.thisown = 1
     return val
 
     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
+
+wxSystemSettings_GetScreenType = misc2c.wxSystemSettings_GetScreenType
+
+wxSystemSettings_SetScreenType = misc2c.wxSystemSettings_SetScreenType
+

 wxToolTip_Enable = misc2c.wxToolTip_Enable
 
 wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay
 wxToolTip_Enable = misc2c.wxToolTip_Enable
 
 wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay


@@ -1156,6 +1227,8 @@ wxLog_Suspend = misc2c.wxLog_Suspend
 
 wxLog_Resume = misc2c.wxLog_Resume
 
 
 wxLog_Resume = misc2c.wxLog_Resume
 

+wxLog_SetVerbose = misc2c.wxLog_SetVerbose
+

 wxLog_DontCreateOnDemand = misc2c.wxLog_DontCreateOnDemand
 
 wxLog_SetTraceMask = misc2c.wxLog_SetTraceMask
 wxLog_DontCreateOnDemand = misc2c.wxLog_DontCreateOnDemand
 
 wxLog_SetTraceMask = misc2c.wxLog_SetTraceMask


@@ -1174,24 +1247,41 @@ wxLog_GetTraceMask = misc2c.wxLog_GetTraceMask
 
 wxLog_IsAllowedTraceMask = misc2c.wxLog_IsAllowedTraceMask
 
 
 wxLog_IsAllowedTraceMask = misc2c.wxLog_IsAllowedTraceMask
 

+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
 
 wxFileType_ExpandCommand = misc2c.wxFileType_ExpandCommand
 
 wxMimeTypesManager_IsOfType = misc2c.wxMimeTypesManager_IsOfType
 

+wxArtProvider_PushProvider = misc2c.wxArtProvider_PushProvider
+
+wxArtProvider_PopProvider = misc2c.wxArtProvider_PopProvider
+
+wxArtProvider_RemoveProvider = misc2c.wxArtProvider_RemoveProvider
+
+def wxArtProvider_GetBitmap(*_args, **_kwargs):
+    val = apply(misc2c.wxArtProvider_GetBitmap,_args,_kwargs)
+    if val: val = wxBitmapPtr(val); val.thisown = 1
+    return val
+
+def wxArtProvider_GetIcon(*_args, **_kwargs):
+    val = apply(misc2c.wxArtProvider_GetIcon,_args,_kwargs)
+    if val: val = wxIconPtr(val); val.thisown = 1
+    return val
+
+wxArtProvider_CleanUpProviders = misc2c.wxArtProvider_CleanUpProviders
+

 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 
 #-------------- 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
 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


@@ -1202,6 +1292,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_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
 wxSYS_COLOUR_ACTIVECAPTION = misc2c.wxSYS_COLOUR_ACTIVECAPTION
 wxSYS_COLOUR_INACTIVECAPTION = misc2c.wxSYS_COLOUR_INACTIVECAPTION
 wxSYS_COLOUR_MENU = misc2c.wxSYS_COLOUR_MENU


@@ -1216,21 +1307,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_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_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_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_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
 wxSYS_MOUSE_BUTTONS = misc2c.wxSYS_MOUSE_BUTTONS
 wxSYS_BORDER_X = misc2c.wxSYS_BORDER_X
 wxSYS_BORDER_Y = misc2c.wxSYS_BORDER_Y


@@ -1268,6 +1365,13 @@ 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_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
+wxSYS_SCREEN_NONE = misc2c.wxSYS_SCREEN_NONE
+wxSYS_SCREEN_TINY = misc2c.wxSYS_SCREEN_TINY
+wxSYS_SCREEN_PDA = misc2c.wxSYS_SCREEN_PDA
+wxSYS_SCREEN_SMALL = misc2c.wxSYS_SCREEN_SMALL
+wxSYS_SCREEN_DESKTOP = misc2c.wxSYS_SCREEN_DESKTOP

 wxLOG_FatalError = misc2c.wxLOG_FatalError
 wxLOG_Error = misc2c.wxLOG_Error
 wxLOG_Warning = misc2c.wxLOG_Warning
 wxLOG_FatalError = misc2c.wxLOG_FatalError
 wxLOG_Error = misc2c.wxLOG_Error
 wxLOG_Warning = misc2c.wxLOG_Warning


@@ -1278,7 +1382,48 @@ wxLOG_Debug = misc2c.wxLOG_Debug
 wxLOG_Trace = misc2c.wxLOG_Trace
 wxLOG_Progress = misc2c.wxLOG_Progress
 wxLOG_User = misc2c.wxLOG_User
 wxLOG_Trace = misc2c.wxLOG_Trace
 wxLOG_Progress = misc2c.wxLOG_Progress
 wxLOG_User = misc2c.wxLOG_User

+wxTRACE_MemAlloc = misc2c.wxTRACE_MemAlloc
+wxTRACE_Messages = misc2c.wxTRACE_Messages
+wxTRACE_ResAlloc = misc2c.wxTRACE_ResAlloc
+wxTRACE_RefCount = misc2c.wxTRACE_RefCount
+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
 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
 wxMAILCAP_STANDARD = misc2c.wxMAILCAP_STANDARD
 wxMAILCAP_NETSCAPE = misc2c.wxMAILCAP_NETSCAPE
 wxMAILCAP_KDE = misc2c.wxMAILCAP_KDE