reSWIGtged

[wxWidgets.git] / wxPython / wxPython / _misc.py

diff --git a/wxPython/wxPython/_misc.py b/wxPython/wxPython/_misc.py
index 8e46b9edb6b0185f4829ac7a6b42f1c8b229945a..9ec340eb089a5e1fac22d76c37707d4127d96db0 100644 (file)
--- a/wxPython/wxPython/_misc.py
+++ b/wxPython/wxPython/_misc.py
@@ -105,36 +105,39 @@ wxSYS_SHOW_SOUNDS = wx._misc.SYS_SHOW_SOUNDS
 wxSYS_SWAP_BUTTONS = wx._misc.SYS_SWAP_BUTTONS
 wxSYS_CAN_DRAW_FRAME_DECORATIONS = wx._misc.SYS_CAN_DRAW_FRAME_DECORATIONS
 wxSYS_CAN_ICONIZE_FRAME = wx._misc.SYS_CAN_ICONIZE_FRAME
 wxSYS_SWAP_BUTTONS = wx._misc.SYS_SWAP_BUTTONS
 wxSYS_CAN_DRAW_FRAME_DECORATIONS = wx._misc.SYS_CAN_DRAW_FRAME_DECORATIONS
 wxSYS_CAN_ICONIZE_FRAME = wx._misc.SYS_CAN_ICONIZE_FRAME

+wxSYS_TABLET_PRESENT = wx._misc.SYS_TABLET_PRESENT

 wxSYS_SCREEN_NONE = wx._misc.SYS_SCREEN_NONE
 wxSYS_SCREEN_TINY = wx._misc.SYS_SCREEN_TINY
 wxSYS_SCREEN_PDA = wx._misc.SYS_SCREEN_PDA
 wxSYS_SCREEN_SMALL = wx._misc.SYS_SCREEN_SMALL
 wxSYS_SCREEN_DESKTOP = wx._misc.SYS_SCREEN_DESKTOP
 wxSystemSettings = wx._misc.SystemSettings
 wxSYS_SCREEN_NONE = wx._misc.SYS_SCREEN_NONE
 wxSYS_SCREEN_TINY = wx._misc.SYS_SCREEN_TINY
 wxSYS_SCREEN_PDA = wx._misc.SYS_SCREEN_PDA
 wxSYS_SCREEN_SMALL = wx._misc.SYS_SCREEN_SMALL
 wxSYS_SCREEN_DESKTOP = wx._misc.SYS_SCREEN_DESKTOP
 wxSystemSettings = wx._misc.SystemSettings

-wxSystemSettingsPtr = wx._misc.SystemSettingsPtr

 wxSystemSettings_GetColour = wx._misc.SystemSettings_GetColour
 wxSystemSettings_GetFont = wx._misc.SystemSettings_GetFont
 wxSystemSettings_GetMetric = wx._misc.SystemSettings_GetMetric
 wxSystemSettings_HasFeature = wx._misc.SystemSettings_HasFeature
 wxSystemSettings_GetScreenType = wx._misc.SystemSettings_GetScreenType
 wxSystemSettings_SetScreenType = wx._misc.SystemSettings_SetScreenType
 wxSystemSettings_GetColour = wx._misc.SystemSettings_GetColour
 wxSystemSettings_GetFont = wx._misc.SystemSettings_GetFont
 wxSystemSettings_GetMetric = wx._misc.SystemSettings_GetMetric
 wxSystemSettings_HasFeature = wx._misc.SystemSettings_HasFeature
 wxSystemSettings_GetScreenType = wx._misc.SystemSettings_GetScreenType
 wxSystemSettings_SetScreenType = wx._misc.SystemSettings_SetScreenType

+wxWINDOW_DEFAULT_VARIANT = wx._misc.WINDOW_DEFAULT_VARIANT

 wxSystemOptions = wx._misc.SystemOptions
 wxSystemOptions = wx._misc.SystemOptions

-wxSystemOptionsPtr = wx._misc.SystemOptionsPtr

 wxSystemOptions_SetOption = wx._misc.SystemOptions_SetOption
 wxSystemOptions_SetOptionInt = wx._misc.SystemOptions_SetOptionInt
 wxSystemOptions_GetOption = wx._misc.SystemOptions_GetOption
 wxSystemOptions_GetOptionInt = wx._misc.SystemOptions_GetOptionInt
 wxSystemOptions_HasOption = wx._misc.SystemOptions_HasOption
 wxSystemOptions_SetOption = wx._misc.SystemOptions_SetOption
 wxSystemOptions_SetOptionInt = wx._misc.SystemOptions_SetOptionInt
 wxSystemOptions_GetOption = wx._misc.SystemOptions_GetOption
 wxSystemOptions_GetOptionInt = wx._misc.SystemOptions_GetOptionInt
 wxSystemOptions_HasOption = wx._misc.SystemOptions_HasOption

+wxSystemOptions_IsFalse = wx._misc.SystemOptions_IsFalse

 wxFileSelectorPromptStr = wx._misc.FileSelectorPromptStr
 wxFileSelectorDefaultWildcardStr = wx._misc.FileSelectorDefaultWildcardStr
 wxDirSelectorPromptStr = wx._misc.DirSelectorPromptStr
 wxNewId = wx._misc.NewId
 wxRegisterId = wx._misc.RegisterId
 wxGetCurrentId = wx._misc.GetCurrentId
 wxFileSelectorPromptStr = wx._misc.FileSelectorPromptStr
 wxFileSelectorDefaultWildcardStr = wx._misc.FileSelectorDefaultWildcardStr
 wxDirSelectorPromptStr = wx._misc.DirSelectorPromptStr
 wxNewId = wx._misc.NewId
 wxRegisterId = wx._misc.RegisterId
 wxGetCurrentId = wx._misc.GetCurrentId

