X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d426c97e9a8563ff5539a9c86acf2cfb03fbf5bc..08f6ac314ae712e2bc8fa59cf688e6bcff76181f:/utils/wxPython/src/_extras.py?ds=sidebyside diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py index dc59bb3518..aa94aefeed 100644 --- a/utils/wxPython/src/_extras.py +++ b/utils/wxPython/src/_extras.py @@ -152,6 +152,9 @@ def EVT_IDLE(win, 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): @@ -472,6 +475,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): @@ -601,6 +613,14 @@ 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) +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) @@ -643,17 +663,11 @@ wxPyDefaultPosition.Set(-1,-1) wxPyDefaultSize.Set(-1,-1) # aliases so that C++ documentation applies: -wxDefaultPosition = wxPyDefaultPosition -wxDefaultSize = wxPyDefaultSize - +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 +# backwards compatibility +wxNoRefBitmap = wxBitmap #---------------------------------------------------------------------- # This helper function will take a wxPython object and convert it to @@ -683,37 +697,43 @@ def wxPyTypeCast(obj, typeStr): newPtr = ptrcast(obj, typeStr+"_p") theClass = globals()[typeStr+"Ptr"] theObj = theClass(newPtr) - theObj.thisown = obj.thisown + if hasattr(obj, "this"): + theObj.thisown = obj.thisown return theObj #---------------------------------------------------------------------- -## class wxPyStdOutWindow: -## def __init__(self, title = "wxPython: stdout/stderr"): -## self.frame = None -## self.title = title +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 -## 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) + # 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 OnCloseWindow(self, event): -## wxBell() -## self.frame.Destroy() -## self.frame = None -## self.text = None + def close(self): + self.frame = None + self.text = None -## def close(self): -## if self.frame: -## self.frame.Close(true) _defRedirect = (wxPlatform == '__WXMSW__') @@ -723,6 +743,7 @@ _defRedirect = (wxPlatform == '__WXMSW__') class wxApp(wxPyApp): error = 'wxApp.error' + outputWindowClass = wxPyOnDemandOutputWindow def __init__(self, redirect=_defRedirect, filename=None): wxPyApp.__init__(self) @@ -730,7 +751,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) @@ -741,22 +761,49 @@ class wxApp(wxPyApp): except: pass + + def SetTopWindow(self, frame): + if self.stdioWin: + self.stdioWin.SetParent(frame) + sys.stdout = self.stdioWin #sys.stderr = + 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.close() +#---------------------------------------------------------------------------- + +class wxPySimpleApp(wxApp): + def __init__(self): + wxApp.__init__(self, 0) + def OnInit(self): + return true + #---------------------------------------------------------------------------- # DO NOT hold any other references to this object. This is how we know when -# to cleanup system resources that wxWin is holding... +# 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() #----------------------------------------------------------------------------