X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73c5ed369625e01f374c3379ee28e0c027ba6eb6..efc5f2246391dc536e5ace471af019bba8d6851b:/utils/wxPython/src/_extras.py diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py index 02b053f9c4..11d9bf2d49 100644 --- a/utils/wxPython/src/_extras.py +++ b/utils/wxPython/src/_extras.py @@ -29,14 +29,21 @@ def _checkForCallback(obj, name, event, theID=-1): except: pass else: obj.Connect(theID, -1, event, cb) +## def _checkClassCallback(obj, name): +## try: cb = getattr(obj, name) +## except: pass +## else: obj._addCallback(name, cb) + + def _StdWindowCallbacks(win): _checkForCallback(win, "OnChar", wxEVT_CHAR) _checkForCallback(win, "OnSize", wxEVT_SIZE) _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 +61,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 +95,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 +146,12 @@ def EVT_ICONIZE(win, func): def EVT_NAVIGATION_KEY(win, func): win.Connect(-1, -1, wxEVT_NAVIGATION_KEY, 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) + # Mouse Events def EVT_LEFT_DOWN(win, func): @@ -504,6 +523,9 @@ def EVT_LIST_SET_INFO(win, id, 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) @@ -516,6 +538,19 @@ def EVT_LIST_INSERT_ITEM(win, id, func): def EVT_LIST_COL_CLICK(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_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) + #---------------------------------------------------------------------- @@ -548,28 +583,74 @@ wxPyDefaultSize.Set(-1,-1) wxDefaultPosition = wxPyDefaultPosition wxDefaultSize = wxPyDefaultSize + +# This is to cover up a bug in SWIG. We are redefining +# the shadow class that is generated for wxAcceleratorTable +# because SWIG incorrectly uses "arg0.this" +class wxAcceleratorTable(wxAcceleratorTablePtr): + def __init__(self,arg0) : + self.this = miscc.new_wxAcceleratorTable(arg0) + self.thisown = 1 + +#---------------------------------------------------------------------- +# 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) + 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 wxPyStdOutWindow: +## def __init__(self, title = "wxPython: stdout/stderr"): +## self.frame = None +## self.title = title + +## def write(self, str): +## if not self.frame: +## self.frame = wxFrame(NULL, -1, self.title) +## self.text = wxTextCtrl(self.frame, -1, "", wxPoint(0,0), wxDefaultSize, +## 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): +## wxBell() +## self.frame.Destroy() +## self.frame = None +## self.text = None -## 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: +## self.frame.Close(true) _defRedirect = (wxPlatform == '__WXMSW__') @@ -607,56 +688,14 @@ class wxApp(wxPyApp): 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() #---------------------------------------------------------------------------- -# -# $Log$ -# Revision 1.10 1999/02/01 00:10:39 RD -# Added the missing EVT_LIST_ITEM_SELECTED and friends. -# -# 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... +__cleanMeUp = __wxPyCleanup() +#---------------------------------------------------------------------------- + +