+wxIsStockID = wx._misc.IsStockID
+wxIsStockLabel = wx._misc.IsStockLabel
+wxGetStockLabel = wx._misc.GetStockLabel

 wxBell = wx._misc.Bell
 wxEndBusyCursor = wx._misc.EndBusyCursor
 wxGetElapsedTime = wx._misc.GetElapsedTime
 wxBell = wx._misc.Bell
 wxEndBusyCursor = wx._misc.EndBusyCursor
 wxGetElapsedTime = wx._misc.GetElapsedTime

-wxGetMousePosition = wx._misc.GetMousePosition

 wxIsBusy = wx._misc.IsBusy
 wxNow = wx._misc.Now
 wxShell = wx._misc.Shell
 wxIsBusy = wx._misc.IsBusy
 wxNow = wx._misc.Now
 wxShell = wx._misc.Shell


@@ -168,7 +171,6 @@ wxGetPasswordFromUser = wx._misc.GetPasswordFromUser
 wxGetSingleChoice = wx._misc.GetSingleChoice
 wxGetSingleChoiceIndex = wx._misc.GetSingleChoiceIndex
 wxMessageBox = wx._misc.MessageBox
 wxGetSingleChoice = wx._misc.GetSingleChoice
 wxGetSingleChoiceIndex = wx._misc.GetSingleChoiceIndex
 wxMessageBox = wx._misc.MessageBox

-wxGetNumberFromUser = wx._misc.GetNumberFromUser

 wxColourDisplay = wx._misc.ColourDisplay
 wxDisplayDepth = wx._misc.DisplayDepth
 wxGetDisplayDepth = wx._misc.GetDisplayDepth
 wxColourDisplay = wx._misc.ColourDisplay
 wxDisplayDepth = wx._misc.DisplayDepth
 wxGetDisplayDepth = wx._misc.GetDisplayDepth


@@ -179,55 +181,48 @@ wxGetDisplaySizeMM = wx._misc.GetDisplaySizeMM
 wxClientDisplayRect = wx._misc.ClientDisplayRect
 wxGetClientDisplayRect = wx._misc.GetClientDisplayRect
 wxSetCursor = wx._misc.SetCursor
 wxClientDisplayRect = wx._misc.ClientDisplayRect
 wxGetClientDisplayRect = wx._misc.GetClientDisplayRect
 wxSetCursor = wx._misc.SetCursor

+wxGetXDisplay = wx._misc.GetXDisplay

 wxBeginBusyCursor = wx._misc.BeginBusyCursor
 wxBeginBusyCursor = wx._misc.BeginBusyCursor

+wxGetMousePosition = wx._misc.GetMousePosition
+FindWindowAtPointer = wx._misc.FindWindowAtPointer

 wxGetActiveWindow = wx._misc.GetActiveWindow
 wxGenericFindWindowAtPoint = wx._misc.GenericFindWindowAtPoint
 wxFindWindowAtPoint = wx._misc.FindWindowAtPoint
 wxGetTopLevelParent = wx._misc.GetTopLevelParent
 wxGetActiveWindow = wx._misc.GetActiveWindow
 wxGenericFindWindowAtPoint = wx._misc.GenericFindWindowAtPoint
 wxFindWindowAtPoint = wx._misc.FindWindowAtPoint
 wxGetTopLevelParent = wx._misc.GetTopLevelParent

+wxLaunchDefaultBrowser = wx._misc.LaunchDefaultBrowser

 wxGetKeyState = wx._misc.GetKeyState
 wxGetKeyState = wx._misc.GetKeyState

+wxMouseState = wx._misc.MouseState
+wxGetMouseState = wx._misc.GetMouseState

 wxWakeUpMainThread = wx._misc.WakeUpMainThread
 wxMutexGuiEnter = wx._misc.MutexGuiEnter
 wxMutexGuiLeave = wx._misc.MutexGuiLeave
 wxMutexGuiLocker = wx._misc.MutexGuiLocker
 wxWakeUpMainThread = wx._misc.WakeUpMainThread
 wxMutexGuiEnter = wx._misc.MutexGuiEnter
 wxMutexGuiLeave = wx._misc.MutexGuiLeave
 wxMutexGuiLocker = wx._misc.MutexGuiLocker

-wxMutexGuiLockerPtr = wx._misc.MutexGuiLockerPtr

 wxThread_IsMain = wx._misc.Thread_IsMain
 wxToolTip = wx._misc.ToolTip
 wxThread_IsMain = wx._misc.Thread_IsMain
 wxToolTip = wx._misc.ToolTip

-wxToolTipPtr = wx._misc.ToolTipPtr

 wxToolTip_Enable = wx._misc.ToolTip_Enable
 wxToolTip_SetDelay = wx._misc.ToolTip_SetDelay
 wxCaret = wx._misc.Caret
 wxToolTip_Enable = wx._misc.ToolTip_Enable
 wxToolTip_SetDelay = wx._misc.ToolTip_SetDelay
 wxCaret = wx._misc.Caret

-wxCaretPtr = wx._misc.CaretPtr

 wxCaret_GetBlinkTime = wx._misc.Caret_GetBlinkTime
 wxCaret_SetBlinkTime = wx._misc.Caret_SetBlinkTime
 wxBusyCursor = wx._misc.BusyCursor
 wxCaret_GetBlinkTime = wx._misc.Caret_GetBlinkTime
 wxCaret_SetBlinkTime = wx._misc.Caret_SetBlinkTime
 wxBusyCursor = wx._misc.BusyCursor

-wxBusyCursorPtr = wx._misc.BusyCursorPtr

 wxWindowDisabler = wx._misc.WindowDisabler
 wxWindowDisabler = wx._misc.WindowDisabler

-wxWindowDisablerPtr = wx._misc.WindowDisablerPtr

 wxBusyInfo = wx._misc.BusyInfo
 wxBusyInfo = wx._misc.BusyInfo

