X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0812732316f715a480526cedcd481e7fc31a130c..e02c03a42ea85be1e908962c8a344fb2553e7c3e:/utils/wxPython/src/_extras.py diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py index 2c9749c0c8..24a2e61146 100644 --- a/utils/wxPython/src/_extras.py +++ b/utils/wxPython/src/_extras.py @@ -35,8 +35,9 @@ def _StdWindowCallbacks(win): _checkForCallback(win, "OnEraseBackground", wxEVT_ERASE_BACKGROUND) _checkForCallback(win, "OnSysColourChanged", wxEVT_SYS_COLOUR_CHANGED) _checkForCallback(win, "OnInitDialog", wxEVT_INIT_DIALOG) - _checkForCallback(win, "OnIdle", wxEVT_IDLE) _checkForCallback(win, "OnPaint", wxEVT_PAINT) + _checkForCallback(win, "OnIdle", wxEVT_IDLE) + def _StdFrameCallbacks(win): _StdWindowCallbacks(win) @@ -54,7 +55,7 @@ def _StdDialogCallbacks(win): _checkForCallback(win, "OnCharHook", wxEVT_CHAR_HOOK) -def _StdOnScrollCallback(win): +def _StdOnScrollCallbacks(win): try: cb = getattr(win, "OnScroll") except: pass else: EVT_SCROLL(win, cb) @@ -88,6 +89,12 @@ def EVT_CHAR(win, func): def EVT_CHAR_HOOK(win, func): win.Connect(-1, -1, wxEVT_CHAR_HOOK, func) +def EVT_KEY_DOWN(win, func): + win.Connect(-1, -1, wxEVT_KEY_DOWN, func) + +def EVT_KEY_UP(win, func): + win.Connect(-1, -1, wxEVT_KEY_UP, func) + def EVT_MENU_HIGHLIGHT(win, id, func): win.Connect(id, -1, wxEVT_MENU_HIGHLIGHT, func) @@ -133,6 +140,29 @@ def EVT_ICONIZE(win, func): def EVT_NAVIGATION_KEY(win, func): win.Connect(-1, -1, wxEVT_NAVIGATION_KEY, func) +def EVT_PALETTE_CHANGED(win, func): + win.Connect(-1, -1, wxEVT_PALETTE_CHANGED, func) + +def EVT_QUERY_NEW_PALETTE(win, func): + win.Connect(-1, -1, wxEVT_QUERY_NEW_PALETTE, func) + +def EVT_WINDOW_CREATE(win, func): + win.Connect(-1, -1, wxEVT_CREATE, func) + +def EVT_WINDOW_DESTROY(win, func): + win.Connect(-1, -1, wxEVT_DESTROY, func) + + + +def EVT_IDLE(win, func): + win.Connect(-1, -1, wxEVT_IDLE, func) + +def EVT_UPDATE_UI(win, id, func): + win.Connect(id, -1, wxEVT_UPDATE_UI, func) + +def EVT_UPDATE_UI_RANGE(win, id, id2, func): + win.Connect(id, id2, wxEVT_UPDATE_UI, func) + # Mouse Events def EVT_LEFT_DOWN(win, func): @@ -258,6 +288,69 @@ def EVT_COMMAND_SCROLL_PAGEDOWN(win, id, func): def EVT_COMMAND_SCROLL_THUMBTRACK(win, id, func): win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK, func) +#--- +def EVT_SCROLLWIN(win, func): + win.Connect(-1, -1, wxEVT_SCROLLWIN_TOP, func) + win.Connect(-1, -1, wxEVT_SCROLLWIN_BOTTOM, func) + win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEUP, func) + win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEDOWN, func) + win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEUP, func) + win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEDOWN, func) + win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBTRACK,func) + +def EVT_SCROLLWIN_TOP(win, func): + win.Connect(-1, -1, wxEVT_SCROLLWIN_TOP, func) + +def EVT_SCROLLWIN_BOTTOM(win, func): + win.Connect(-1, -1, wxEVT_SCROLLWIN_BOTTOM, func) + +def EVT_SCROLLWIN_LINEUP(win, func): + win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEUP, func) + +def EVT_SCROLLWIN_LINEDOWN(win, func): + win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEDOWN, func) + +def EVT_SCROLLWIN_PAGEUP(win, func): + win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEUP, func) + +def EVT_SCROLLWIN_PAGEDOWN(win, func): + win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEDOWN, func) + +def EVT_SCROLLWIN_THUMBTRACK(win, func): + win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBTRACK, func) + + + +# Scrolling, with an id +def EVT_COMMAND_SCROLLWIN(win, id, func): + win.Connect(id, -1, wxEVT_SCROLLWIN_TOP, func) + win.Connect(id, -1, wxEVT_SCROLLWIN_BOTTOM, func) + win.Connect(id, -1, wxEVT_SCROLLWIN_LINEUP, func) + win.Connect(id, -1, wxEVT_SCROLLWIN_LINEDOWN, func) + win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEUP, func) + win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEDOWN, func) + win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBTRACK,func) + +def EVT_COMMAND_SCROLLWIN_TOP(win, id, func): + win.Connect(id, -1, wxEVT_SCROLLWIN_TOP, func) + +def EVT_COMMAND_SCROLLWIN_BOTTOM(win, id, func): + win.Connect(id, -1, wxEVT_SCROLLWIN_BOTTOM, func) + +def EVT_COMMAND_SCROLLWIN_LINEUP(win, id, func): + win.Connect(id, -1, wxEVT_SCROLLWIN_LINEUP, func) + +def EVT_COMMAND_SCROLLWIN_LINEDOWN(win, id, func): + win.Connect(id, -1, wxEVT_SCROLLWIN_LINEDOWN, func) + +def EVT_COMMAND_SCROLLWIN_PAGEUP(win, id, func): + win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEUP, func) + +def EVT_COMMAND_SCROLLWIN_PAGEDOWN(win, id, func): + win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEDOWN, func) + +def EVT_COMMAND_SCROLLWIN_THUMBTRACK(win, id, func): + win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBTRACK, func) # Convenience commands def EVT_BUTTON(win, id, func): @@ -305,15 +398,25 @@ def EVT_COMBOBOX(win, id, func): def EVT_TOOL(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TOOL_CLICKED, func) +def EVT_TOOL_RANGE(win, id, id2, func): + win.Connect(id, id2, wxEVT_COMMAND_TOOL_CLICKED, func) + def EVT_TOOL_RCLICKED(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TOOL_RCLICKED, func) +def EVT_TOOL_RCLICKED_RANGE(win, id, id2, func): + win.Connect(id, id2, wxEVT_COMMAND_TOOL_RCLICKED, func) + def EVT_TOOL_ENTER(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TOOL_ENTER, func) def EVT_CHECKLISTBOX(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, func) +def EVT_SPINCTRL(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_SPINCTRL_UPDATED, func) + + # Generic command events @@ -390,6 +493,15 @@ def EVT_TREE_KEY_DOWN(win, id, func): def EVT_TREE_DELETE_ITEM(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_DELETE_ITEM, func) +def EVT_TREE_ITEM_ACTIVATED(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_ACTIVATED, func) + +def EVT_TREE_ITEM_RIGHT_CLICK(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, func) + +def EVT_TREE_ITEM_MIDDLE_CLICK(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, func) + # wxSpinButton def EVT_SPIN_UP(win, id, func): @@ -476,6 +588,69 @@ def EVT_CALCULATE_LAYOUT(win, func): win.Connect(-1, -1, wxEVT_EVT_CALCULATE_LAYOUT, func) +# wxListCtrl +def EVT_LIST_BEGIN_DRAG(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_BEGIN_DRAG, func) + +def EVT_LIST_BEGIN_RDRAG(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_BEGIN_RDRAG, func) + +def EVT_LIST_BEGIN_LABEL_EDIT(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, func) + +def EVT_LIST_END_LABEL_EDIT(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_END_LABEL_EDIT, func) + +def EVT_LIST_DELETE_ITEM(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_DELETE_ITEM, func) + +def EVT_LIST_DELETE_ALL_ITEMS(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, func) + +def EVT_LIST_GET_INFO(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_GET_INFO, func) + +def EVT_LIST_SET_INFO(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_SET_INFO, func) + +def EVT_LIST_ITEM_SELECTED(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_SELECTED, func) + +def EVT_LIST_ITEM_ACTIVATED(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_ACTIVATED, func) + +def EVT_LIST_ITEM_DESELECTED(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_DESELECTED, func) + +def EVT_LIST_KEY_DOWN(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_KEY_DOWN, func) + +def EVT_LIST_INSERT_ITEM(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_INSERT_ITEM, func) + +def EVT_LIST_COL_CLICK(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_CLICK, func) + +def EVT_LIST_ITEM_RIGHT_CLICK(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, func) + +def EVT_LIST_ITEM_MIDDLE_CLICK(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, func) + + + +#wxSplitterWindow +def EVT_SPLITTER_SASH_POS_CHANGING(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, func) + +def EVT_SPLITTER_SASH_POS_CHANGED(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, func) + +def EVT_SPLITTER_UNSPLIT(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_SPLITTER_UNSPLIT, func) + +def EVT_SPLITTER_DOUBLECLICKED(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, func) #---------------------------------------------------------------------- @@ -506,30 +681,82 @@ wxPyDefaultPosition.Set(-1,-1) wxPyDefaultSize.Set(-1,-1) # aliases so that C++ documentation applies: -wxDefaultPosition = wxPyDefaultPosition -wxDefaultSize = wxPyDefaultSize +wxDefaultPosition = wxPyDefaultPosition +wxDefaultSize = wxPyDefaultSize + +# backwards compatibility +wxNoRefBitmap = wxBitmap + +#---------------------------------------------------------------------- +# This helper function will take a wxPython object and convert it to +# another wxPython object type. This will not be able to create objects +# that are derived from wxPython classes by the user, only those that are +# actually part of wxPython and directly corespond to C++ objects. +# +# This is useful in situations where some method returns a generic +# type such as wxWindow, but you know that it is actually some +# derived type such as a wxTextCtrl. You can't call wxTextCtrl specific +# methods on a wxWindow object, but you can use this function to +# create a wxTextCtrl object that will pass the same pointer to +# the C++ code. You use it like this: +# +# textCtrl = wxPyTypeCast(window, "wxTextCtrl") +# +# +# WARNING: Using this function to type cast objects into types that +# they are not is not recommended and is likely to cause your +# program to crash... Hard. +# + +def wxPyTypeCast(obj, typeStr): + if hasattr(obj, "this"): + newPtr = ptrcast(obj.this, typeStr+"_p") + else: + newPtr = ptrcast(obj, typeStr+"_p") + theClass = globals()[typeStr+"Ptr"] + theObj = theClass(newPtr) + if hasattr(obj, "this"): + theObj.thisown = obj.thisown + return theObj + #---------------------------------------------------------------------- -## class wxPyStdOutWindow(wxFrame): -## def __init__(self, title = "wxPython: stdout/stderr"): -## wxFrame.__init__(self, NULL, title) -## self.title = title -## self.text = wxTextWindow(self) -## self.text.SetFont(wxFont(10, wxMODERN, wxNORMAL, wxBOLD)) -## self.SetSize(-1,-1,400,200) -## self.Show(false) -## self.isShown = false +class wxPyOnDemandOutputWindow: + def __init__(self, title = "wxPython: stdout/stderr"): + self.frame = None + self.title = title + + + def SetParent(self, parent): + self.parent = parent + + + def OnCloseWindow(self, event): + if self.frame != None: + self.frame.Destroy() + self.frame = None + self.text = None + + + # this provides the file-like behaviour + def write(self, str): + if not self.frame: + self.frame = wxFrame(self.parent, -1, self.title) + self.text = wxTextCtrl(self.frame, -1, "", + style = wxTE_MULTILINE|wxTE_READONLY) + self.frame.SetSize(wxSize(450, 300)) + self.frame.Show(true) + EVT_CLOSE(self.frame, self.OnCloseWindow) + self.text.AppendText(str) -## def write(self, str): # with this method, -## if not self.isShown: -## self.Show(true) -## self.isShown = true -## self.text.WriteText(str) -## def OnCloseWindow(self, event): # doesn't allow the window to close, just hides it -## self.Show(false) -## self.isShown = false + def close(self): + if self.frame != None: + self.frame.Destroy() + self.frame = None + self.text = None + _defRedirect = (wxPlatform == '__WXMSW__') @@ -540,6 +767,7 @@ _defRedirect = (wxPlatform == '__WXMSW__') class wxApp(wxPyApp): error = 'wxApp.error' + outputWindowClass = wxPyOnDemandOutputWindow def __init__(self, redirect=_defRedirect, filename=None): wxPyApp.__init__(self) @@ -547,7 +775,6 @@ class wxApp(wxPyApp): self.saveStdio = (sys.stdout, sys.stderr) if redirect: self.RedirectStdio(filename) - # this initializes wxWindows and then calls our OnInit _wxStart(self.OnInit) @@ -558,62 +785,54 @@ class wxApp(wxPyApp): except: pass + + def SetTopWindow(self, frame): + if self.stdioWin: + self.stdioWin.SetParent(frame) + sys.stderr = sys.stdout = self.stdioWin + wxPyApp.SetTopWindow(self, frame) + + + def MainLoop(self): + wxPyApp.MainLoop(self) + self.RestoreStdio() + + def RedirectStdio(self, filename): if filename: sys.stdout = sys.stderr = open(filename, 'a') else: - raise self.error, 'wxPyStdOutWindow not yet implemented.' - #self.stdioWin = sys.stdout = sys.stderr = wxPyStdOutWindow() + self.stdioWin = self.outputWindowClass() # wxPyOnDemandOutputWindow + def RestoreStdio(self): sys.stdout, sys.stderr = self.saveStdio if self.stdioWin != None: - self.stdioWin.Show(false) - self.stdioWin.Destroy() - self.stdioWin = None + self.stdioWin.close() + +#---------------------------------------------------------------------------- + +class wxPySimpleApp(wxApp): + def __init__(self): + wxApp.__init__(self, 0) + def OnInit(self): + return true #---------------------------------------------------------------------------- -# -# $Log$ -# Revision 1.9 1999/01/30 07:30:09 RD -# Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc. -# -# Various cleanup, tweaks, minor additions, etc. to maintain -# compatibility with the current wxWindows. -# -# Revision 1.8 1999/01/29 21:13:42 HH -# Added aliases for wxDefaultPosition and wxDefaultSize (from wxPy..) in _extras, -# so that C++ documentation applies. -# -# Revision 1.7 1998/11/25 08:45:21 RD -# -# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon -# Added events for wxGrid -# Other various fixes and additions -# -# Revision 1.6 1998/11/16 00:00:52 RD -# Generic treectrl for wxPython/GTK compiles... -# -# Revision 1.5 1998/10/20 07:38:02 RD -# bug fix -# -# Revision 1.4 1998/10/20 06:43:54 RD -# New wxTreeCtrl wrappers (untested) -# some changes in helpers -# etc. -# -# Revision 1.3 1998/10/02 06:40:33 RD -# -# Version 0.4 of wxPython for MSW. -# -# Revision 1.2 1998/08/18 19:48:12 RD -# more wxGTK compatibility things. -# -# It builds now but there are serious runtime problems... -# -# Revision 1.1 1998/08/09 08:25:49 RD -# Initial version -# -# +# DO NOT hold any other references to this object. This is how we know when +# to cleanup system resources that wxWin is holding. When this module is +# unloaded, the refcount on __cleanMeUp goes to zero and it calls the +# wxApp_CleanUp function. + +class __wxPyCleanup: + def __init__(self): + self.cleanup = wxc.wxApp_CleanUp + def __del__(self): + self.cleanup() + +__cleanMeUp = __wxPyCleanup() +#---------------------------------------------------------------------------- + +