X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bc1a8e6f07454fb22d47b17abd9ae066836a510..e04fe03d0f0d5cda7f9c2712ed3a65988839002c:/wxPython/src/mac/wx.py diff --git a/wxPython/src/mac/wx.py b/wxPython/src/mac/wx.py index 5e6aee5840..2618f654ee 100644 --- a/wxPython/src/mac/wx.py +++ b/wxPython/src/mac/wx.py @@ -46,75 +46,92 @@ class wxPyAppPtr(wxEvtHandlerPtr): def __init__(self,this): self.this = this self.thisown = 0 - def __del__(self,wxc=wxc): - if self.thisown == 1 : - wxc.delete_wxPyApp(self) + def __del__(self, delfunc=wxc.delete_wxPyApp): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def _setCallbackInfo(self, *_args, **_kwargs): + val = wxc.wxPyApp__setCallbackInfo(self, *_args, **_kwargs) + return val def GetAppName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetAppName,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetAppName(self, *_args, **_kwargs) return val def GetClassName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetClassName,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetClassName(self, *_args, **_kwargs) return val def GetExitOnFrameDelete(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetExitOnFrameDelete,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetExitOnFrameDelete(self, *_args, **_kwargs) return val def GetPrintMode(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetPrintMode,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetPrintMode(self, *_args, **_kwargs) return val def GetTopWindow(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetTopWindow,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetTopWindow(self, *_args, **_kwargs) return val def GetVendorName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetVendorName,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetVendorName(self, *_args, **_kwargs) return val def GetUseBestVisual(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetUseBestVisual,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetUseBestVisual(self, *_args, **_kwargs) return val def Dispatch(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_Dispatch,(self,) + _args, _kwargs) + val = wxc.wxPyApp_Dispatch(self, *_args, **_kwargs) return val def ExitMainLoop(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_ExitMainLoop,(self,) + _args, _kwargs) + val = wxc.wxPyApp_ExitMainLoop(self, *_args, **_kwargs) return val def Initialized(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_Initialized,(self,) + _args, _kwargs) + val = wxc.wxPyApp_Initialized(self, *_args, **_kwargs) return val def MainLoop(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_MainLoop,(self,) + _args, _kwargs) + val = wxc.wxPyApp_MainLoop(self, *_args, **_kwargs) return val def Pending(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_Pending,(self,) + _args, _kwargs) + val = wxc.wxPyApp_Pending(self, *_args, **_kwargs) return val def ProcessIdle(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_ProcessIdle,(self,) + _args, _kwargs) + val = wxc.wxPyApp_ProcessIdle(self, *_args, **_kwargs) + return val + def Yield(self, *_args, **_kwargs): + val = wxc.wxPyApp_Yield(self, *_args, **_kwargs) return val def SetAppName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetAppName,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetAppName(self, *_args, **_kwargs) return val def SetClassName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetClassName,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetClassName(self, *_args, **_kwargs) return val def SetExitOnFrameDelete(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetExitOnFrameDelete,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetExitOnFrameDelete(self, *_args, **_kwargs) return val def SetPrintMode(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetPrintMode,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetPrintMode(self, *_args, **_kwargs) return val def SetTopWindow(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetTopWindow,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetTopWindow(self, *_args, **_kwargs) return val def SetVendorName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetVendorName,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetVendorName(self, *_args, **_kwargs) return val def SetUseBestVisual(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetUseBestVisual,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetUseBestVisual(self, *_args, **_kwargs) + return val + def GetAssertMode(self, *_args, **_kwargs): + val = wxc.wxPyApp_GetAssertMode(self, *_args, **_kwargs) + return val + def SetAssertMode(self, *_args, **_kwargs): + val = wxc.wxPyApp_SetAssertMode(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyApp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyApp(wxPyAppPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(wxc.new_wxPyApp,_args,_kwargs) + self.this = wxc.new_wxPyApp(*_args,**_kwargs) self.thisown = 1 + self._setCallbackInfo(self, wxPyApp) + self._setOORInfo(self) @@ -142,12 +159,31 @@ _wxStart = wxc._wxStart _wxSetDictionary = wxc._wxSetDictionary def wxGetApp(*_args, **_kwargs): - val = apply(wxc.wxGetApp,_args,_kwargs) - if val: val = wxPyAppPtr(val) + val = wxc.wxGetApp(*_args,**_kwargs) return val wxApp_CleanUp = wxc.wxApp_CleanUp +wxPyApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts + +wxPyApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId + +wxPyApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId + +wxPyApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId + +wxPyApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName + +wxPyApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts + +wxPyApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId + +wxPyApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId + +wxPyApp_SetMacExitMenuItemId = wxc.wxPyApp_SetMacExitMenuItemId + +wxPyApp_SetMacHelpMenuTitleName = wxc.wxPyApp_SetMacHelpMenuTitleName + #-------------- VARIABLE WRAPPERS ------------------ @@ -182,6 +218,7 @@ wxSTAY_ON_TOP = wxc.wxSTAY_ON_TOP wxICONIZE = wxc.wxICONIZE wxMINIMIZE = wxc.wxMINIMIZE wxMAXIMIZE = wxc.wxMAXIMIZE +wxCLOSE_BOX = wxc.wxCLOSE_BOX wxTHICK_FRAME = wxc.wxTHICK_FRAME wxSYSTEM_MENU = wxc.wxSYSTEM_MENU wxMINIMIZE_BOX = wxc.wxMINIMIZE_BOX @@ -199,6 +236,7 @@ wxFRAME_TOOL_WINDOW = wxc.wxFRAME_TOOL_WINDOW wxFRAME_FLOAT_ON_PARENT = wxc.wxFRAME_FLOAT_ON_PARENT wxFRAME_NO_WINDOW_MENU = wxc.wxFRAME_NO_WINDOW_MENU wxFRAME_NO_TASKBAR = wxc.wxFRAME_NO_TASKBAR +wxFRAME_SHAPED = wxc.wxFRAME_SHAPED wxED_CLIENT_MARGIN = wxc.wxED_CLIENT_MARGIN wxED_BUTTONS_BOTTOM = wxc.wxED_BUTTONS_BOTTOM wxED_BUTTONS_RIGHT = wxc.wxED_BUTTONS_RIGHT @@ -208,15 +246,6 @@ wxCLIP_CHILDREN = wxc.wxCLIP_CHILDREN wxCLIP_SIBLINGS = wxc.wxCLIP_SIBLINGS wxRETAINED = wxc.wxRETAINED wxBACKINGSTORE = wxc.wxBACKINGSTORE -wxTB_HORIZONTAL = wxc.wxTB_HORIZONTAL -wxTB_VERTICAL = wxc.wxTB_VERTICAL -wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS -wxTB_FLAT = wxc.wxTB_FLAT -wxTB_DOCKABLE = wxc.wxTB_DOCKABLE -wxTB_NOICONS = wxc.wxTB_NOICONS -wxTB_TEXT = wxc.wxTB_TEXT -wxTB_NODIVIDER = wxc.wxTB_NODIVIDER -wxTB_NOALIGN = wxc.wxTB_NOALIGN wxCOLOURED = wxc.wxCOLOURED wxFIXED_LENGTH = wxc.wxFIXED_LENGTH wxALIGN_LEFT = wxc.wxALIGN_LEFT @@ -241,20 +270,6 @@ wxLB_OWNERDRAW = wxc.wxLB_OWNERDRAW wxLB_HSCROLL = wxc.wxLB_HSCROLL wxPROCESS_ENTER = wxc.wxPROCESS_ENTER wxPASSWORD = wxc.wxPASSWORD -wxTE_READONLY = wxc.wxTE_READONLY -wxTE_MULTILINE = wxc.wxTE_MULTILINE -wxTE_PROCESS_TAB = wxc.wxTE_PROCESS_TAB -wxTE_RICH = wxc.wxTE_RICH -wxTE_RICH2 = wxc.wxTE_RICH2 -wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL -wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL -wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER -wxTE_PASSWORD = wxc.wxTE_PASSWORD -wxTE_AUTO_URL = wxc.wxTE_AUTO_URL -wxTE_NOHIDESEL = wxc.wxTE_NOHIDESEL -wxTE_DONTWRAP = wxc.wxTE_DONTWRAP -wxTE_LINEWRAP = wxc.wxTE_LINEWRAP -wxTE_WORDWRAP = wxc.wxTE_WORDWRAP wxCB_SIMPLE = wxc.wxCB_SIMPLE wxCB_DROPDOWN = wxc.wxCB_DROPDOWN wxCB_SORT = wxc.wxCB_SORT @@ -264,6 +279,7 @@ wxRA_VERTICAL = wxc.wxRA_VERTICAL wxRA_SPECIFY_ROWS = wxc.wxRA_SPECIFY_ROWS wxRA_SPECIFY_COLS = wxc.wxRA_SPECIFY_COLS wxRB_GROUP = wxc.wxRB_GROUP +wxRB_SINGLE = wxc.wxRB_SINGLE wxGA_PROGRESSBAR = wxc.wxGA_PROGRESSBAR wxGA_HORIZONTAL = wxc.wxGA_HORIZONTAL wxGA_VERTICAL = wxc.wxGA_VERTICAL @@ -289,18 +305,6 @@ wxBU_TOP = wxc.wxBU_TOP wxBU_RIGHT = wxc.wxBU_RIGHT wxBU_BOTTOM = wxc.wxBU_BOTTOM wxBU_EXACTFIT = wxc.wxBU_EXACTFIT -wxSP_VERTICAL = wxc.wxSP_VERTICAL -wxSP_HORIZONTAL = wxc.wxSP_HORIZONTAL -wxSP_ARROW_KEYS = wxc.wxSP_ARROW_KEYS -wxSP_WRAP = wxc.wxSP_WRAP -wxSP_NOBORDER = wxc.wxSP_NOBORDER -wxSP_3D = wxc.wxSP_3D -wxSP_3DSASH = wxc.wxSP_3DSASH -wxSP_3DBORDER = wxc.wxSP_3DBORDER -wxSP_FULLSASH = wxc.wxSP_FULLSASH -wxSP_BORDER = wxc.wxSP_BORDER -wxSP_LIVE_UPDATE = wxc.wxSP_LIVE_UPDATE -wxSP_PERMIT_UNSPLIT = wxc.wxSP_PERMIT_UNSPLIT wxFLOOD_SURFACE = wxc.wxFLOOD_SURFACE wxFLOOD_BORDER = wxc.wxFLOOD_BORDER wxODDEVEN_RULE = wxc.wxODDEVEN_RULE @@ -344,6 +348,8 @@ wxPRINT_QUALITY_HIGH = wxc.wxPRINT_QUALITY_HIGH wxPRINT_QUALITY_MEDIUM = wxc.wxPRINT_QUALITY_MEDIUM wxPRINT_QUALITY_LOW = wxc.wxPRINT_QUALITY_LOW wxPRINT_QUALITY_DRAFT = wxc.wxPRINT_QUALITY_DRAFT +wxID_ANY = wxc.wxID_ANY +wxID_SEPARATOR = wxc.wxID_SEPARATOR wxID_OPEN = wxc.wxID_OPEN wxID_CLOSE = wxc.wxID_CLOSE wxID_NEW = wxc.wxID_NEW @@ -370,6 +376,18 @@ wxID_CLEAR = wxc.wxID_CLEAR wxID_FIND = wxc.wxID_FIND wxID_DUPLICATE = wxc.wxID_DUPLICATE wxID_SELECTALL = wxc.wxID_SELECTALL +wxID_DELETE = wxc.wxID_DELETE +wxID_REPLACE = wxc.wxID_REPLACE +wxID_REPLACE_ALL = wxc.wxID_REPLACE_ALL +wxID_PROPERTIES = wxc.wxID_PROPERTIES +wxID_VIEW_DETAILS = wxc.wxID_VIEW_DETAILS +wxID_VIEW_LARGEICONS = wxc.wxID_VIEW_LARGEICONS +wxID_VIEW_SMALLICONS = wxc.wxID_VIEW_SMALLICONS +wxID_VIEW_LIST = wxc.wxID_VIEW_LIST +wxID_VIEW_SORTDATE = wxc.wxID_VIEW_SORTDATE +wxID_VIEW_SORTNAME = wxc.wxID_VIEW_SORTNAME +wxID_VIEW_SORTSIZE = wxc.wxID_VIEW_SORTSIZE +wxID_VIEW_SORTTYPE = wxc.wxID_VIEW_SORTTYPE wxID_FILE1 = wxc.wxID_FILE1 wxID_FILE2 = wxc.wxID_FILE2 wxID_FILE3 = wxc.wxID_FILE3 @@ -434,11 +452,6 @@ wxSTRETCH_NOT = wxc.wxSTRETCH_NOT wxSHRINK = wxc.wxSHRINK wxGROW = wxc.wxGROW wxEXPAND = wxc.wxEXPAND -wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH -wxNB_LEFT = wxc.wxNB_LEFT -wxNB_RIGHT = wxc.wxNB_RIGHT -wxNB_BOTTOM = wxc.wxNB_BOTTOM -wxNB_MULTILINE = wxc.wxNB_MULTILINE wxLI_HORIZONTAL = wxc.wxLI_HORIZONTAL wxLI_VERTICAL = wxc.wxLI_VERTICAL wxJOYSTICK1 = wxc.wxJOYSTICK1 @@ -451,6 +464,9 @@ wxJOY_BUTTON_ANY = wxc.wxJOY_BUTTON_ANY wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY wxWS_EX_BLOCK_EVENTS = wxc.wxWS_EX_BLOCK_EVENTS wxWS_EX_TRANSIENT = wxc.wxWS_EX_TRANSIENT +wxWS_EX_THEMED_BACKGROUND = wxc.wxWS_EX_THEMED_BACKGROUND +wxWS_EX_PROCESS_IDLE = wxc.wxWS_EX_PROCESS_IDLE +wxWS_EX_PROCESS_UI_UPDATES = wxc.wxWS_EX_PROCESS_UI_UPDATES wxMM_TEXT = wxc.wxMM_TEXT wxMM_LOMETRIC = wxc.wxMM_LOMETRIC wxMM_HIMETRIC = wxc.wxMM_HIMETRIC @@ -463,6 +479,11 @@ wxMM_POINTS = wxc.wxMM_POINTS wxMM_METRIC = wxc.wxMM_METRIC wxTIMER_CONTINUOUS = wxc.wxTIMER_CONTINUOUS wxTIMER_ONE_SHOT = wxc.wxTIMER_ONE_SHOT +wxMOUSE_BTN_ANY = wxc.wxMOUSE_BTN_ANY +wxMOUSE_BTN_NONE = wxc.wxMOUSE_BTN_NONE +wxMOUSE_BTN_LEFT = wxc.wxMOUSE_BTN_LEFT +wxMOUSE_BTN_MIDDLE = wxc.wxMOUSE_BTN_MIDDLE +wxMOUSE_BTN_RIGHT = wxc.wxMOUSE_BTN_RIGHT wxBORDER_DEFAULT = wxc.wxBORDER_DEFAULT wxBORDER_NONE = wxc.wxBORDER_NONE wxBORDER_STATIC = wxc.wxBORDER_STATIC @@ -624,6 +645,9 @@ WXK_NUMPAD_SEPARATOR = wxc.WXK_NUMPAD_SEPARATOR WXK_NUMPAD_SUBTRACT = wxc.WXK_NUMPAD_SUBTRACT WXK_NUMPAD_DECIMAL = wxc.WXK_NUMPAD_DECIMAL WXK_NUMPAD_DIVIDE = wxc.WXK_NUMPAD_DIVIDE +WXK_WINDOWS_LEFT = wxc.WXK_WINDOWS_LEFT +WXK_WINDOWS_RIGHT = wxc.WXK_WINDOWS_RIGHT +WXK_WINDOWS_MENU = wxc.WXK_WINDOWS_MENU wxBITMAP_TYPE_INVALID = wxc.wxBITMAP_TYPE_INVALID wxBITMAP_TYPE_BMP = wxc.wxBITMAP_TYPE_BMP wxBITMAP_TYPE_BMP_RESOURCE = wxc.wxBITMAP_TYPE_BMP_RESOURCE @@ -778,10 +802,14 @@ wxHT_WINDOW_VERT_SCROLLBAR = wxc.wxHT_WINDOW_VERT_SCROLLBAR wxHT_WINDOW_HORZ_SCROLLBAR = wxc.wxHT_WINDOW_HORZ_SCROLLBAR wxHT_WINDOW_CORNER = wxc.wxHT_WINDOW_CORNER wxHT_MAX = wxc.wxHT_MAX -FALSE = wxc.FALSE -false = wxc.false -TRUE = wxc.TRUE -true = wxc.true +wxMOD_NONE = wxc.wxMOD_NONE +wxMOD_ALT = wxc.wxMOD_ALT +wxMOD_CONTROL = wxc.wxMOD_CONTROL +wxMOD_SHIFT = wxc.wxMOD_SHIFT +wxMOD_WIN = wxc.wxMOD_WIN +wxUPDATE_UI_NONE = wxc.wxUPDATE_UI_NONE +wxUPDATE_UI_RECURSE = wxc.wxUPDATE_UI_RECURSE +wxUPDATE_UI_FROMIDLE = wxc.wxUPDATE_UI_FROMIDLE wxEVT_NULL = wxc.wxEVT_NULL wxEVT_FIRST = wxc.wxEVT_FIRST wxEVT_COMMAND_BUTTON_CLICKED = wxc.wxEVT_COMMAND_BUTTON_CLICKED @@ -839,6 +867,7 @@ wxEVT_CHAR = wxc.wxEVT_CHAR wxEVT_KEY_DOWN = wxc.wxEVT_KEY_DOWN wxEVT_KEY_UP = wxc.wxEVT_KEY_UP wxEVT_CHAR_HOOK = wxc.wxEVT_CHAR_HOOK +wxEVT_HOTKEY = wxc.wxEVT_HOTKEY wxEVT_SCROLL_TOP = wxc.wxEVT_SCROLL_TOP wxEVT_SCROLL_BOTTOM = wxc.wxEVT_SCROLL_BOTTOM wxEVT_SCROLL_LINEUP = wxc.wxEVT_SCROLL_LINEUP @@ -847,6 +876,7 @@ wxEVT_SCROLL_PAGEUP = wxc.wxEVT_SCROLL_PAGEUP wxEVT_SCROLL_PAGEDOWN = wxc.wxEVT_SCROLL_PAGEDOWN wxEVT_SCROLL_THUMBTRACK = wxc.wxEVT_SCROLL_THUMBTRACK wxEVT_SCROLL_THUMBRELEASE = wxc.wxEVT_SCROLL_THUMBRELEASE +wxEVT_SCROLL_ENDSCROLL = wxc.wxEVT_SCROLL_ENDSCROLL wxEVT_SCROLLWIN_TOP = wxc.wxEVT_SCROLLWIN_TOP wxEVT_SCROLLWIN_BOTTOM = wxc.wxEVT_SCROLLWIN_BOTTOM wxEVT_SCROLLWIN_LINEUP = wxc.wxEVT_SCROLLWIN_LINEUP @@ -857,6 +887,8 @@ wxEVT_SCROLLWIN_THUMBTRACK = wxc.wxEVT_SCROLLWIN_THUMBTRACK wxEVT_SCROLLWIN_THUMBRELEASE = wxc.wxEVT_SCROLLWIN_THUMBRELEASE wxEVT_SIZE = wxc.wxEVT_SIZE wxEVT_MOVE = wxc.wxEVT_MOVE +wxEVT_SIZING = wxc.wxEVT_SIZING +wxEVT_MOVING = wxc.wxEVT_MOVING wxEVT_CLOSE_WINDOW = wxc.wxEVT_CLOSE_WINDOW wxEVT_END_SESSION = wxc.wxEVT_END_SESSION wxEVT_QUERY_END_SESSION = wxc.wxEVT_QUERY_END_SESSION @@ -901,17 +933,20 @@ wxEVT_COMMAND_KILL_FOCUS = wxc.wxEVT_COMMAND_KILL_FOCUS wxEVT_COMMAND_ENTER = wxc.wxEVT_COMMAND_ENTER wxEVT_NAVIGATION_KEY = wxc.wxEVT_NAVIGATION_KEY wxEVT_TIMER = wxc.wxEVT_TIMER -__version__ = wxc.__version__ cvar = wxc.cvar wxDefaultPosition = wxPointPtr(wxc.cvar.wxDefaultPosition) wxDefaultSize = wxSizePtr(wxc.cvar.wxDefaultSize) +wxPYAPP_ASSERT_SUPPRESS = wxc.wxPYAPP_ASSERT_SUPPRESS +wxPYAPP_ASSERT_EXCEPTION = wxc.wxPYAPP_ASSERT_EXCEPTION +wxPYAPP_ASSERT_DIALOG = wxc.wxPYAPP_ASSERT_DIALOG +wxPYAPP_ASSERT_LOG = wxc.wxPYAPP_ASSERT_LOG #-------------- USER INCLUDE ----------------------- #---------------------------------------------------------------------------- # Name: _extra.py -# Purpose: This file is appended to the shadow class file generated +# Purpose: This file is appended to the shadow class file generated # by SWIG. We add some unSWIGable things here. # # Author: Robin Dunn @@ -952,6 +987,12 @@ def EVT_SIZE(win, func): def EVT_MOVE(win, func): win.Connect(-1, -1, wxEVT_MOVE, func) +def EVT_SIZING(win, func): + win.Connect(-1, -1, wxEVT_SIZING, func) + +def EVT_MOVING(win, func): + win.Connect(-1, -1, wxEVT_MOVING, func) + def EVT_CLOSE(win, func): win.Connect(-1, -1, wxEVT_CLOSE_WINDOW, func) @@ -973,6 +1014,9 @@ def EVT_KEY_DOWN(win, func): def EVT_KEY_UP(win, func): win.Connect(-1, -1, wxEVT_KEY_UP, func) +def EVT_HOTKEY(win, func): + win.Connect(-1, -1, wxEVT_HOTKEY, func) + def EVT_MENU_OPEN(win, func): win.Connect(-1, -1, wxEVT_MENU_OPEN, func) @@ -1042,6 +1086,12 @@ def EVT_WINDOW_CREATE(win, func): def EVT_WINDOW_DESTROY(win, func): win.Connect(-1, -1, wxEVT_DESTROY, func) +def EVT_WINDOW_CREATE_ID(win, id, func): + win.Connect(id, -1, wxEVT_CREATE, func) + +def EVT_WINDOW_DESTROY_ID(win, id, func): + win.Connect(id, -1, wxEVT_DESTROY, func) + def EVT_SET_CURSOR(win, func): win.Connect(-1, -1, wxEVT_SET_CURSOR, func) @@ -1125,14 +1175,15 @@ def EVT_COMMAND_RANGE(win, id1, id2, cmd, func): # Scrolling def EVT_SCROLL(win, func): - win.Connect(-1, -1, wxEVT_SCROLL_TOP, func) - win.Connect(-1, -1, wxEVT_SCROLL_BOTTOM, func) - win.Connect(-1, -1, wxEVT_SCROLL_LINEUP, func) - win.Connect(-1, -1, wxEVT_SCROLL_LINEDOWN, func) - win.Connect(-1, -1, wxEVT_SCROLL_PAGEUP, func) - win.Connect(-1, -1, wxEVT_SCROLL_PAGEDOWN, func) - win.Connect(-1, -1, wxEVT_SCROLL_THUMBTRACK,func) + win.Connect(-1, -1, wxEVT_SCROLL_TOP, func) + win.Connect(-1, -1, wxEVT_SCROLL_BOTTOM, func) + win.Connect(-1, -1, wxEVT_SCROLL_LINEUP, func) + win.Connect(-1, -1, wxEVT_SCROLL_LINEDOWN, func) + win.Connect(-1, -1, wxEVT_SCROLL_PAGEUP, func) + win.Connect(-1, -1, wxEVT_SCROLL_PAGEDOWN, func) + win.Connect(-1, -1, wxEVT_SCROLL_THUMBTRACK, func) win.Connect(-1, -1, wxEVT_SCROLL_THUMBRELEASE,func) + win.Connect(-1, -1, wxEVT_SCROLL_ENDSCROLL, func) def EVT_SCROLL_TOP(win, func): win.Connect(-1, -1, wxEVT_SCROLL_TOP, func) @@ -1158,6 +1209,9 @@ def EVT_SCROLL_THUMBTRACK(win, func): def EVT_SCROLL_THUMBRELEASE(win, func): win.Connect(-1, -1, wxEVT_SCROLL_THUMBRELEASE, func) +def EVT_SCROLL_ENDSCROLL(win, func): + win.Connect(-1, -1, wxEVT_SCROLL_ENDSCROLL, func) + # Scrolling, with an id @@ -1170,6 +1224,7 @@ def EVT_COMMAND_SCROLL(win, id, func): win.Connect(id, -1, wxEVT_SCROLL_PAGEDOWN, func) win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func) win.Connect(id, -1, wxEVT_SCROLL_THUMBRELEASE,func) + win.Connect(id, -1, wxEVT_SCROLL_ENDSCROLL, func) def EVT_COMMAND_SCROLL_TOP(win, id, func): win.Connect(id, -1, wxEVT_SCROLL_TOP, func) @@ -1195,6 +1250,9 @@ def EVT_COMMAND_SCROLL_THUMBTRACK(win, id, func): def EVT_COMMAND_SCROLL_THUMBRELEASE(win, id, func): win.Connect(id, -1, wxEVT_SCROLL_THUMBRELEASE, func) +def EVT_COMMAND_SCROLL_ENDSCROLL(win, id, func): + win.Connect(id, -1, wxEVT_SCROLL_ENDSCROLL, func) + #--- def EVT_SCROLLWIN(win, func): win.Connect(-1, -1, wxEVT_SCROLLWIN_TOP, func) @@ -1364,14 +1422,6 @@ def EVT_COMMAND_ENTER(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_ENTER, func) -# wxNotebook events -def EVT_NOTEBOOK_PAGE_CHANGED(win, id, func): - win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, func) - -def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func): - win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func) - - # wxSpinButton def EVT_SPIN_UP(win, id, func): win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func) @@ -1383,29 +1433,6 @@ def EVT_SPIN(win, id, func): win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func) -# wxTaskBarIcon -def EVT_TASKBAR_MOVE(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func) - -def EVT_TASKBAR_LEFT_DOWN(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DOWN, func) - -def EVT_TASKBAR_LEFT_UP(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_UP, func) - -def EVT_TASKBAR_RIGHT_DOWN(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DOWN, func) - -def EVT_TASKBAR_RIGHT_UP(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_UP, func) - -def EVT_TASKBAR_LEFT_DCLICK(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DCLICK, func) - -def EVT_TASKBAR_RIGHT_DCLICK(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func) - - # wxSashWindow def EVT_SASH_DRAGGED(win, id, func): win.Connect(id, -1, wxEVT_SASH_DRAGGED, func) @@ -1414,10 +1441,10 @@ def EVT_SASH_DRAGGED_RANGE(win, id1, id2, func): win.Connect(id1, id2, wxEVT_SASH_DRAGGED, func) def EVT_QUERY_LAYOUT_INFO(win, func): - win.Connect(-1, -1, wxEVT_EVT_QUERY_LAYOUT_INFO, func) + win.Connect(-1, -1, wxEVT_QUERY_LAYOUT_INFO, func) def EVT_CALCULATE_LAYOUT(win, func): - win.Connect(-1, -1, wxEVT_EVT_CALCULATE_LAYOUT, func) + win.Connect(-1, -1, wxEVT_CALCULATE_LAYOUT, func) #wxSplitterWindow @@ -1490,17 +1517,52 @@ wxColor = wxColour wxNamedColor = wxNamedColour wxPen = wxPyPen wxScrollbar = wxScrollBar +wxPoint2D = wxPoint2DDouble + +wxPyAssertionError = wxc.wxPyAssertionError # backwards compatibility -wxNoRefBitmap = wxBitmap -wxPyDefaultPosition = wxDefaultPosition -wxPyDefaultSize = wxDefaultSize -NULL = None +wxNoRefBitmap = wxBitmap +wxPyDefaultPosition = wxDefaultPosition +wxPyDefaultSize = wxDefaultSize +NULL = None wxSystemSettings_GetSystemColour = wxSystemSettings_GetColour wxSystemSettings_GetSystemFont = wxSystemSettings_GetFont wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric + +# workarounds for bad wxRTTI names +__wxPyPtrTypeMap['wxGauge95'] = 'wxGauge' +__wxPyPtrTypeMap['wxSlider95'] = 'wxSlider' +__wxPyPtrTypeMap['wxStatusBar95'] = 'wxStatusBar' + + + +def NewId(): + import warnings + warnings.warn("Use wxNewId instead", DeprecationWarning, 2) + return wxNewId() + +def RegisterId(ID): + import warnings + warnings.warn("Use wxRegisterId instead", DeprecationWarning, 2) + return wxRegisterId(ID) + + + +# Use Python's bool constants if available, make aliases if not +try: + True +except NameError: + True = 1==1 + False = 1==0 + +# Backwards compaatible +TRUE = true = True +FALSE = false = False + + #---------------------------------------------------------------------- # wxGTK sets the locale when initialized. Doing this at the Python # level should set it up to match what GTK is doing at the C level. @@ -1511,18 +1573,26 @@ if wxPlatform == "__WXGTK__": except: pass - +# On MSW add the directory where the wxWindows catalogs were installed +# to the default catalog path. +if wxPlatform == "__WXMSW__": + import os + localedir = os.path.join(os.path.split(__file__)[0], "locale") + wxLocale_AddCatalogLookupPathPrefix(localedir) + del os #---------------------------------------------------------------------- -# wxWindows version numbers. wxPython version is in __version__. +# Load version numbers from __version__... Ensure that major and minor +# versions are the same for both wxPython and wxWindows. -wxMAJOR_VERSION = wxc.wxMAJOR_VERSION -wxMINOR_VERSION = wxc.wxMINOR_VERSION -wxRELEASE_NUMBER = wxc.wxRELEASE_NUMBER -wxVERSION_STRING = wxc.wxVERSION_STRING -wxVERSION_NUMBER = wxc.wxVERSION_NUMBER +from wxPython.__version__ import * +__version__ = wxVERSION_STRING -wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) +assert wxMAJOR_VERSION == wxc.wxMAJOR_VERSION, "wxPython/wxWindows version mismatch" +assert wxMINOR_VERSION == wxc.wxMINOR_VERSION, "wxPython/wxWindows version mismatch" +if wxRELEASE_VERSION != wxc.wxRELEASE_VERSION: + import warnings + warnings.warn("wxPython/wxWindows release number mismatch") #---------------------------------------------------------------------- @@ -1563,6 +1633,18 @@ def wxPyTypeCast(obj, typeStr): theObj.thisown = obj.thisown return theObj +#---------------------------------------------------------------------------- +# An isinstance for Pythons < 2.2 that can check a sequence of class objects +# like the one in 2.2 can. + +def wxPy_isinstance(obj, klasses): + import types + if sys.version[:3] < "2.2" and type(klasses) in [types.TupleType, types.ListType]: + for klass in klasses: + if isinstance(obj, klass): return True + return False + else: + return isinstance(obj, klasses) #---------------------------------------------------------------------------- _wxCallAfterId = None @@ -1570,16 +1652,17 @@ _wxCallAfterId = None def wxCallAfter(callable, *args, **kw): """ Call the specified function after the current and pending event - handlers have been completed. + handlers have been completed. This is also good for making GUI + method calls from non-GUI threads. """ app = wxGetApp() assert app, 'No wxApp created yet' global _wxCallAfterId if _wxCallAfterId is None: - _wxCallAfterId = wxNewId() + _wxCallAfterId = wxNewEventType() app.Connect(-1, -1, _wxCallAfterId, - lambda event: apply(event.callable, event.args, event.kw) ) + lambda event: event.callable(*event.args, **event.kw) ) evt = wxPyEvent() evt.SetEventType(_wxCallAfterId) evt.callable = callable @@ -1587,6 +1670,98 @@ def wxCallAfter(callable, *args, **kw): evt.kw = kw wxPostEvent(app, evt) + +#---------------------------------------------------------------------- + + +class wxFutureCall: + """ + A convenience class for wxTimer, that calls the given callable + object once after the given amount of milliseconds, passing any + positional or keyword args. The return value of the callable is + availbale after it has been run with the GetResult method. + + If you don't need to get the return value or restart the timer + then there is no need to hold a reference to this object. It will + hold a reference to itself while the timer is running (the timer + has a reference to self.Notify) but the cycle will be broken when + the timer completes, automatically cleaning up the wxFutureCall + object. + """ + def __init__(self, millis, callable, *args, **kwargs): + self.millis = millis + self.callable = callable + self.SetArgs(*args, **kwargs) + self.runCount = 0 + self.hasRun = False + self.result = None + self.timer = None + self.Start() + + def __del__(self): + self.Stop() + + + def Start(self, millis=None): + """ + (Re)start the timer + """ + self.hasRun = False + if millis is not None: + self.millis = millis + self.Stop() + self.timer = wxPyTimer(self.Notify) + self.timer.Start(self.millis, wxTIMER_ONE_SHOT) + Restart = Start + + + def Stop(self): + """ + Stop and destroy the timer. + """ + if self.timer is not None: + self.timer.Stop() + self.timer = None + + + def GetInterval(self): + if self.timer is not None: + return self.timer.GetInterval() + else: + return 0 + + + def IsRunning(self): + return self.timer is not None and self.timer.IsRunning() + + + def SetArgs(self, *args, **kwargs): + """ + (Re)set the args passed to the callable object. This is + useful in conjunction with Restart if you want to schedule a + new call to the same callable object but with different + parameters. + """ + self.args = args + self.kwargs = kwargs + + def HasRun(self): + return self.hasRun + + def GetResult(self): + return self.result + + def Notify(self): + """ + The timer has expired so call the callable. + """ + if self.callable and getattr(self.callable, 'im_self', True): + self.runCount += 1 + self.result = self.callable(*self.args, **self.kwargs) + self.hasRun = True + wxCallAfter(self.Stop) + + #---------------------------------------------------------------------- class wxPyDeadObjectError(AttributeError): @@ -1615,6 +1790,35 @@ class _wxPyDeadObject: return 0 +#---------------------------------------------------------------------- + +class wxNotebookPage(wxPanel): + """ + There is an old (and apparently unsolvable) bug when placing a + window with a nonstandard background colour in a wxNotebook on + wxGTK, as the notbooks's background colour would always be used + when the window is refreshed. The solution is to place a panel in + the notbook and the coloured window on the panel, sized to cover + the panel. This simple class does that for you, just put an + instance of this in the notebook and make your regular window a + child of this one and it will handle the resize for you. + """ + def __init__(self, parent, id=-1, + pos=wxDefaultPosition, size=wxDefaultSize, + style=wxTAB_TRAVERSAL, name="panel"): + wxPanel.__init__(self, parent, id, pos, size, style, name) + self.child = None + EVT_SIZE(self, self.OnSize) + def OnSize(self, evt): + if self.child is None: + children = self.GetChildren() + if len(children): + self.child = children[0] + if self.child: + self.child.SetPosition((0,0)) + self.child.SetSize(self.GetSize()) + + #---------------------------------------------------------------------- #---------------------------------------------------------------------- @@ -1646,7 +1850,7 @@ class wxPyOnDemandOutputWindow: self.text = wxTextCtrl(self.frame, -1, "", style = wxTE_MULTILINE|wxTE_READONLY) self.frame.SetSize(wxSize(450, 300)) - self.frame.Show(true) + self.frame.Show(True) EVT_CLOSE(self.frame, self.OnCloseWindow) self.text.AppendText(str) @@ -1667,12 +1871,38 @@ class wxApp(wxPyApp): error = 'wxApp.error' outputWindowClass = wxPyOnDemandOutputWindow - def __init__(self, redirect=_defRedirect, filename=None): + def __init__(self, redirect=_defRedirect, filename=None, useBestVisual=False): wxPyApp.__init__(self) + + if wx.wxPlatform == "__WXMAC__": + try: + import MacOS + if not MacOS.WMAvailable(): + print """This program needs access to the screen. Please run with +'pythonw', not 'python', and only when you are logged in on the main display +of your Mac.""" + sys.exit(1) + except: + pass + self.stdioWin = None self.saveStdio = (sys.stdout, sys.stderr) + + # This has to be done before OnInit + self.SetUseBestVisual(useBestVisual) + if redirect: self.RedirectStdio(filename) + + # Set the default handler for SIGINT. This fixes a problem + # where if Ctrl-C is pressed in the console that started this + # app then it will not appear to do anything, (not even send + # KeyboardInterrupt???) but will later segfault on exit. By + # setting the default handler then the app will exit, as + # expected (depending on platform.) + import signal + signal.signal(signal.SIGINT, signal.SIG_DFL) + # this initializes wxWindows and then calls our OnInit _wxStart(self.OnInit) @@ -1699,7 +1929,7 @@ class wxApp(wxPyApp): if filename: sys.stdout = sys.stderr = open(filename, 'a') else: - self.stdioWin = self.outputWindowClass() # wxPyOnDemandOutputWindow + self.stdioWin = self.outputWindowClass() sys.stdout = sys.stderr = self.stdioWin @@ -1707,13 +1937,27 @@ class wxApp(wxPyApp): sys.stdout, sys.stderr = self.saveStdio +# change from wxPyApp_ to wxApp_ +wxApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts +wxApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId +wxApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId +wxApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId +wxApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName +wxApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts +wxApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId +wxApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId +wxApp_SetMacExitMenuItemId = wxc.wxPyApp_SetMacExitMenuItemId +wxApp_SetMacHelpMenuTitleName = wxc.wxPyApp_SetMacHelpMenuTitleName + + #---------------------------------------------------------------------------- class wxPySimpleApp(wxApp): def __init__(self, flag=0): wxApp.__init__(self, flag) def OnInit(self): - return true + wxInitAllImageHandlers() + return True class wxPyWidgetTester(wxApp): @@ -1724,11 +1968,11 @@ class wxPyWidgetTester(wxApp): def OnInit(self): self.frame = wxFrame(None, -1, "Widget Tester", pos=(0,0), size=self.size) self.SetTopWindow(self.frame) - return true + return True def SetWidget(self, widgetClass, *args): - w = apply(widgetClass, (self.frame,) + args) - self.frame.Show(true) + w = widgetClass(self.frame, *args) + self.frame.Show(True) #---------------------------------------------------------------------------- # DO NOT hold any other references to this object. This is how we