-wxBusyInfoPtr = wx._misc.BusyInfoPtr

 wxStopWatch = wx._misc.StopWatch
 wxStopWatch = wx._misc.StopWatch

-wxStopWatchPtr = wx._misc.StopWatchPtr

 wxFileHistory = wx._misc.FileHistory
 wxFileHistory = wx._misc.FileHistory

-wxFileHistoryPtr = wx._misc.FileHistoryPtr

 wxSingleInstanceChecker = wx._misc.SingleInstanceChecker
 wxSingleInstanceChecker = wx._misc.SingleInstanceChecker

-wxSingleInstanceCheckerPtr = wx._misc.SingleInstanceCheckerPtr

 wxPreSingleInstanceChecker = wx._misc.PreSingleInstanceChecker
 wxDrawWindowOnDC = wx._misc.DrawWindowOnDC
 wxTipProvider = wx._misc.TipProvider
 wxPreSingleInstanceChecker = wx._misc.PreSingleInstanceChecker
 wxDrawWindowOnDC = wx._misc.DrawWindowOnDC
 wxTipProvider = wx._misc.TipProvider

-wxTipProviderPtr = wx._misc.TipProviderPtr

 wxPyTipProvider = wx._misc.PyTipProvider
 wxPyTipProvider = wx._misc.PyTipProvider

-wxPyTipProviderPtr = wx._misc.PyTipProviderPtr

 wxShowTip = wx._misc.ShowTip
 wxCreateFileTipProvider = wx._misc.CreateFileTipProvider
 wxTIMER_CONTINUOUS = wx._misc.TIMER_CONTINUOUS
 wxTIMER_ONE_SHOT = wx._misc.TIMER_ONE_SHOT
 wxEVT_TIMER = wx._misc.wxEVT_TIMER
 wxTimer = wx._misc.Timer
 wxShowTip = wx._misc.ShowTip
 wxCreateFileTipProvider = wx._misc.CreateFileTipProvider
 wxTIMER_CONTINUOUS = wx._misc.TIMER_CONTINUOUS
 wxTIMER_ONE_SHOT = wx._misc.TIMER_ONE_SHOT
 wxEVT_TIMER = wx._misc.wxEVT_TIMER
 wxTimer = wx._misc.Timer

-wxTimerPtr = wx._misc.TimerPtr
+wxTimer = wx._misc.Timer

 wxTimerEvent = wx._misc.TimerEvent
 wxTimerEvent = wx._misc.TimerEvent

-wxTimerEventPtr = wx._misc.TimerEventPtr

 wxTimerRunner = wx._misc.TimerRunner
 wxTimerRunner = wx._misc.TimerRunner

-wxTimerRunnerPtr = wx._misc.TimerRunnerPtr

 wxLOG_FatalError = wx._misc.LOG_FatalError
 wxLOG_Error = wx._misc.LOG_Error
 wxLOG_Warning = wx._misc.LOG_Warning
 wxLOG_FatalError = wx._misc.LOG_FatalError
 wxLOG_Error = wx._misc.LOG_Error
 wxLOG_Warning = wx._misc.LOG_Warning


@@ -250,7 +245,6 @@ wxTraceResAlloc = wx._misc.TraceResAlloc
 wxTraceRefCount = wx._misc.TraceRefCount
 wxTraceOleCalls = wx._misc.TraceOleCalls
 wxLog = wx._misc.Log
 wxTraceRefCount = wx._misc.TraceRefCount
 wxTraceOleCalls = wx._misc.TraceOleCalls
 wxLog = wx._misc.Log

-wxLogPtr = wx._misc.LogPtr

 wxLog_IsEnabled = wx._misc.Log_IsEnabled
 wxLog_EnableLogging = wx._misc.Log_EnableLogging
 wxLog_OnLog = wx._misc.Log_OnLog
 wxLog_IsEnabled = wx._misc.Log_IsEnabled
 wxLog_EnableLogging = wx._misc.Log_EnableLogging
 wxLog_OnLog = wx._misc.Log_OnLog


@@ -275,15 +269,11 @@ wxLog_GetLogLevel = wx._misc.Log_GetLogLevel
 wxLog_GetTimestamp = wx._misc.Log_GetTimestamp
 wxLog_TimeStamp = wx._misc.Log_TimeStamp
 wxLogStderr = wx._misc.LogStderr
 wxLog_GetTimestamp = wx._misc.Log_GetTimestamp
 wxLog_TimeStamp = wx._misc.Log_TimeStamp
 wxLogStderr = wx._misc.LogStderr

-wxLogStderrPtr = wx._misc.LogStderrPtr

 wxLogTextCtrl = wx._misc.LogTextCtrl
 wxLogTextCtrl = wx._misc.LogTextCtrl

-wxLogTextCtrlPtr = wx._misc.LogTextCtrlPtr

 wxLogGui = wx._misc.LogGui
 wxLogGui = wx._misc.LogGui

-wxLogGuiPtr = wx._misc.LogGuiPtr

 wxLogWindow = wx._misc.LogWindow
 wxLogWindow = wx._misc.LogWindow

-wxLogWindowPtr = wx._misc.LogWindowPtr

 wxLogChain = wx._misc.LogChain
 wxLogChain = wx._misc.LogChain

-wxLogChainPtr = wx._misc.LogChainPtr
+wxLogBuffer = wx._misc.LogBuffer

 wxSysErrorCode = wx._misc.SysErrorCode
 wxSysErrorMsg = wx._misc.SysErrorMsg
 wxLogFatalError = wx._misc.LogFatalError
 wxSysErrorCode = wx._misc.SysErrorCode
 wxSysErrorMsg = wx._misc.SysErrorMsg
 wxLogFatalError = wx._misc.LogFatalError


@@ -296,14 +286,12 @@ wxLogVerbose = wx._misc.LogVerbose
 wxLogStatus = wx._misc.LogStatus
 wxLogStatusFrame = wx._misc.LogStatusFrame
 wxLogSysError = wx._misc.LogSysError
 wxLogStatus = wx._misc.LogStatus
 wxLogStatusFrame = wx._misc.LogStatusFrame
 wxLogSysError = wx._misc.LogSysError

+wxLogGeneric = wx._misc.LogGeneric

 wxLogTrace = wx._misc.LogTrace
 wxLogTrace = wx._misc.LogTrace
 wxLogTrace = wx._misc.LogTrace
 wxLogTrace = wx._misc.LogTrace

-wxLogGeneric = wx._misc.LogGeneric

 wxSafeShowMessage = wx._misc.SafeShowMessage
 wxLogNull = wx._misc.LogNull
 wxSafeShowMessage = wx._misc.SafeShowMessage
 wxLogNull = wx._misc.LogNull

-wxLogNullPtr = wx._misc.LogNullPtr

 wxPyLog = wx._misc.PyLog
 wxPyLog = wx._misc.PyLog

-wxPyLogPtr = wx._misc.PyLogPtr

 wxPROCESS_DEFAULT = wx._misc.PROCESS_DEFAULT
 wxPROCESS_REDIRECT = wx._misc.PROCESS_REDIRECT
 wxKILL_OK = wx._misc.KILL_OK
 wxPROCESS_DEFAULT = wx._misc.PROCESS_DEFAULT
 wxPROCESS_REDIRECT = wx._misc.PROCESS_REDIRECT
 wxKILL_OK = wx._misc.KILL_OK


@@ -311,6 +299,8 @@ wxKILL_BAD_SIGNAL = wx._misc.KILL_BAD_SIGNAL
 wxKILL_ACCESS_DENIED = wx._misc.KILL_ACCESS_DENIED
 wxKILL_NO_PROCESS = wx._misc.KILL_NO_PROCESS
 wxKILL_ERROR = wx._misc.KILL_ERROR
 wxKILL_ACCESS_DENIED = wx._misc.KILL_ACCESS_DENIED
 wxKILL_NO_PROCESS = wx._misc.KILL_NO_PROCESS
 wxKILL_ERROR = wx._misc.KILL_ERROR

+wxKILL_NOCHILDREN = wx._misc.KILL_NOCHILDREN
+wxKILL_CHILDREN = wx._misc.KILL_CHILDREN

 wxSIGNONE = wx._misc.SIGNONE
 wxSIGHUP = wx._misc.SIGHUP
 wxSIGINT = wx._misc.SIGINT
 wxSIGNONE = wx._misc.SIGNONE
 wxSIGHUP = wx._misc.SIGHUP
 wxSIGINT = wx._misc.SIGINT


@@ -329,18 +319,19 @@ wxSIGPIPE = wx._misc.SIGPIPE
 wxSIGALRM = wx._misc.SIGALRM
 wxSIGTERM = wx._misc.SIGTERM
 wxProcess = wx._misc.Process
 wxSIGALRM = wx._misc.SIGALRM
 wxSIGTERM = wx._misc.SIGTERM
 wxProcess = wx._misc.Process

-wxProcessPtr = wx._misc.ProcessPtr

 wxProcess_Kill = wx._misc.Process_Kill
 wxProcess_Exists = wx._misc.Process_Exists
 wxProcess_Open = wx._misc.Process_Open
 wxProcess_Kill = wx._misc.Process_Kill
 wxProcess_Exists = wx._misc.Process_Exists
 wxProcess_Open = wx._misc.Process_Open

+wxProcess = wx._misc.Process

 wxProcessEvent = wx._misc.ProcessEvent
 wxProcessEvent = wx._misc.ProcessEvent

-wxProcessEventPtr = wx._misc.ProcessEventPtr

 wxEVT_END_PROCESS = wx._misc.wxEVT_END_PROCESS
 wxEXEC_ASYNC = wx._misc.EXEC_ASYNC
 wxEXEC_SYNC = wx._misc.EXEC_SYNC
 wxEXEC_NOHIDE = wx._misc.EXEC_NOHIDE
 wxEXEC_MAKE_GROUP_LEADER = wx._misc.EXEC_MAKE_GROUP_LEADER
 wxEVT_END_PROCESS = wx._misc.wxEVT_END_PROCESS
 wxEXEC_ASYNC = wx._misc.EXEC_ASYNC
 wxEXEC_SYNC = wx._misc.EXEC_SYNC
 wxEXEC_NOHIDE = wx._misc.EXEC_NOHIDE
 wxEXEC_MAKE_GROUP_LEADER = wx._misc.EXEC_MAKE_GROUP_LEADER

+wxEXEC_NODISABLE = wx._misc.EXEC_NODISABLE

 wxExecute = wx._misc.Execute
 wxExecute = wx._misc.Execute

+wxKill = wx._misc.Kill

 wxJOYSTICK1 = wx._misc.JOYSTICK1
 wxJOYSTICK2 = wx._misc.JOYSTICK2
 wxJOY_BUTTON_ANY = wx._misc.JOY_BUTTON_ANY
 wxJOYSTICK1 = wx._misc.JOYSTICK1
 wxJOYSTICK2 = wx._misc.JOYSTICK2
 wxJOY_BUTTON_ANY = wx._misc.JOY_BUTTON_ANY


@@ -349,18 +340,15 @@ wxJOY_BUTTON2 = wx._misc.JOY_BUTTON2
 wxJOY_BUTTON3 = wx._misc.JOY_BUTTON3
 wxJOY_BUTTON4 = wx._misc.JOY_BUTTON4
 wxJoystick = wx._misc.Joystick
 wxJOY_BUTTON3 = wx._misc.JOY_BUTTON3
 wxJOY_BUTTON4 = wx._misc.JOY_BUTTON4
 wxJoystick = wx._misc.Joystick

-wxJoystickPtr = wx._misc.JoystickPtr

 wxEVT_JOY_BUTTON_DOWN = wx._misc.wxEVT_JOY_BUTTON_DOWN
 wxEVT_JOY_BUTTON_UP = wx._misc.wxEVT_JOY_BUTTON_UP
 wxEVT_JOY_MOVE = wx._misc.wxEVT_JOY_MOVE
 wxEVT_JOY_ZMOVE = wx._misc.wxEVT_JOY_ZMOVE
 wxJoystickEvent = wx._misc.JoystickEvent
 wxEVT_JOY_BUTTON_DOWN = wx._misc.wxEVT_JOY_BUTTON_DOWN
 wxEVT_JOY_BUTTON_UP = wx._misc.wxEVT_JOY_BUTTON_UP
 wxEVT_JOY_MOVE = wx._misc.wxEVT_JOY_MOVE
 wxEVT_JOY_ZMOVE = wx._misc.wxEVT_JOY_ZMOVE
 wxJoystickEvent = wx._misc.JoystickEvent

-wxJoystickEventPtr = wx._misc.JoystickEventPtr

 wxSOUND_SYNC = wx._misc.SOUND_SYNC
 wxSOUND_ASYNC = wx._misc.SOUND_ASYNC
 wxSOUND_LOOP = wx._misc.SOUND_LOOP
 wxSound = wx._misc.Sound
 wxSOUND_SYNC = wx._misc.SOUND_SYNC
 wxSOUND_ASYNC = wx._misc.SOUND_ASYNC
 wxSOUND_LOOP = wx._misc.SOUND_LOOP
 wxSound = wx._misc.Sound

-wxSoundPtr = wx._misc.SoundPtr

 wxSoundFromData = wx._misc.SoundFromData
 wxSound_PlaySound = wx._misc.Sound_PlaySound
 wxSound_Stop = wx._misc.Sound_Stop
 wxSoundFromData = wx._misc.SoundFromData
 wxSound_PlaySound = wx._misc.Sound_PlaySound
 wxSound_Stop = wx._misc.Sound_Stop


@@ -370,15 +358,12 @@ wxMAILCAP_KDE = wx._misc.MAILCAP_KDE
 wxMAILCAP_GNOME = wx._misc.MAILCAP_GNOME
 wxMAILCAP_ALL = wx._misc.MAILCAP_ALL
 wxFileTypeInfo = wx._misc.FileTypeInfo
 wxMAILCAP_GNOME = wx._misc.MAILCAP_GNOME
 wxMAILCAP_ALL = wx._misc.MAILCAP_ALL
 wxFileTypeInfo = wx._misc.FileTypeInfo

-wxFileTypeInfoPtr = wx._misc.FileTypeInfoPtr

 wxFileTypeInfoSequence = wx._misc.FileTypeInfoSequence
 wxNullFileTypeInfo = wx._misc.NullFileTypeInfo
 wxFileType = wx._misc.FileType
 wxFileTypeInfoSequence = wx._misc.FileTypeInfoSequence
 wxNullFileTypeInfo = wx._misc.NullFileTypeInfo
 wxFileType = wx._misc.FileType

-wxFileTypePtr = wx._misc.FileTypePtr

 wxFileType_ExpandCommand = wx._misc.FileType_ExpandCommand
 wxTheMimeTypesManager = wx._misc.TheMimeTypesManager
 wxMimeTypesManager = wx._misc.MimeTypesManager
 wxFileType_ExpandCommand = wx._misc.FileType_ExpandCommand
 wxTheMimeTypesManager = wx._misc.TheMimeTypesManager
 wxMimeTypesManager = wx._misc.MimeTypesManager

-wxMimeTypesManagerPtr = wx._misc.MimeTypesManagerPtr

 wxMimeTypesManager_IsOfType = wx._misc.MimeTypesManager_IsOfType
 wxART_TOOLBAR = wx._misc.ART_TOOLBAR
 wxART_MENU = wx._misc.ART_MENU
 wxMimeTypesManager_IsOfType = wx._misc.MimeTypesManager_IsOfType
 wxART_TOOLBAR = wx._misc.ART_TOOLBAR
 wxART_MENU = wx._misc.ART_MENU


@@ -386,6 +371,7 @@ wxART_FRAME_ICON = wx._misc.ART_FRAME_ICON
 wxART_CMN_DIALOG = wx._misc.ART_CMN_DIALOG
 wxART_HELP_BROWSER = wx._misc.ART_HELP_BROWSER
 wxART_MESSAGE_BOX = wx._misc.ART_MESSAGE_BOX
 wxART_CMN_DIALOG = wx._misc.ART_CMN_DIALOG
 wxART_HELP_BROWSER = wx._misc.ART_HELP_BROWSER
 wxART_MESSAGE_BOX = wx._misc.ART_MESSAGE_BOX

+wxART_BUTTON = wx._misc.ART_BUTTON

 wxART_OTHER = wx._misc.ART_OTHER
 wxART_ADD_BOOKMARK = wx._misc.ART_ADD_BOOKMARK
 wxART_DEL_BOOKMARK = wx._misc.ART_DEL_BOOKMARK
 wxART_OTHER = wx._misc.ART_OTHER
 wxART_ADD_BOOKMARK = wx._misc.ART_ADD_BOOKMARK
 wxART_DEL_BOOKMARK = wx._misc.ART_DEL_BOOKMARK


@@ -401,13 +387,20 @@ wxART_GO_DOWN = wx._misc.ART_GO_DOWN
 wxART_GO_TO_PARENT = wx._misc.ART_GO_TO_PARENT
 wxART_GO_HOME = wx._misc.ART_GO_HOME
 wxART_FILE_OPEN = wx._misc.ART_FILE_OPEN
 wxART_GO_TO_PARENT = wx._misc.ART_GO_TO_PARENT
 wxART_GO_HOME = wx._misc.ART_GO_HOME
 wxART_FILE_OPEN = wx._misc.ART_FILE_OPEN

+wxART_FILE_SAVE = wx._misc.ART_FILE_SAVE
+wxART_FILE_SAVE_AS = wx._misc.ART_FILE_SAVE_AS

 wxART_PRINT = wx._misc.ART_PRINT
 wxART_HELP = wx._misc.ART_HELP
 wxART_TIP = wx._misc.ART_TIP
 wxART_REPORT_VIEW = wx._misc.ART_REPORT_VIEW
 wxART_LIST_VIEW = wx._misc.ART_LIST_VIEW
 wxART_NEW_DIR = wx._misc.ART_NEW_DIR
 wxART_PRINT = wx._misc.ART_PRINT
 wxART_HELP = wx._misc.ART_HELP
 wxART_TIP = wx._misc.ART_TIP
 wxART_REPORT_VIEW = wx._misc.ART_REPORT_VIEW
 wxART_LIST_VIEW = wx._misc.ART_LIST_VIEW
 wxART_NEW_DIR = wx._misc.ART_NEW_DIR

+wxART_HARDDISK = wx._misc.ART_HARDDISK
+wxART_FLOPPY = wx._misc.ART_FLOPPY
+wxART_CDROM = wx._misc.ART_CDROM
+wxART_REMOVABLE = wx._misc.ART_REMOVABLE

 wxART_FOLDER = wx._misc.ART_FOLDER
 wxART_FOLDER = wx._misc.ART_FOLDER

+wxART_FOLDER_OPEN = wx._misc.ART_FOLDER_OPEN

 wxART_GO_DIR_UP = wx._misc.ART_GO_DIR_UP
 wxART_EXECUTABLE_FILE = wx._misc.ART_EXECUTABLE_FILE
 wxART_NORMAL_FILE = wx._misc.ART_NORMAL_FILE
 wxART_GO_DIR_UP = wx._misc.ART_GO_DIR_UP
 wxART_EXECUTABLE_FILE = wx._misc.ART_EXECUTABLE_FILE
 wxART_NORMAL_FILE = wx._misc.ART_NORMAL_FILE


@@ -418,34 +411,40 @@ wxART_QUESTION = wx._misc.ART_QUESTION
 wxART_WARNING = wx._misc.ART_WARNING
 wxART_INFORMATION = wx._misc.ART_INFORMATION
 wxART_MISSING_IMAGE = wx._misc.ART_MISSING_IMAGE
 wxART_WARNING = wx._misc.ART_WARNING
 wxART_INFORMATION = wx._misc.ART_INFORMATION
 wxART_MISSING_IMAGE = wx._misc.ART_MISSING_IMAGE

+wxART_COPY = wx._misc.ART_COPY
+wxART_CUT = wx._misc.ART_CUT
+wxART_PASTE = wx._misc.ART_PASTE
+wxART_DELETE = wx._misc.ART_DELETE
+wxART_NEW = wx._misc.ART_NEW
+wxART_UNDO = wx._misc.ART_UNDO
+wxART_REDO = wx._misc.ART_REDO
+wxART_QUIT = wx._misc.ART_QUIT
+wxART_FIND = wx._misc.ART_FIND
+wxART_FIND_AND_REPLACE = wx._misc.ART_FIND_AND_REPLACE
+wxArtProvider = wx._misc.ArtProvider

 wxArtProvider = wx._misc.ArtProvider
 wxArtProvider = wx._misc.ArtProvider

-wxArtProviderPtr = wx._misc.ArtProviderPtr

 wxArtProvider_PushProvider = wx._misc.ArtProvider_PushProvider
 wxArtProvider_PopProvider = wx._misc.ArtProvider_PopProvider
 wxArtProvider_RemoveProvider = wx._misc.ArtProvider_RemoveProvider
 wxArtProvider_GetBitmap = wx._misc.ArtProvider_GetBitmap
 wxArtProvider_GetIcon = wx._misc.ArtProvider_GetIcon
 wxArtProvider_PushProvider = wx._misc.ArtProvider_PushProvider
 wxArtProvider_PopProvider = wx._misc.ArtProvider_PopProvider
 wxArtProvider_RemoveProvider = wx._misc.ArtProvider_RemoveProvider
 wxArtProvider_GetBitmap = wx._misc.ArtProvider_GetBitmap
 wxArtProvider_GetIcon = wx._misc.ArtProvider_GetIcon

+wxArtProvider_GetSizeHint = wx._misc.ArtProvider_GetSizeHint

 wxCONFIG_USE_LOCAL_FILE = wx._misc.CONFIG_USE_LOCAL_FILE
 wxCONFIG_USE_GLOBAL_FILE = wx._misc.CONFIG_USE_GLOBAL_FILE
 wxCONFIG_USE_RELATIVE_PATH = wx._misc.CONFIG_USE_RELATIVE_PATH
 wxCONFIG_USE_NO_ESCAPE_CHARACTERS = wx._misc.CONFIG_USE_NO_ESCAPE_CHARACTERS
 wxConfigBase = wx._misc.ConfigBase
 wxCONFIG_USE_LOCAL_FILE = wx._misc.CONFIG_USE_LOCAL_FILE
 wxCONFIG_USE_GLOBAL_FILE = wx._misc.CONFIG_USE_GLOBAL_FILE
 wxCONFIG_USE_RELATIVE_PATH = wx._misc.CONFIG_USE_RELATIVE_PATH
 wxCONFIG_USE_NO_ESCAPE_CHARACTERS = wx._misc.CONFIG_USE_NO_ESCAPE_CHARACTERS
 wxConfigBase = wx._misc.ConfigBase

-wxConfigBasePtr = wx._misc.ConfigBasePtr

 wxConfigBase_Set = wx._misc.ConfigBase_Set
 wxConfigBase_Get = wx._misc.ConfigBase_Get
 wxConfigBase_Create = wx._misc.ConfigBase_Create
 wxConfigBase_DontCreateOnDemand = wx._misc.ConfigBase_DontCreateOnDemand
 wxConfig = wx._misc.Config
 wxConfigBase_Set = wx._misc.ConfigBase_Set
 wxConfigBase_Get = wx._misc.ConfigBase_Get
 wxConfigBase_Create = wx._misc.ConfigBase_Create
 wxConfigBase_DontCreateOnDemand = wx._misc.ConfigBase_DontCreateOnDemand
 wxConfig = wx._misc.Config

-wxConfigPtr = wx._misc.ConfigPtr

 wxFileConfig = wx._misc.FileConfig
 wxFileConfig = wx._misc.FileConfig

-wxFileConfigPtr = wx._misc.FileConfigPtr

 wxConfigPathChanger = wx._misc.ConfigPathChanger
 wxConfigPathChanger = wx._misc.ConfigPathChanger

-wxConfigPathChangerPtr = wx._misc.ConfigPathChangerPtr

 wxExpandEnvVars = wx._misc.ExpandEnvVars
 wxExpandEnvVars = wx._misc.ExpandEnvVars

-wxDateFormatStr = wx._misc.DateFormatStr
-wxTimeSpanFormatStr = wx._misc.TimeSpanFormatStr
+wxDefaultDateTimeFormat = wx._misc.DefaultDateTimeFormat
+wxDefaultTimeSpanFormat = wx._misc.DefaultTimeSpanFormat

 wxDateTime = wx._misc.DateTime
 wxDateTime = wx._misc.DateTime

-wxDateTimePtr = wx._misc.DateTimePtr

 wxDateTime_SetCountry = wx._misc.DateTime_SetCountry
 wxDateTime_GetCountry = wx._misc.DateTime_GetCountry
 wxDateTime_IsWestEuropeanCountry = wx._misc.DateTime_IsWestEuropeanCountry
 wxDateTime_SetCountry = wx._misc.DateTime_SetCountry
 wxDateTime_GetCountry = wx._misc.DateTime_GetCountry
 wxDateTime_IsWestEuropeanCountry = wx._misc.DateTime_IsWestEuropeanCountry


@@ -469,8 +468,11 @@ wxDateTimeFromTimeT = wx._misc.DateTimeFromTimeT
 wxDateTimeFromJDN = wx._misc.DateTimeFromJDN
 wxDateTimeFromHMS = wx._misc.DateTimeFromHMS
 wxDateTimeFromDMY = wx._misc.DateTimeFromDMY
 wxDateTimeFromJDN = wx._misc.DateTimeFromJDN
 wxDateTimeFromHMS = wx._misc.DateTimeFromHMS
 wxDateTimeFromDMY = wx._misc.DateTimeFromDMY

+wxDateTimeFromDateTime = wx._misc.DateTimeFromDateTime
+wxDateTime_SetToWeekOfYear = wx._misc.DateTime_SetToWeekOfYear

 wxTimeSpan = wx._misc.TimeSpan
 wxTimeSpan = wx._misc.TimeSpan

-wxTimeSpanPtr = wx._misc.TimeSpanPtr
+wxTimeSpan_Milliseconds = wx._misc.TimeSpan_Milliseconds
+wxTimeSpan_Millisecond = wx._misc.TimeSpan_Millisecond

 wxTimeSpan_Seconds = wx._misc.TimeSpan_Seconds
 wxTimeSpan_Second = wx._misc.TimeSpan_Second
 wxTimeSpan_Minutes = wx._misc.TimeSpan_Minutes
 wxTimeSpan_Seconds = wx._misc.TimeSpan_Seconds
 wxTimeSpan_Second = wx._misc.TimeSpan_Second
 wxTimeSpan_Minutes = wx._misc.TimeSpan_Minutes


@@ -482,7 +484,6 @@ wxTimeSpan_Day = wx._misc.TimeSpan_Day
 wxTimeSpan_Weeks = wx._misc.TimeSpan_Weeks
 wxTimeSpan_Week = wx._misc.TimeSpan_Week
 wxDateSpan = wx._misc.DateSpan
 wxTimeSpan_Weeks = wx._misc.TimeSpan_Weeks
 wxTimeSpan_Week = wx._misc.TimeSpan_Week
 wxDateSpan = wx._misc.DateSpan

-wxDateSpanPtr = wx._misc.DateSpanPtr

 wxDateSpan_Days = wx._misc.DateSpan_Days
 wxDateSpan_Day = wx._misc.DateSpan_Day
 wxDateSpan_Weeks = wx._misc.DateSpan_Weeks
 wxDateSpan_Days = wx._misc.DateSpan_Days
 wxDateSpan_Day = wx._misc.DateSpan_Day
 wxDateSpan_Weeks = wx._misc.DateSpan_Weeks


@@ -517,33 +518,20 @@ wxDF_PRIVATE = wx._misc.DF_PRIVATE
 wxDF_HTML = wx._misc.DF_HTML
 wxDF_MAX = wx._misc.DF_MAX
 wxDataFormat = wx._misc.DataFormat
 wxDF_HTML = wx._misc.DF_HTML
 wxDF_MAX = wx._misc.DF_MAX
 wxDataFormat = wx._misc.DataFormat

-wxDataFormatPtr = wx._misc.DataFormatPtr

 wxCustomDataFormat = wx._misc.CustomDataFormat
 wxFormatInvalid = wx._misc.FormatInvalid
 wxDataObject = wx._misc.DataObject
 wxCustomDataFormat = wx._misc.CustomDataFormat
 wxFormatInvalid = wx._misc.FormatInvalid
 wxDataObject = wx._misc.DataObject

-wxDataObjectPtr = wx._misc.DataObjectPtr

 wxDataObjectSimple = wx._misc.DataObjectSimple
 wxDataObjectSimple = wx._misc.DataObjectSimple

-wxDataObjectSimplePtr = wx._misc.DataObjectSimplePtr

 wxPyDataObjectSimple = wx._misc.PyDataObjectSimple
 wxPyDataObjectSimple = wx._misc.PyDataObjectSimple

-wxPyDataObjectSimplePtr = wx._misc.PyDataObjectSimplePtr

 wxDataObjectComposite = wx._misc.DataObjectComposite
 wxDataObjectComposite = wx._misc.DataObjectComposite

-wxDataObjectCompositePtr = wx._misc.DataObjectCompositePtr

 wxTextDataObject = wx._misc.TextDataObject
 wxTextDataObject = wx._misc.TextDataObject

-wxTextDataObjectPtr = wx._misc.TextDataObjectPtr

 wxPyTextDataObject = wx._misc.PyTextDataObject
 wxPyTextDataObject = wx._misc.PyTextDataObject

-wxPyTextDataObjectPtr = wx._misc.PyTextDataObjectPtr

 wxBitmapDataObject = wx._misc.BitmapDataObject
 wxBitmapDataObject = wx._misc.BitmapDataObject

-wxBitmapDataObjectPtr = wx._misc.BitmapDataObjectPtr

 wxPyBitmapDataObject = wx._misc.PyBitmapDataObject
 wxPyBitmapDataObject = wx._misc.PyBitmapDataObject

-wxPyBitmapDataObjectPtr = wx._misc.PyBitmapDataObjectPtr

 wxFileDataObject = wx._misc.FileDataObject
 wxFileDataObject = wx._misc.FileDataObject

-wxFileDataObjectPtr = wx._misc.FileDataObjectPtr

 wxCustomDataObject = wx._misc.CustomDataObject
 wxCustomDataObject = wx._misc.CustomDataObject

-wxCustomDataObjectPtr = wx._misc.CustomDataObjectPtr

 wxURLDataObject = wx._misc.URLDataObject
 wxURLDataObject = wx._misc.URLDataObject

-wxURLDataObjectPtr = wx._misc.URLDataObjectPtr

 wxMetafileDataObject = wx._misc.MetafileDataObject
 wxMetafileDataObject = wx._misc.MetafileDataObject

-wxMetafileDataObjectPtr = wx._misc.MetafileDataObjectPtr

 wxDrag_CopyOnly = wx._misc.Drag_CopyOnly
 wxDrag_AllowMove = wx._misc.Drag_AllowMove
 wxDrag_DefaultMove = wx._misc.Drag_DefaultMove
 wxDrag_CopyOnly = wx._misc.Drag_CopyOnly
 wxDrag_AllowMove = wx._misc.Drag_AllowMove
 wxDrag_DefaultMove = wx._misc.Drag_DefaultMove


@@ -555,26 +543,24 @@ wxDragLink = wx._misc.DragLink
 wxDragCancel = wx._misc.DragCancel
 wxIsDragResultOk = wx._misc.IsDragResultOk
 wxDropSource = wx._misc.DropSource
 wxDragCancel = wx._misc.DragCancel
 wxIsDragResultOk = wx._misc.IsDragResultOk
 wxDropSource = wx._misc.DropSource

-wxDropSourcePtr = wx._misc.DropSourcePtr
+wxDropSource = wx._misc.DropSource
+wxDropTarget = wx._misc.DropTarget

 wxDropTarget = wx._misc.DropTarget
 wxDropTarget = wx._misc.DropTarget

-wxDropTargetPtr = wx._misc.DropTargetPtr

 wxTextDropTarget = wx._misc.TextDropTarget
 wxTextDropTarget = wx._misc.TextDropTarget

-wxTextDropTargetPtr = wx._misc.TextDropTargetPtr
+wxTextDropTarget = wx._misc.TextDropTarget
+wxFileDropTarget = wx._misc.FileDropTarget

 wxFileDropTarget = wx._misc.FileDropTarget
 wxFileDropTarget = wx._misc.FileDropTarget

-wxFileDropTargetPtr = wx._misc.FileDropTargetPtr

 wxClipboard = wx._misc.Clipboard
 wxClipboard = wx._misc.Clipboard

-wxClipboardPtr = wx._misc.ClipboardPtr

 wxClipboard_Get = wx._misc.Clipboard_Get
 wxClipboardLocker = wx._misc.ClipboardLocker
 wxClipboard_Get = wx._misc.Clipboard_Get
 wxClipboardLocker = wx._misc.ClipboardLocker

-wxClipboardLockerPtr = wx._misc.ClipboardLockerPtr

 wxVideoMode = wx._misc.VideoMode
 wxVideoMode = wx._misc.VideoMode

-wxVideoModePtr = wx._misc.VideoModePtr

 wxDefaultVideoMode = wx._misc.DefaultVideoMode
 wxDisplay = wx._misc.Display
 wxDefaultVideoMode = wx._misc.DefaultVideoMode
 wxDisplay = wx._misc.Display

-wxDisplayPtr = wx._misc.DisplayPtr

 wxDisplay_GetCount = wx._misc.Display_GetCount
 wxDisplay_GetFromPoint = wx._misc.Display_GetFromPoint
 wxDisplay_GetFromWindow = wx._misc.Display_GetFromWindow
 wxDisplay_GetCount = wx._misc.Display_GetCount
 wxDisplay_GetFromPoint = wx._misc.Display_GetFromPoint
 wxDisplay_GetFromWindow = wx._misc.Display_GetFromWindow

+wxStandardPaths = wx._misc.StandardPaths
+wxStandardPaths_Get = wx._misc.StandardPaths_Get

 wxPyTimer = wx._misc.PyTimer
 wxPyDropTarget = wx._misc.PyDropTarget
 wxTheClipboard = wx._misc.TheClipboard
 wxPyTimer = wx._misc.PyTimer
 wxPyDropTarget = wx._misc.PyDropTarget
 wxTheClipboard = wx._misc.TheClipboard